[SCM] Debian packaging for sketch 3D line drawing software branch, master, updated. debian/0.2.183-1-12-g987b56c

[David Bremner]

The following commit has been merged in the master branch:
commit e8639deeabfdf886300bcdbc8fbd6d8a2c7f7960
Author: David Bremner <bremner at unb.ca>
Date:   Sat Dec 18 10:32:08 2010 -0400

    update git-patches for new format, fix bugs introduced by re-organization.

diff --git a/debian/export-patches.sh b/debian/export-patches.sh
index 41c74dc..325d409 100644
--- a/debian/export-patches.sh
+++ b/debian/export-patches.sh
@@ -21,7 +21,7 @@ fi
 
 
 if [ -n "$REPO_DIR" ]; then
-    git_dir="--git-dir=$REPO_DIR/.git"
+    git_dir=\"--git-dir=$REPO_DIR/.git\"
 else
     # support running as a free-standing script, without gitpkg
     DEB_VERSION="$(dpkg-parsechangelog | sed -rne 's/^Version: ([^:]+:)?//p')"
@@ -33,6 +33,9 @@ UPSTREAM_VERSION="${DEB_VERSION%-*}"
 tmpdir=$(mktemp -d patches.XXXXXXX)
 count=1
 
+# counting lines relies on this one being there.
+echo "# Patches exported from git by gitpkg-export-patches" > $tmpdir/series
+
 do_patches (){
     while read -r line
     do
@@ -41,7 +44,7 @@ do_patches (){
 	    \#*)
 		;;
 	    *)
-		if PATCHES="$(git "$git_dir" format-patch --start-number $count -N -o $tmpdir "$line")"; then
+		if PATCHES="$(git $git_dir format-patch --start-number $count -N -o $tmpdir "$line")"; then
 		    echo "$PATCHES" | sed -e "s,$tmpdir/,,g" -e 's, ,\n,g'>> $tmpdir/series
 		    count=$(wc -l $tmpdir/series | cut -f1 -d' ')
 		else
@@ -53,15 +56,13 @@ do_patches (){
     done
 }
 
-echo "# Patches exported from git by gitpkg-export-patches" > $tmpdir/series
-
 sed -e "s/\$DEB_VERSION/$DEB_VERSION/g"			\
     -e "s/\${DEB_VERSION}/$DEB_VERSION/g"		\
     -e "s/\$UPSTREAM_VERSION/$UPSTREAM_VERSION/g"	\
     -e "s/\${UPSTREAM_VERSION}/$UPSTREAM_VERSION/g"	\
     < "$patch_list" | do_patches || exit 1
 
-if [ $count -gt 1 ]; then
+if [ $count -gt 0 ]; then
     rm -rf debian/patches
     mv $tmpdir debian/patches
 else
diff --git a/debian/git-patches b/debian/git-patches
index a4590cd..6f8baff 100644
--- a/debian/git-patches
+++ b/debian/git-patches
@@ -1,5 +1,3 @@
-#upstream/%DEB_UPSTREAM%	patches/%DEB_VERSION%
-upstream/%DEB_UPSTREAM%		patch-queue/upstream
-
+upstream/${UPSTREAM_VERSION}..patches/${DEB_VERSION}
 
 

-- 
Debian packaging for sketch 3D line drawing software