[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-765-g49b8419

[Michael Adam]

The branch, master has been updated
       via  49b84197e0e055bc6045051874a76268d766a4f7 (commit)
       via  d68e4a15039afc58760d0eed1a83ce8862ddeca4 (commit)
       via  e374bef8fc212722af289cf6540f8ae3392661a8 (commit)
       via  97cbf86e7993449d8299c9c1accb4dca3f44cb0c (commit)
       via  aa33bc134a85fd8748923fa011346be6fbe28242 (commit)
      from  473c558937303226c1200ad01bad3920fc8a51f6 (commit)

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


- Log -----------------------------------------------------------------
commit 49b84197e0e055bc6045051874a76268d766a4f7
Author: Michael Adam <obnox at samba.org>
Date:   Tue Feb 10 23:52:40 2009 +0100

    packaging: make update-pkginfo callable from any directory
    
    Michael

commit d68e4a15039afc58760d0eed1a83ce8862ddeca4
Author: Michael Adam <obnox at samba.org>
Date:   Tue Feb 10 23:50:14 2009 +0100

    packaging: remove commented out stuff from update-pkginfo
    
    Michael

commit e374bef8fc212722af289cf6540f8ae3392661a8
Author: Michael Adam <obnox at samba.org>
Date:   Tue Feb 10 23:31:52 2009 +0100

    packaging: don't clutter the output of fillup-templates  with popd output
    
    Michael

commit 97cbf86e7993449d8299c9c1accb4dca3f44cb0c
Author: Michael Adam <obnox at samba.org>
Date:   Tue Feb 10 23:30:48 2009 +0100

    packaging: fix fill-templates call to update-pkginfo to pushd appropriately first
    
    Michael

commit aa33bc134a85fd8748923fa011346be6fbe28242
Author: Michael Adam <obnox at samba.org>
Date:   Tue Feb 10 23:10:23 2009 +0100

    packaging: fix source dir to source3 in fill-templates
    
    Michael

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

Summary of changes:
 packaging/bin/fill-templates |    9 +++++----
 packaging/bin/update-pkginfo |    9 ++++++---
 2 files changed, 11 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/packaging/bin/fill-templates b/packaging/bin/fill-templates
index 2222941..e74020f 100755
--- a/packaging/bin/fill-templates
+++ b/packaging/bin/fill-templates
@@ -14,12 +14,12 @@
 
 DIRNAME=$(dirname $0)
 TOPDIR=${DIRNAME}/../../
-SRCDIR=${TOPDIR}/source
+SRCDIR=${TOPDIR}/source3
 VERSION_H=${SRCDIR}/include/version.h
 
-pushd ${SRCDIR}
+pushd ${SRCDIR} > /dev/null 2>&1
 ./script/mkversion.sh
-popd
+popd > /dev/null 2>&1
 
 if [ ! -f ${VERSION_H} ] ; then
 	echo "Error creating version.h"
@@ -42,5 +42,6 @@ VERSION=`echo ${VERSION} | sed 's/\"//g'`
 
 echo "VERSION: ${VERSION}"
 
+pushd ${TOPDIR}/packaging > /dev/null 2>&1
 ${TOPDIR}/packaging/bin/update-pkginfo "${VERSION}" 1 ""
-
+popd > /dev/null 2>&1
diff --git a/packaging/bin/update-pkginfo b/packaging/bin/update-pkginfo
index 9d8006a..7587f68 100755
--- a/packaging/bin/update-pkginfo
+++ b/packaging/bin/update-pkginfo
@@ -14,9 +14,12 @@ if [ $# -ne 3 ]; then
     echo Usage: update-pkginfo VERSION RELEASE REVISION
     exit 1
 fi
-# PREV=`echo ${REVISION} | sed 's/[^0-9]//g'`
-# PREV="."`echo ${REVISION} | sed 's/[0-9]//g'`".${PREV}"
 
+DIRNAME=$(dirname $0)
+TOPDIR=${DIRNAME}/../../
+PACKAGINGDIR=${TOPDIR}/packaging
+
+pushd ${PACKAGINGDIR} > /dev/null 2>&1
 for f in `find . -type f -name "*.tmpl"`; do
         f2=`echo $f | sed s/.tmpl//g`
         echo $f2
@@ -25,4 +28,4 @@ for f in `find . -type f -name "*.tmpl"`; do
 		-e s/PREVISION/${REVISION}/g \
 		-e s/PRPMREV/${RPMREVISION}/g < $f > $f2
 done
-
+popd > /dev/null 2>&1


-- 
Samba Shared Repository