diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-01-09 22:51:40 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-01-09 22:51:40 +0000 |
| commit | c02256b2b1cfe165e76da9f307887bb35c968735 (patch) | |
| tree | 2b038d9c6c34b91d96cc5bcba262c689c97bc25a | |
| parent | 108b12c4b3abb63f4ac39bfed1fe44f2e1bab6c3 (diff) | |
| download | xine-lib-c02256b2b1cfe165e76da9f307887bb35c968735.tar.gz xine-lib-c02256b2b1cfe165e76da9f307887bb35c968735.tar.bz2 | |
Allow for patch-level numbering.
| -rw-r--r-- | configure.ac | 5 | ||||
| -rwxr-xr-x | version.sh | 10 |
2 files changed, 12 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 301f95f15..926620303 100644 --- a/configure.ac +++ b/configure.ac @@ -63,6 +63,9 @@ AC_DEFINE_UNQUOTED([XINE_MINOR], [$XINE_MINOR], [xine minor version number]) XINE_SUB=XINE_VERSION_SUB AC_SUBST(XINE_SUB) AC_DEFINE_UNQUOTED([XINE_SUB], [$XINE_SUB], [xine sub version number]) +XINE_PATCH=XINE_VERSION_PATCH +AC_SUBST(XINE_PATCH) +AC_DEFINE_UNQUOTED([XINE_PATCH], [$XINE_PATCH], [xine patch version number]) XINE_LT_CURRENT=__XINE_LT_CURRENT AC_SUBST(XINE_LT_CURRENT) @@ -984,7 +987,7 @@ xinedatadir='${datadir}/xine' AC_SUBST(xinelibdir) AC_SUBST(xinedatadir) -XINE_PLUGINDIR="\${xinelibdir}/plugins/$XINE_MAJOR.$XINE_MINOR.$XINE_SUB" +XINE_PLUGINDIR="\${xinelibdir}/plugins/$XINE_MAJOR.$XINE_MINOR.$XINE_SUB$XINE_PATCH" XINE_FONTDIR="\${xinedatadir}/libxine$XINE_MAJOR/fonts" XINE_LOCALEDIR='${datadir}/locale' XINE_REL_PLUGINDIR="`makeexpand "$XINE_PLUGINDIR"`" diff --git a/version.sh b/version.sh index 37649ecda..9e5611126 100755 --- a/version.sh +++ b/version.sh @@ -1,7 +1,11 @@ #!/bin/sh # Making releases: -# 1. Increment XINE_VERSION_SUB +# 1. For normal releases +# Increment XINE_VERSION_SUB +# Clear XINE_VERSION_PATCH +# For patch releases +# Increment XINE_VERSION_PATCH (use ".1", ".2" etc.) # 2. Remove .cvsversion before running make dist # 3. Adjust the values of XINE_LT_CURRENT, XINE_LT_REVISION, and XINE_LT_AGE # according to the following rules: @@ -27,13 +31,14 @@ XINE_VERSION_MAJOR=1 XINE_VERSION_MINOR=1 XINE_VERSION_SUB=90 +XINE_VERSION_PATCH= XINE_LT_CURRENT=2 XINE_LT_REVISION=0 XINE_LT_AGE=0 test -f "`dirname $0`/.cvsversion" && XINE_VERSION_SUFFIX="hg" -XINE_VERSION_SPEC="${XINE_VERSION_MAJOR}.${XINE_VERSION_MINOR}.${XINE_VERSION_SUB}${XINE_VERSION_SUFFIX}" +XINE_VERSION_SPEC="${XINE_VERSION_MAJOR}.${XINE_VERSION_MINOR}.${XINE_VERSION_SUB}${XINE_VERSION_PATCH}${XINE_VERSION_SUFFIX}" #### #### You should not need to touch anything beyond this point @@ -42,6 +47,7 @@ XINE_VERSION_SPEC="${XINE_VERSION_MAJOR}.${XINE_VERSION_MINOR}.${XINE_VERSION_SU echo "m4_define([XINE_VERSION_MAJOR], [${XINE_VERSION_MAJOR}])dnl" echo "m4_define([XINE_VERSION_MINOR], [${XINE_VERSION_MINOR}])dnl" echo "m4_define([XINE_VERSION_SUB], [${XINE_VERSION_SUB}])dnl" +echo "m4_define([XINE_VERSION_PATCH], [${XINE_VERSION_PATCH}])dnl" echo "m4_define([XINE_VERSION_SUFFIX], [${XINE_VERSION_SUFFIX}])dnl" echo "m4_define([XINE_VERSION_SPEC], [${XINE_VERSION_SPEC}])dnl" echo "m4_define([__XINE_LT_CURRENT], [${XINE_LT_CURRENT}])dnl" |