[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4844-gba94107

[Michael Adam]

The branch, v3-3-test has been updated
       via  ba941074ce20617856c138eff5762646384d37de (commit)
       via  05b83098ed49cee906a5b16d15dce9e6baf62b07 (commit)
       via  58db911a3845c4a8475c413e5fd8d755498dd447 (commit)
      from  162e4b66601b41dd5adb24e192f3b5a91dfb41cc (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit ba941074ce20617856c138eff5762646384d37de
Author: Michael Adam <obnox at samba.org>
Date:   Wed Jan 21 11:47:46 2009 +0100

    s3:docs: fix ommission in fix of (real)distclean targets
    
    Michael
    (cherry picked from commit 37412017c5dd2f05a7f4bbe0410a6e00ce4805e5)
    
    Signed-off-by: Michael Adam <obnox at samba.org>

commit 05b83098ed49cee906a5b16d15dce9e6baf62b07
Author: Michael Adam <obnox at samba.org>
Date:   Wed Jan 21 11:45:23 2009 +0100

    s3:create-tarball: also include the VENDOR_PATCH in the version
    
    Michael
    (cherry picked from commit ce3e34d37ce5592e0268be5d16240387d971585a)
    
    Signed-off-by: Michael Adam <obnox at samba.org>

commit 58db911a3845c4a8475c413e5fd8d755498dd447
Author: Michael Adam <obnox at samba.org>
Date:   Wed Jan 21 11:41:14 2009 +0100

    s3:docs: fix distclean target and add realdistclean target
    
    - remove stuff created by configure in distclean
    - remove stuff created by autoconf in realdistclean
    
    Michael
    (cherry picked from commit 65c92fea3d18c3520ff2a1e53a0c5c8825c9788f)
    
    Signed-off-by: Michael Adam <obnox at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 docs-xml/Makefile              |    5 ++++-
 release-scripts/create-tarball |    4 ++++
 2 files changed, 8 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/Makefile b/docs-xml/Makefile
index 2acef3e..08e3f5e 100644
--- a/docs-xml/Makefile
+++ b/docs-xml/Makefile
@@ -320,7 +320,10 @@ xslt/man.xsl:
 xslt/pearson.xsl:
 
 distclean clobber:: clean
-	rm Makefile.settings config.status config.log configure
+	rm -f Makefile.settings config.status config.log
+
+realdistclean:: distclean
+	rm -f configure
 	rm -rf autom4te.cache
 
 
diff --git a/release-scripts/create-tarball b/release-scripts/create-tarball
index da39d89..d468dd3 100755
--- a/release-scripts/create-tarball
+++ b/release-scripts/create-tarball
@@ -183,6 +183,10 @@ function main
     if [ -n "$vendor_version" ]; then
 	version="$version-$vendor_version"
     fi
+    vendor_patch=`grep "define SAMBA_VERSION_VENDOR_PATCH" $VER_H | awk '{print $3}'`
+    if [ -n "$vendor_patch" ]; then
+	version="$version-$vendor_patch"
+    fi
     version=`echo $version | sed 's/\"//g'`
 
     echo "Creating release tarball for Samba $version"


-- 
Samba Shared Repository