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.25-1) unstable; 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.25.orig/Makefile
+++ bup-0.25/Makefile
@@ -1,5 +1,5 @@
 OS:=$(shell uname | sed 's/[-_].*//')
-CFLAGS := -Wall -O2 -Werror $(PYINCLUDE) $(CFLAGS)
+CFLAGS := -Wall -O2 $(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
@@ -80,7 +80,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.25.orig/lib/bup/_version.py.pre
+++ bup-0.25/lib/bup/_version.py.pre
@@ -1,4 +1,4 @@
 
-COMMIT='5a7fd007e89bb343ab2024d9a87d54bbee997bbf'
-NAMES=' (tag: 0.25-rc5, tag: 0.25, upstream/master, origin/master, origin/HEAD, master)'
-DATE='2013-12-09 19:30:45 -0600'
+COMMIT='addebf92d2c56924d0ab77eaba0e51006ae1f59e'
+NAMES=' (HEAD, tag: debian/0.25-1, debian)'
+DATE='2013-12-16 11:56:33 -0500'
