diff -Nru etckeeper-0.55ubuntu2/debian/changelog etckeeper-0.56ubuntu1/debian/changelog
--- etckeeper-0.55ubuntu2/debian/changelog	2011-07-07 16:14:19.000000000 +0200
+++ etckeeper-0.56ubuntu1/debian/changelog	2011-07-27 17:52:33.000000000 +0200
@@ -1,3 +1,22 @@
+etckeeper (0.56ubuntu1) oneiric; urgency=low
+
+  * Merge from debian unstable. (LP: #817074) Remaining changes:
+    - etckeeper.conf, debian/control: default to bzr.
+    - etckeeper.spec: Change version to match Ubuntu version
+    - commit.d/50vcs-commit: Avoid failure in initial commit if etckeeper
+      is not installed from a tty (like early during installation)
+  * Dropped change, fixed in Debian:
+    - Convert from python-central to dh_python2
+
+ -- Angel Abad <angelabad@ubuntu.com>  Wed, 27 Jul 2011 17:45:13 +0200
+
+etckeeper (0.56) unstable; urgency=low
+
+  * Converted to use dh_python2. Closes: #616800 
+  * Handle files with % in their names.
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 12 Jul 2011 14:38:09 -0400
+
 etckeeper (0.55ubuntu2) oneiric; urgency=low
 
   * Convert from python-central to dh_python2
@@ -787,4 +806,3 @@
   * First release.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 11 Nov 2007 01:11:21 -0500
-
diff -Nru etckeeper-0.55ubuntu2/debian/control etckeeper-0.56ubuntu1/debian/control
--- etckeeper-0.55ubuntu2/debian/control	2011-07-07 16:14:19.000000000 +0200
+++ etckeeper-0.56ubuntu1/debian/control	2011-07-27 17:47:27.000000000 +0200
@@ -1,10 +1,11 @@
 Source: etckeeper
 Section: admin
 Priority: optional
-Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.9.0), bzr (>= 1.5~), python (>= 2.6.6-3~)
+Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.9.0), bzr (>= 1.5~), python
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: Joey Hess <joeyh@debian.org>
 Standards-Version: 3.9.2
+XS-Python-Version: all
 Vcs-Git: git://git.kitenet.net/etckeeper
 Homepage: http://kitenet.net/~joey/code/etckeeper/
 
diff -Nru etckeeper-0.55ubuntu2/etckeeper.spec etckeeper-0.56ubuntu1/etckeeper.spec
--- etckeeper-0.55ubuntu2/etckeeper.spec	2011-07-07 16:15:17.000000000 +0200
+++ etckeeper-0.56ubuntu1/etckeeper.spec	2011-07-27 17:52:36.000000000 +0200
@@ -1,5 +1,5 @@
 Name: etckeeper
-Version: 0.55ubuntu2
+Version: 0.56ubuntu1
 Release: 4%{?dist}
 Summary: store /etc in git, mercurial, bzr or darcs
 
diff -Nru etckeeper-0.55ubuntu2/pre-commit.d/30store-metadata etckeeper-0.56ubuntu1/pre-commit.d/30store-metadata
--- etckeeper-0.55ubuntu2/pre-commit.d/30store-metadata	2011-07-07 16:14:19.000000000 +0200
+++ etckeeper-0.56ubuntu1/pre-commit.d/30store-metadata	2011-07-13 01:28:43.000000000 +0200
@@ -36,6 +36,12 @@
 	fi
 }
 
+statf() {
+	while read statfile; do
+		echo "$(stat --format="$1" "$statfile") '$statfile'"
+	done
+}
+
 generate_metadata() {
 	# This function generates the script commands to fix any files
 	# that aren't owner=root, group=root, or mode=0644 or 0755.
@@ -71,28 +77,23 @@
 			printf "ln -sf '%s' '%s'\n" "$dest" "$link"
 		done
 	fi
-
+       	
 	# Find all files and directories that don't have the current user as the owner
-	find $NOVCS \! -user "$(id -u)" -exec stat --format="maybe chown %U '{}'" {} \; \
-		| sort | filter_unknown 'maybe chown' owner
+	find $NOVCS \! -user "$(id -u)" -print | statf "maybe chown %U" | sort | filter_unknown 'maybe chown' owner
 	# Find all files and directories that don't have root as the group
-	find $NOVCS \! -group $(id -g) -exec stat --format="maybe chgrp %G '{}'" {} \; \
-		| sort | filter_unknown 'maybe chgrp' group
+	find $NOVCS \! -group $(id -g) -print | statf "maybe chgrp %G" | sort | filter_unknown 'maybe chgrp' group
 
 	# Find all directories that aren't 0755
-	find $NOVCS -type d \! -perm 0755 \
-		-exec stat --format="maybe chmod %a '{}'" {} \; | sort
+	find $NOVCS -type d \! -perm 0755 -print | statf "maybe chmod %a" | sort
 
 	if [ "$VCS" = darcs ]; then
 		# Find all files that aren't 0644 (darcs doesn't maintain
 		# the executable bit).
-		find $NOVCS -type f \! -perm 0644 \
-			-exec stat --format="maybe chmod %a '{}'" {} \; | sort
+		find $NOVCS -type f \! -perm 0644 -print | statf "maybe chmod %a" | sort
 	else
 		# Find all files that aren't 0644 or 0755 (we can assume the VCS will
 		# maintain the executable bit).
-		find $NOVCS -type f \! -perm 0644 \! -perm 0755 \
-			-exec stat --format="maybe chmod %a '{}'" {} \; | sort
+		find $NOVCS -type f \! -perm 0644 \! -perm 0755 -print | statf "maybe chmod %a" | sort
 	fi
 
 	# We don't handle xattrs.