diff options
| author | Simo Sorce <idra@samba.org> | 2006-02-09 14:06:29 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:10:00 -0500 |
| commit | 9fc7ee4f6cfe01f636b9a315aa0a2e80d214fccc (patch) | |
| tree | bb66c7532eb5b8ffd8725086b86ae812c49248d1 /packaging/Debian/debian-sarge/patches/version-fix-vscan.patch | |
| parent | c1ffb8d9bcad9053f3d97dc89c3ff3b023401157 (diff) | |
| download | samba-9fc7ee4f6cfe01f636b9a315aa0a2e80d214fccc.tar.gz samba-9fc7ee4f6cfe01f636b9a315aa0a2e80d214fccc.tar.bz2 samba-9fc7ee4f6cfe01f636b9a315aa0a2e80d214fccc.zip | |
r13411: Sync with the latest fix I've made to package 3.0.21b
(This used to be commit 46f9f7a6f0352329b2e57030b2af4bc0dc72c580)
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, 0 insertions, 37 deletions
diff --git a/packaging/Debian/debian-sarge/patches/version-fix-vscan.patch b/packaging/Debian/debian-sarge/patches/version-fix-vscan.patch deleted file mode 100644 index 0f35598297..0000000000 --- a/packaging/Debian/debian-sarge/patches/version-fix-vscan.patch +++ /dev/null @@ -1,37 +0,0 @@ -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 # |