fiddle with mangle-version patch

This is a semi-synthetic patch, necessary to align the git repo with
what was actually uploaded.

diff --git a/debian/patches/mangle-version b/debian/patches/mangle-version
index 2e053a95e530b4a960fbce077d981f209ecf9d73..a182a7917fd1672798066cd871efa544d5fd6478 100644 (file)
--- a/debian/patches/mangle-version
+++ b/debian/patches/mangle-version
@@ -1,13 +1,9 @@
-Description: set version string to that of orig tarball
-Author: Jon Dowland <jmtd@debian.org>
-Last-Update: 2011-11-19
-
---- bup-0.24b.orig/lib/bup/_version.py.pre
-+++ bup-0.24b/lib/bup/_version.py.pre
+--- a/lib/bup/_version.py.pre~ 2011-11-04 17:55:15.000000000 +0000
++++ b/lib/bup/_version.py.pre  2011-12-05 15:14:41.889885203 +0000
 @@ -1,4 +1,4 @@
  
 -COMMIT='8953dc8d911844ae5c5764ac542811e95e592fe4'
--NAMES=' (HEAD, upstream/master, master)'
+-NAMES=' (origin/master, origin/HEAD, master)'
 -DATE='2011-11-04 13:55:15 -0400'
 +COMMIT='$Format:%H$'
 +NAMES='$Format:%d$'

diff --git a/debian/patches/series b/debian/patches/series
index 7dadff6a22079f2c45cbf9dc4eda795b21eee273..6b45a6714be606bdb7d55ee17fa2848e6f09d330 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-excise-tornado
 mangle-version
+excise-tornado
 no-werror