Description: <short summary of the patch>
 TODO: Put a short summary on the line above and replace this paragraph
 with a longer explanation of this change. Complete the meta-information
 with other relevant fields (see below for details). To make it easier, the
 information below has been extracted from the changelog. Adjust it or drop
 it.
 .
 bup (0.26~rc1-1) experimental; urgency=medium
 .
   * New upstream release.
Author: Robert S. Edmonds <edmonds@debian.org>

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>

--- bup-0.26~rc1.orig/Makefile
+++ bup-0.26~rc1/Makefile
@@ -1,5 +1,5 @@
 OS:=$(shell uname | sed 's/[-_].*//')
-CFLAGS := -Wall -O2 -Werror -Wno-unknown-pragmas $(PYINCLUDE) $(CFLAGS)
+CFLAGS := -Wall -O2 -Wno-unknown-pragmas $(PYINCLUDE) $(CFLAGS)
 SOEXT:=.so
 
 ifeq ($(OS),CYGWIN)
@@ -14,7 +14,7 @@ endif
 
 default: all
 
-all: bup Documentation/all
+all: bup
 	t/configure-sampledata --setup
 
 bup: lib/bup/_version.py lib/bup/_helpers$(SOEXT) cmds
@@ -77,7 +77,7 @@ lib/bup/_helpers$(SOEXT): \
 .PHONY: lib/bup/_version.py
 lib/bup/_version.py:
 	rm -f $@ $@.new
-	./format-subst.pl $@.pre >$@.new
+	./debian/gen_version_py.sh >$@.new
 	mv $@.new $@
 
 runtests: all runtests-python runtests-cmdline
--- bup-0.26~rc1.orig/lib/bup/_version.py.pre
+++ bup-0.26~rc1/lib/bup/_version.py.pre
@@ -1,4 +1,4 @@
 
-COMMIT='16cd7cae8107e837447b6466f62cc9ce3b4fe635'
-NAMES=' (tag: 0.26-rc1)'
-DATE='2014-05-13 14:08:22 -0500'
+COMMIT='bd9d9a6079abab01266bf8ac557455cd9edf98a8'
+NAMES=' (HEAD, tag: debian/0.26-rc1-1, debian)'
+DATE='2014-05-28 19:00:58 -0400'
