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.29~rc1-1) experimental; urgency=medium
 .
   [ Rob Browning ]
   * test-prune-older: set test git author/committer
 .
   [ Robert Edmonds ]
   * New upstream version 0.29-rc1
Author: Rob Browning <rlb@defaultvalue.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: https://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: 2016-12-24

--- bup-0.29~rc1.orig/Makefile
+++ bup-0.29~rc1/Makefile
@@ -25,7 +25,7 @@ current_sampledata := t/sampledata/var/r
 os := $(shell ($(pf); uname | sed 's/[-_].*//') $(isok))
 os := $(call shout,$(os),Unable to determine OS)
 
-CFLAGS := -Wall -O2 -Werror -Wno-unknown-pragmas $(PYINCLUDE) $(CFLAGS)
+CFLAGS := -Wall -O2 -Wno-unknown-pragmas $(PYINCLUDE) $(CFLAGS)
 CFLAGS := -D_FILE_OFFSET_BITS=64 $(CFLAGS)
 SOEXT:=.so
 
@@ -52,7 +52,7 @@ bup_cmds := cmd/bup-python\
 
 bup_deps := bup lib/bup/_checkout.py lib/bup/_helpers$(SOEXT) $(bup_cmds)
 
-all: $(bup_deps) Documentation/all $(current_sampledata)
+all: $(bup_deps) $(current_sampledata)
 
 bup:
 	ln -s main.py bup
--- bup-0.29~rc1.orig/cmd/version-cmd.py
+++ bup-0.29~rc1/cmd/version-cmd.py
@@ -49,7 +49,7 @@ def version_tag():
     names = names[1:-1]
     l = [n.strip() for n in names.split(',')]
     for n in l:
-        if n.startswith('tag: ') and version_rx.match(n[5:]):
+        if n.startswith('tag: '):
             return n[5:]
     return 'unknown-%s' % version.COMMIT[:7]
 
--- /dev/null
+++ bup-0.29~rc1/config/config.h.tmp
@@ -0,0 +1,27 @@
+/*
+ * configuration for bup, generated Sat Dec 24 19:16:34 UTC 2016
+ * by pbuilder@chase
+ */
+#ifndef __AC_BUP_D
+#define __AC_BUP_D 1
+
+
+#define OS_LINUX 1
+#define HAVE_SYS_STAT_H 1
+#define HAVE_SYS_TYPES_H 1
+#define HAVE_UNISTD_H 1
+#define HAVE_SYS_MMAN_H 1
+#define HAVE_LINUX_FS_H 1
+#define HAVE_SYS_IOCTL_H 1
+#define HAVE_UTIMENSAT 1
+#define HAVE_UTIMES 1
+#define HAVE_LUTIMES 1
+#define HAVE_MINCORE 1
+#define BUP_MINCORE_BUF_TYPE unsigned char
+#define HAVE_STAT_ST_ATIM 1
+#define HAVE_STAT_ST_MTIM 1
+#define HAVE_STAT_ST_CTIM 1
+#define HAVE_TM_TM_GMTOFF 1
+#define PATH_SED "/bin/sed"
+
+#endif/* __AC_BUP_D */
--- bup-0.29~rc1.orig/lib/bup/_release.py
+++ bup-0.29~rc1/lib/bup/_release.py
@@ -2,6 +2,6 @@
 # This will be automatically populated by git via export-subst.
 # cf. ./.gitattributes
 
-COMMIT='$Format:%H$'
-NAMES='$Format:%d$'
-DATE='$Format:%ci$'
+COMMIT='23dda41f704ae15b0f7021b9d2583093ec457eff'
+NAMES=' (HEAD -> branches/0.29, tag: debian/0.29-rc1-1)'
+DATE='2016-12-24 14:15:21 -0500'
--- bup-0.29~rc1.orig/t/test-prune-older
+++ bup-0.29~rc1/t/test-prune-older
@@ -164,6 +164,11 @@ def check_prune_result(expected):
     wvpass(expected == actual)
 
 
+environ['GIT_AUTHOR_NAME'] = 'bup test'
+environ['GIT_COMMITTER_NAME'] = 'bup test'
+environ['GIT_AUTHOR_EMAIL'] = 'bup@a425bc70a02811e49bdf73ee56450e6f'
+environ['GIT_COMMITTER_EMAIL'] = 'bup@a425bc70a02811e49bdf73ee56450e6f'
+
 seed = int(environ.get('BUP_TEST_SEED', time()))
 random.seed(seed)
 print('random seed:', seed, file=stderr)
