[SCM] Samba Shared Repository - branch master updated -
release-4-0-0alpha6-23-gce3e34d
Michael Adam
obnox at samba.org
Wed Jan 21 10:45:14 GMT 2009
The branch, master has been updated
via ce3e34d37ce5592e0268be5d16240387d971585a (commit)
via 65c92fea3d18c3520ff2a1e53a0c5c8825c9788f (commit)
from 2bb126679646889780c54f674a22e271761080af (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit ce3e34d37ce5592e0268be5d16240387d971585a
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
commit 65c92fea3d18c3520ff2a1e53a0c5c8825c9788f
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
-----------------------------------------------------------------------
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..f5e196d 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 configure
+
+realdistclean:: distclean
+ rm -f configure
rm -rf autom4te.cache
diff --git a/release-scripts/create-tarball b/release-scripts/create-tarball
index ab27f08..3e80cd1 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
More information about the samba-cvs
mailing list