diff options
| author | Simo Sorce <idra@samba.org> | 2005-10-29 13:19:27 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:05:15 -0500 |
| commit | fa75e8c1d482cdbad2ff074eccb2baf8d5bba856 (patch) | |
| tree | 51797882a25cfdd23dc653d80cd5cf1723cc6f42 /packaging/Debian/debian-sarge/patches/version-fix-vscan.patch | |
| parent | 3a5c37bfd12781077fe8e7c6ebb23c2cfdb77fd1 (diff) | |
| download | samba-fa75e8c1d482cdbad2ff074eccb2baf8d5bba856.tar.gz samba-fa75e8c1d482cdbad2ff074eccb2baf8d5bba856.tar.bz2 samba-fa75e8c1d482cdbad2ff074eccb2baf8d5bba856.zip | |
r11395: Update the Debian packaging.
Move form stable to stable distribution names based hives.
(This used to be commit bb13b3482047b6ab6d84ba9e2839cf8a0fac71aa)
Diffstat (limited to 'packaging/Debian/debian-sarge/patches/version-fix-vscan.patch')
| -rw-r--r-- | packaging/Debian/debian-sarge/patches/version-fix-vscan.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/packaging/Debian/debian-sarge/patches/version-fix-vscan.patch b/packaging/Debian/debian-sarge/patches/version-fix-vscan.patch new file mode 100644 index 0000000000..0f35598297 --- /dev/null +++ b/packaging/Debian/debian-sarge/patches/version-fix-vscan.patch @@ -0,0 +1,37 @@ +Author: Lars Mueller <lmuelle at SuSE dot de> +Subject: Non integer SAMBA_VERSION_RELEASE breaks samba-vscan build +Bugzilla: bugzilla.Samba.org #2618 + +--- samba-3.0.20b/source/script/mkversion.sh ++++ samba-3.0.20b/source/script/mkversion.sh 2005-10-22 12:56:30 +@@ -17,6 +17,7 @@ + SAMBA_VERSION_MAJOR=`sed -n 's/^SAMBA_VERSION_MAJOR=//p' $SOURCE_DIR$VERSION_FILE` + SAMBA_VERSION_MINOR=`sed -n 's/^SAMBA_VERSION_MINOR=//p' $SOURCE_DIR$VERSION_FILE` + SAMBA_VERSION_RELEASE=`sed -n 's/^SAMBA_VERSION_RELEASE=//p' $SOURCE_DIR$VERSION_FILE` ++SAMBA_VERSION_RELEASE_SUFFIX=`sed -n 's/^SAMBA_VERSION_RELEASE_SUFFIX=//p' $SOURCE_DIR$VERSION_FILE` + + SAMBA_VERSION_PRE_RELEASE=`sed -n 's/^SAMBA_VERSION_PRE_RELEASE=//p' $SOURCE_DIR$VERSION_FILE` + +@@ -31,9 +32,10 @@ + echo "#define SAMBA_VERSION_MAJOR ${SAMBA_VERSION_MAJOR}" >> $OUTPUT_FILE + echo "#define SAMBA_VERSION_MINOR ${SAMBA_VERSION_MINOR}" >> $OUTPUT_FILE + echo "#define SAMBA_VERSION_RELEASE ${SAMBA_VERSION_RELEASE}" >> $OUTPUT_FILE ++echo "#define SAMBA_VERSION_RELEASE_SUFFIX ${SAMBA_VERSION_RELEASE_SUFFIX}" >> $OUTPUT_FILE + + +-SAMBA_VERSION_STRING="${SAMBA_VERSION_MAJOR}.${SAMBA_VERSION_MINOR}.${SAMBA_VERSION_RELEASE}" ++SAMBA_VERSION_STRING="${SAMBA_VERSION_MAJOR}.${SAMBA_VERSION_MINOR}.${SAMBA_VERSION_RELEASE}${SAMBA_VERSION_RELEASE_SUFFIX}" + + + if test -n "${SAMBA_VERSION_PRE_RELEASE}";then +--- samba-3.0.20b/source/VERSION ++++ samba-3.0.20b/source/VERSION 2005-10-22 12:56:30 +@@ -19,7 +19,8 @@ + ######################################################## + SAMBA_VERSION_MAJOR=3 + SAMBA_VERSION_MINOR=0 + SAMBA_VERSION_RELEASE=20 ++SAMBA_VERSION_RELEASE_SUFFIX=b + + ######################################################## + # For 'pre' releases the version will be # |