+

+	* Makefile (install): add pbuilder-buildpackage-funcs to install target
+
+	* pbuilder-buildpackage (PACKAGENAME): add id tag for calling showbuildbanner
+
+	* pbuilder-buildpackage-funcs: create new file
+	add banner opt for showbuildbanner
+
+	* pbuilder-buildpackage: move funcs to /usr/lib/pbuilder/pbuilder-buildpackage-funcs
+

1 files changed, 3 insertions, 49 deletions

diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage
index 55d05f7..10cde90 100755
--- a/pbuilder-buildpackage
+++ b/pbuilder-buildpackage
@@ -20,57 +20,11 @@ export LANG=C
 export LC_ALL=C
 set -e
 
-function copydsc () {
-    local DSCFILE="$1"
-    local TARGET="$2"
-    for FILE in \
-      "$DSCFILE" \
-	$(cat "$DSCFILE" | \
-	awk 'BEGIN{p=0} /^$/ {p=0} /^.*:/ {p=0} {if (p){print "'$(dirname "$DSCFILE")'/" $3}} /^Files:/{p=1}' ) ; do
-	echo "    -> copying [$FILE]"
-        cp "$FILE" "$TARGET" ;
-    done
-}
-
-function checkbuilddep () {
-    if ! /usr/lib/pbuilder/pbuilder-satisfydepends --control "$BUILDPLACE/"tmp/buildd/*/debian/control --chroot "$BUILDPLACE" --binary-all ; then
-	echo "E: pbuilder-satisfydepends failed." >&2
-	saveaptcache_umountproc_cleanbuildplace
-	exit 1
-    fi
-    # install extra packages to the chroot
-    if [ -n "$EXTRAPACKAGES" ]; then 
-	$CHROOTEXEC usr/bin/apt-get -y install ${EXTRAPACKAGES}
-    fi
-}
-
-function echobacktime () {
-    echo "Current time: $(date)"
-    echo "pbuilder-time-stamp: $(date +%s)"
-}
-
-function showbuildbanner () {
-    # show some banners for building
-    echo "pbuilder-buildpackage/"$(dpkg --print-architecture) '$Id$'
-    echo
-}
-
-function saveaptcache_umountproc_cleanbuildplace () {
-    # save the apt cache, and call umountproc_cleanbuildplace
-    save_aptcache
-    umountproc_cleanbuildplace
-}
-
-function createbuilduser () {
-    # create the build user
-    if [ -n "$SUTOUSER" ]; then
-	echo "$BUILDUSERNAME:x:$BUILDUSERID:$BUILDUSERID:,,,:/tmp/buildd:/bin/sh" >> $BUILDPLACE/etc/passwd
-	echo "$BUILDUSERNAME:*:$BUILDUSERID:" >> $BUILDPLACE/etc/group
-    fi
-}
 
 . /usr/lib/pbuilder/pbuilder-checkparams
 . /usr/lib/pbuilder/pbuilder-runhooks
+. /usr/lib/pbuilder/pbuilder-buildpackage-funcs
+
 
 PACKAGENAME="$1"
 if [ ! -f "$PACKAGENAME" ]; then
@@ -90,7 +44,7 @@ else
     BUILDUSERNAME=root
 fi
 
-showbuildbanner
+showbuildbanner '$Id'
 echobacktime
 extractbuildplace 
 loadhooks