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.27-2) unstable; urgency=medium
 .
   [ Chris Lamb ]
   * debian/gen_version_py.sh: Make the build reproducible (Closes: #792673)
 .
   [ Robert Edmonds ]
   * debian/gbp.conf: Add [dch] section
   * debian/gbp.conf: Move 'debian-branch' setting into [DEFAULT] section
   * debian/: Run "wrap-and-sort -sbt"
   * debian/control: Update Vcs-Browser
   * debian/control: Add dh-python to Build-Depends
Author: Robert Edmonds <edmonds@debian.org>
Bug-Debian: https://bugs.debian.org/792673

---
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: <YYYY-MM-DD>

--- bup-0.27.orig/Documentation/bup-mux.md
+++ bup-0.27/Documentation/bup-mux.md
@@ -22,6 +22,7 @@ connection stream.
 
 command
 :   the command to run
+
 options
 :   options for the command
 
--- bup-0.27.orig/Documentation/bup.md
+++ bup-0.27/Documentation/bup.md
@@ -41,20 +41,28 @@ pages.
 
 `bup-fsck`(1)
 :   Check backup sets for damage and add redundancy information
+
 `bup-ftp`(1)
 :   Browse backup sets using an ftp-like client
+
 `bup-fuse`(1)
 :   Mount your backup sets as a filesystem
+
 `bup-help`(1)
 :   Print detailed help for the given command
+
 `bup-index`(1)
 :   Create or display the index of files to back up
+
 `bup-on`(1)
 :   Backup a remote machine to the local one
+
 `bup-restore`(1)
 :   Extract files from a backup set
+
 `bup-save`(1)
 :   Save files into a backup set (note: run "bup index" first)
+
 `bup-web`(1)
 :   Launch a web server to examine backup sets
 
@@ -63,30 +71,43 @@ pages.
 
 `bup-damage`(1)
 :   Deliberately destroy data
+
 `bup-drecurse`(1)
 :   Recursively list files in your filesystem
+
 `bup-init`(1)
 :   Initialize a bup repository
+
 `bup-join`(1)
 :   Retrieve a file backed up using `bup-split`(1)
+
 `bup-ls`(1)
 :   Browse the files in your backup sets
+
 `bup-margin`(1)
 :   Determine how close your bup repository is to armageddon
+
 `bup-memtest`(1)
 :   Test bup memory usage statistics
+
 `bup-midx`(1)
 :   Index objects to speed up future backups
+
 `bup-newliner`(1)
 :   Make sure progress messages don't overlap with output
+
 `bup-random`(1)
 :   Generate a stream of random output
+
 `bup-server`(1)
 :   The server side of the bup client-server relationship
+
 `bup-split`(1)
 :   Split a single file into its own backup set
+
 `bup-tick`(1)
 :   Wait for up to one second.
+
 `bup-version`(1)
 :   Report the version number of your copy of bup.
 
--- bup-0.27.orig/Makefile
+++ bup-0.27/Makefile
@@ -3,7 +3,7 @@ sampledata_rev := $(shell t/configure-sa
 current_sampledata := t/sampledata/var/rev/v$(sampledata_rev)
 
 OS:=$(shell uname | sed 's/[-_].*//')
-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
 
@@ -20,7 +20,7 @@ endif
 initial_setup := $(shell ./configure-version --update)
 bup_deps := bup lib/bup/_version.py lib/bup/_helpers$(SOEXT) cmds
 
-all: $(bup_deps) Documentation/all $(current_sampledata)
+all: $(bup_deps) $(current_sampledata)
 
 bup:
 	ln -s main.py bup
--- bup-0.27.orig/configure-version
+++ bup-0.27/configure-version
@@ -18,7 +18,7 @@ fi
 case "$1" in
     --update)
         rm -f $vpy.tmp-$$
-        ./format-subst.pl $vpy.pre > $vpy.tmp-$$
+        ./debian/gen_version_py.sh $vpy.pre > $vpy.tmp-$$
         if ! test -e $vpy || ! cmp -s $vpy $vpy.tmp-$$; then
             mv $vpy.tmp-$$ $vpy;
         fi
--- bup-0.27.orig/lib/bup/_version.py.pre
+++ bup-0.27/lib/bup/_version.py.pre
@@ -1,4 +1,4 @@
 
-COMMIT='d612d9a599590cb53a76711754f9e031f66a330a'
-NAMES=' (tag: 0.27)'
-DATE='2015-04-26 11:38:57 -0500'
+COMMIT='5bcda72e6431e254743dc8d5b26165915cb1442e'
+NAMES=' (HEAD -> debian, tag: debian/0.27-2)'
+DATE='2015-12-19 15:17:10 -0500'
