making ready for uploading to Debian archive, changing depends line to debootstrap with versioned depends. Re-tabbing, extactbuildplace function is created to move common code out from create and build. added an error message for unknown parameter option. added a TAGS target to the makefile to make ETAGS work.

1 files changed, 23 insertions, 26 deletions

diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage
index a412c70..2a29173 100755
--- a/pbuilder-buildpackage
+++ b/pbuilder-buildpackage
@@ -12,17 +12,22 @@ function copydsc () {
       $(echo "$DSCFILE" | sed 's/\(.*\)-[^-.]*\.dsc$/\1/').orig.tar.gz ; do
         cp "$FILE" "$TARGET" ;
     done
-
 }
 
 function checkbuilddep () {
-    for INSTALLPKG in $($CHROOTEXEC bin/sh -c "(cd tmp/buildd/*/; dpkg-checkbuilddeps)" 2>&1 |grep "^dpkg-checkbuilddeps: Unmet build dependencies: " | sed 's/^[^:]*:[^:]*: \(.*\)$/\1/' | awk 'BEGIN{RS=", "} /^([^([]*)/{print $1}'); do
-	echo " -> Installing $INSTALLPKG"
-	$CHROOTEXEC usr/bin/apt-get -y install "$INSTALLPKG"
+    for INSTALLPKG in $($CHROOTEXEC bin/sh -c "(cd tmp/buildd/*/; dpkg-checkbuilddeps)" 2>&1 | \
+	grep "^dpkg-checkbuilddeps: Unmet build dependencies: " | \
+	sed 's/^[^:]*:[^:]*: \(.*\)$/\1/' | \
+	awk 'BEGIN{RS=", "} /^([^([]*)/{print $1}'); do
+      echo " -> Installing $INSTALLPKG"
+      $CHROOTEXEC usr/bin/apt-get -y install "$INSTALLPKG"
     done;
-    for REMOVEPKG in $($CHROOTEXEC bin/sh -c "(cd tmp/buildd/*/; dpkg-checkbuilddeps)" 2>&1 |grep "^dpkg-checkbuilddeps: Build conflicts: " | sed 's/^[^:]*:[^:]*: \(.*\)$/\1/' | awk 'BEGIN{RS=", "} /^([^([]*)/{print $1}'); do
-	echo " -> Removing $REMOVEPKG"
-	$CHROOTEXEC usr/bin/apt-get -y remove "$REMOVEPKG"
+    for REMOVEPKG in $($CHROOTEXEC bin/sh -c "(cd tmp/buildd/*/; dpkg-checkbuilddeps)" 2>&1 | \
+	grep "^dpkg-checkbuilddeps: Build conflicts: " | \
+	sed 's/^[^:]*:[^:]*: \(.*\)$/\1/' | \
+	awk 'BEGIN{RS=", "} /^([^([]*)/{print $1}'); do
+      echo " -> Removing $REMOVEPKG"
+      $CHROOTEXEC usr/bin/apt-get -y remove "$REMOVEPKG"
     done;
 }
 
@@ -31,22 +36,12 @@ function checkbuilddep () {
 PACKAGENAME="$1"
 CHROOTEXEC="chroot $BUILDPLACE "
 
-
-
 if [ ! -f "$PACKAGENAME" ]; then
-  echo "Command line parameter [$PACKAGENAME] is not a valid .dsc file name" >&2
-  exit 1;
+    echo "Command line parameter [$PACKAGENAME] is not a valid .dsc file name" >&2
+    exit 1;
 fi;
 
-cleanbuildplace
-echo "building the build env"
-mkdir -p "$BUILDPLACE"
-(
- cd "$BUILDPLACE"
- tar xfzp "$BASETGZ"
- mkdir -p "$BUILDPLACE/tmp/buildd"
- )
-mountproc
+extractbuildplace 
 
 echo Copying source file
 copydsc "$PACKAGENAME" "$BUILDPLACE/tmp/buildd"
@@ -56,15 +51,17 @@ echo Installing the build-deps
 checkbuilddep
 echo Building the package
 $CHROOTEXEC /bin/sh -c "(cd tmp/buildd/*/; dpkg-buildpackage)"
+
 umountproc
 
 test -n "$BUILDRESULT" && (
-  mkdir -p "$BUILDRESULT"
-  if [ -d "$BUILDRESULT" ]; then
-    cp "$BUILDPLACE"/tmp/buildd/* "$BUILDRESULT"
-  else
-    echo "Error: BUILDRESULT=[$BUILDRESULT] and is not a directory." >&2
-  fi
+    mkdir -p "$BUILDRESULT"
+    if [ -d "$BUILDRESULT" ]; then
+	cp "$BUILDPLACE"/tmp/buildd/* "$BUILDRESULT"
+    else
+	echo "Error: BUILDRESULT=[$BUILDRESULT] and is not a directory." >&2
+    fi
 )
+
 cleanbuildplace