[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-793-ga77605a

[Michael Adam]

The branch, master has been updated
       via  a77605ae83e4234e89cfd4cdff696034e3b981f2 (commit)
       via  0b5b08f077b116ca3f153358830f3e4948b35767 (commit)
       via  c3dbdea73fbf8b8916d72a83a3ec92e9c736070b (commit)
      from  75faf7765b30975e417e373f131c164d426db26c (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit a77605ae83e4234e89cfd4cdff696034e3b981f2
Author: Michael Adam <obnox at samba.org>
Date:   Wed Feb 11 22:27:48 2009 +0100

    s3:packaging: fix parsing of include.h in fill-templates
    
    The content has changed slightly in master for the merged build,
    and we must be more exact when parsing the lines.
    
    Michael

commit 0b5b08f077b116ca3f153358830f3e4948b35767
Author: Michael Adam <obnox at samba.org>
Date:   Wed Feb 11 22:25:41 2009 +0100

    s3:packaging: fix path to calling update-pkginfo after pushd in fill-templates
    
    Michael

commit c3dbdea73fbf8b8916d72a83a3ec92e9c736070b
Author: Michael Adam <obnox at samba.org>
Date:   Wed Feb 11 22:24:52 2009 +0100

    s3:packaging: paths cosmetics in fill-templates
    
    Michael

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

Summary of changes:
 packaging/bin/fill-templates |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/packaging/bin/fill-templates b/packaging/bin/fill-templates
index e74020f..204003c 100755
--- a/packaging/bin/fill-templates
+++ b/packaging/bin/fill-templates
@@ -13,7 +13,7 @@
 # License: GPL
 
 DIRNAME=$(dirname $0)
-TOPDIR=${DIRNAME}/../../
+TOPDIR=${DIRNAME}/../..
 SRCDIR=${TOPDIR}/source3
 VERSION_H=${SRCDIR}/include/version.h
 
@@ -26,14 +26,14 @@ if [ ! -f ${VERSION_H} ] ; then
 	exit 1
 fi
 
-VERSION=`grep SAMBA_VERSION_OFFICIAL_STRING ${VERSION_H} | awk '{print $3}'`
+VERSION=`grep "define SAMBA_VERSION_OFFICIAL_STRING" ${VERSION_H} | awk '{print $3}'`
 
-vendor_version=`grep SAMBA_VERSION_VENDOR_SUFFIX ${VERSION_H} | awk '{print $3}'`
+vendor_version=`grep "define SAMBA_VERSION_VENDOR_SUFFIX" ${VERSION_H} | awk '{print $3}'`
 if test "x${vendor_version}" != "x" ; then
 	VERSION="${VERSION}-${vendor_version}"
 fi
 
-vendor_patch=`grep SAMBA_VERSION_VENDOR_PATCH ${VERSION_H} | awk '{print $3}'`
+vendor_patch=`grep "define SAMBA_VERSION_VENDOR_PATCH" ${VERSION_H} | awk '{print $3}'`
 if test "x${vendor_patch}" != "x" ; then
 	VERSION="${VERSION}-${vendor_patch}"
 fi
@@ -43,5 +43,5 @@ VERSION=`echo ${VERSION} | sed 's/\"//g'`
 echo "VERSION: ${VERSION}"
 
 pushd ${TOPDIR}/packaging > /dev/null 2>&1
-${TOPDIR}/packaging/bin/update-pkginfo "${VERSION}" 1 ""
+./bin/update-pkginfo "${VERSION}" 1 ""
 popd > /dev/null 2>&1


-- 
Samba Shared Repository