tags 464983 + patch kthxbye NMU diff for 0.28-1.1 attached.
Regards,
--
Chris Lamb, UK [EMAIL PROTECTED]
GPG: 0x634F9A20
diff -urNad ../guilt-0.28.orig/debian/changelog ../guilt-0.28/debian/changelog
--- ../guilt-0.28.orig/debian/changelog 2008-04-06 19:29:39.000000000 +0100
+++ ../guilt-0.28/debian/changelog 2008-04-06 19:48:20.000000000 +0100
@@ -1,3 +1,10 @@
+guilt (0.28-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Add 'fix-bashisms.patch' (Closes: #464983)
+
+ -- Chris Lamb <[EMAIL PROTECTED]> Sun, 06 Apr 2008 19:46:59 +0100
+
guilt (0.28-1) unstable; urgency=low
* New upstream release
diff -urNad ../guilt-0.28.orig/debian/patches/fix-bashisms.patch
../guilt-0.28/debian/patches/fix-bashisms.patch
--- ../guilt-0.28.orig/debian/patches/fix-bashisms.patch 1970-01-01
01:00:00.000000000 +0100
+++ ../guilt-0.28/debian/patches/fix-bashisms.patch 2008-04-06
19:46:44.000000000 +0100
@@ -0,0 +1,70 @@
+# fix-bashisms.patch
+#
+# * Fix some bashisms
+#
+# -- Chris Lamb <[EMAIL PROTECTED]> Sun, 06 Apr 2008 19:46:21 +0100
+
+--- guilt-0.28.orig/guilt 2008-04-06 19:29:39.000000000 +0100
++++ guilt-0.28/guilt 2008-04-06 19:42:49.000000000 +0100
+@@ -38,12 +38,6 @@
+ # Shell library
+ #
+
+-# echo -e is a bashism, fallback to /bin/echo if the builtin does not
supports it
+-echo()
+-{
+- /bin/echo "$@"
+-}
+-
+ noerr()
+ {
+ "$@" 2>/dev/null
+@@ -108,9 +102,9 @@
+
+ echo ""
+ echo "Example:"
+- echo -e "\tguilt-push"
++ printf "\tguilt-push\n"
+ echo "or"
+- echo -e "\tguilt push"
++ printf "\tguilt push\n"
+
+ # now, let's exit
+ exit 1
+--- guilt-0.28.orig/guilt-graph 2008-04-06 19:29:39.000000000 +0100
++++ guilt-0.28/guilt-graph 2008-04-06 19:43:59.000000000 +0100
+@@ -55,7 +55,7 @@
+ done
+
+ sort -u "$cache/dep" | while read h; do
+- echo " \"${h:0:8}\" -> \"${current:0:8}\"; // ?"
++ echo " \"$(echo "$h" | cut -b1-8)\" -> \"$(echo "$h" | cut
-b1-8)\"; // ?"
+ done
+
+ current=`git-rev-parse $current^`
+--- guilt-0.28.orig/guilt-patchbomb 2008-04-06 19:29:39.000000000 +0100
++++ guilt-0.28/guilt-patchbomb 2008-04-06 19:44:07.000000000 +0100
+@@ -40,10 +40,7 @@
+ die "Aborting..."
+ fi
+
+-dir=/tmp/patches-$RANDOM/
+-if [ -e $dir ]; then
+- die "Conspiracy uncovered: Temporary dir '$dir' already exists"
+-fi
++dir="$(mktemp -d)"
+ echo "Using '$dir' as temporary directory"
+
+ git-format-patch -o $dir -n -s "$r"
+@@ -92,7 +89,7 @@
+ cat "$TMP_FILE" >> "$fulln~"
+ tail -n +2 "$fulln" >> "$fulln~"
+ mv "$fulln~" "$fulln"
+- echo "${n:0:4}: Including Cc from patch description"
++ echo "$(echo "${n}" | cut -b1-4): Including Cc from patch
description"
+ rm -f "$TMP_FILE"
+ fi
+ done
diff -urNad ../guilt-0.28.orig/debian/patches/series
../guilt-0.28/debian/patches/series
--- ../guilt-0.28.orig/debian/patches/series 2008-04-06 19:29:39.000000000
+0100
+++ ../guilt-0.28/debian/patches/series 2008-04-06 19:45:17.000000000 +0100
@@ -1 +1,2 @@
makefile.patch
+fix-bashisms.patch
signature.asc
Description: PGP signature
