summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2008-01-09 22:18:11 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2008-01-09 22:18:11 +0000
commitc749ef5ef58af5f1a1856c802b0726bf6912601a (patch)
treebeff946ac2b9bb99040b4a1a39fb81253667249d
parent6255dcb866af030b0122c061459ab587a0d8c074 (diff)
downloadxine-lib-c749ef5ef58af5f1a1856c802b0726bf6912601a.tar.gz
xine-lib-c749ef5ef58af5f1a1856c802b0726bf6912601a.tar.bz2
Allow for patch-level numbering; initialise to ".1".
-rw-r--r--ChangeLog2
-rw-r--r--configure.ac9
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 18a94dd93..b43e2b5d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+xine-lib (1.1.9.1) (unreleased)
+
xine-lib (1.1.9)
* Fix dvd://.../title[.chapter] handling (somewhat broken in 1.1.8).
* Fix switching DVB subtitles channels.
diff --git a/configure.ac b/configure.ac
index 9bb6eca4f..f92318924 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,16 +12,18 @@ dnl
AC_PREREQ(2.59)
dnl Making releases:
-dnl XINE_SUB += 1; continue with XINE_LT_* values below
+dnl XINE_SUB += 1; XINE_PATCH = ''; continue with XINE_LT_* values below
dnl
XINE_MAJOR=1
XINE_MINOR=1
XINE_SUB=9
+# XINE_PATCH should be left empty or set to ".1" or ".2" or something similar
+XINE_PATCH=.1
#if test $XINE_SUB -eq 0 ; then
# XINE_SUBPART="";
#else
- XINE_SUBPART=".$XINE_SUB"
+ XINE_SUBPART=".$XINE_SUB$XINE_PATCH"
#fi
dnl The libtool version numbers (XINE_LT_*); Don't even think about faking this!
@@ -69,6 +71,7 @@ AC_SUBST(XINE_BIN_AGE)
AC_DEFINE_UNQUOTED(XINE_MAJOR, $XINE_MAJOR,[xine major version number])
AC_DEFINE_UNQUOTED(XINE_MINOR, $XINE_MINOR,[xine minor version number])
AC_DEFINE_UNQUOTED(XINE_SUB, $XINE_SUB, [xine sub version number])
+AC_DEFINE_UNQUOTED(XINE_PATCH, $XINE_PATCH, [xine patch version number])
AC_SUBST(XINE_LT_CURRENT)
AC_SUBST(XINE_LT_REVISION)
@@ -2388,7 +2391,7 @@ makeexpand () {
echo "$i"
}
-XINE_PLUGINDIR="$libdir/xine/plugins/$XINE_MAJOR.$XINE_MINOR.$XINE_SUB"
+XINE_PLUGINDIR="$libdir/xine/plugins/$XINE_MAJOR.$XINE_MINOR.$XINE_SUB$XINE_PATCH"
XINE_FONTDIR="${datadir}/xine/libxine$XINE_MAJOR/fonts"
XINE_LOCALEDIR="${datadir}/locale"
XINE_REL_PLUGINDIR="`makeexpand "$XINE_PLUGINDIR"`"