diff -Nru etckeeper-0.14/commit.d/30bzr-add etckeeper-0.14ubuntu1/commit.d/30bzr-add
--- etckeeper-0.14/commit.d/30bzr-add	1970-01-01 01:00:00.000000000 +0100
+++ etckeeper-0.14ubuntu1/commit.d/30bzr-add	2008-04-09 21:37:43.000000000 +0200
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+if [ "$VCS" = bzr ] && [ -d .bzr ]; then
+	if ! bzr add .; then
+		echo "etckeeper warning: bzr add failed" >&2
+	fi
+fi
diff -Nru /tmp/yDLl7EMFvH/etckeeper-0.14/commit.d/40bzr-rm /tmp/eIsdielhH9/etckeeper-0.14ubuntu1/commit.d/40bzr-rm
--- etckeeper-0.14/commit.d/40bzr-rm	2008-03-14 06:38:47.000000000 +0100
+++ etckeeper-0.14ubuntu1/commit.d/40bzr-rm	1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-#!/bin/sh
-set -e
-
-TAB="	"
-
-if [ "$VCS" = bzr ] && [ -d .bzr ]; then
-	for file in $(bzr deleted); do
-		if [ ! -d "$file" ]; then 
-			bzr rm --keep --quiet "$file"
-		fi
-	done
-fi
diff -Nru /tmp/yDLl7EMFvH/etckeeper-0.14/commit.d/40git-rm /tmp/eIsdielhH9/etckeeper-0.14ubuntu1/commit.d/40git-rm
--- etckeeper-0.14/commit.d/40git-rm	2008-03-14 06:38:47.000000000 +0100
+++ etckeeper-0.14ubuntu1/commit.d/40git-rm	2008-04-09 21:37:43.000000000 +0200
@@ -1,7 +1,8 @@
 #!/bin/sh
 set -e
 
-TAB="	"
+IFS='
+'
 
 if [ "$VCS" = git ] && [ -d .git ]; then
 	for file in $(git ls-files --deleted); do
diff -Nru /tmp/yDLl7EMFvH/etckeeper-0.14/commit.d/45bzr-precommit /tmp/eIsdielhH9/etckeeper-0.14ubuntu1/commit.d/45bzr-precommit
--- etckeeper-0.14/commit.d/45bzr-precommit	2008-03-14 06:38:47.000000000 +0100
+++ etckeeper-0.14ubuntu1/commit.d/45bzr-precommit	2008-04-11 23:28:20.000000000 +0200
@@ -2,5 +2,5 @@
 set -e
 
 if [ "$VCS" = bzr ] && [ -d .bzr ]; then
-    etckeeper precommit .
+    etckeeper pre-commit .
 fi
diff -Nru /tmp/yDLl7EMFvH/etckeeper-0.14/debian/changelog /tmp/eIsdielhH9/etckeeper-0.14ubuntu1/debian/changelog
--- etckeeper-0.14/debian/changelog	2008-03-29 18:43:21.000000000 +0100
+++ etckeeper-0.14ubuntu1/debian/changelog	2008-04-12 00:11:59.000000000 +0200
@@ -1,3 +1,22 @@
+etckeeper (0.14ubuntu1) hardy; urgency=low
+
+  [ Daniel Hahler ]
+  * bzr: Set nickname for tree in init.d/40vcs-init.
+  * Add script to add new files during "commit" for bzr (commit.d/30bzr-add).
+  * Fix handling of files with spaces, by setting IFS to "newline" in
+    commit.d/40git-rm.
+  * Fix typo in commit.d/45bzr-precommit (Debian bug #473069)
+  * debian/preinst: Remove /etc/etckeeper/commit.d/40bzr-rm conffile
+  * Modify Maintainer value to match the DebianMaintainerField
+    specification.
+
+  [ Jelmer Vernooij ]
+  * Remove pointless commit.d/40bzr-rm script.
+
+  * All Ubuntu changes will be in the next Debian release.
+
+ -- Daniel Hahler <ubuntu@thequod.de>  Wed, 09 Apr 2008 22:04:22 +0200
+
 etckeeper (0.14) unstable; urgency=low
 
   * When deleting the .metadata, only $VCS rm it if using git. hg write
diff -Nru /tmp/yDLl7EMFvH/etckeeper-0.14/debian/control /tmp/eIsdielhH9/etckeeper-0.14ubuntu1/debian/control
--- etckeeper-0.14/debian/control	2008-03-21 03:10:18.000000000 +0100
+++ etckeeper-0.14ubuntu1/debian/control	2008-04-09 22:04:21.000000000 +0200
@@ -2,7 +2,8 @@
 Section: admin
 Priority: optional
 Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.9.0)
-Maintainer: Joey Hess <joeyh@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Joey Hess <joeyh@debian.org>
 Standards-Version: 3.7.3
 Vcs-Git: git://git.kitenet.net/etckeeper
 Homepage: http://kitenet.net/~joey/code/etckeeper/
@@ -11,7 +12,7 @@
 Architecture: all
 Section: admin
 Depends: git-core (>= 1:1.5.4) | mercurial | bzr (>= 1.0), ${misc:Depends}
-Description: store /etc in git or mercurial
+Description: store /etc in git, mercurial, or bzr
  The etckeeper program is a tool to let /etc be stored in a git, mercurial,
  or bzr repository. It hooks into APT to automatically commit changes made to
  /etc during package upgrades. It tracks file metadata that
diff -Nru /tmp/yDLl7EMFvH/etckeeper-0.14/debian/preinst /tmp/eIsdielhH9/etckeeper-0.14ubuntu1/debian/preinst
--- etckeeper-0.14/debian/preinst	2008-03-21 03:42:41.000000000 +0100
+++ etckeeper-0.14ubuntu1/debian/preinst	2008-04-11 23:45:17.000000000 +0200
@@ -64,4 +64,7 @@
 			prep_mv_conffile etckeeper "/etc/etckeeper/init.d/$c"
 		done
 	fi
+	if dpkg --compare-versions "$2" le "0.14ubuntu1"; then
+		rm_conffile etckeeper "/etc/etckeeper/commit.d/40bzr-rm"
+	fi
 esac
diff -Nru /tmp/yDLl7EMFvH/etckeeper-0.14/init.d/40vcs-init /tmp/eIsdielhH9/etckeeper-0.14ubuntu1/init.d/40vcs-init
--- etckeeper-0.14/init.d/40vcs-init	2008-03-14 06:38:47.000000000 +0100
+++ etckeeper-0.14ubuntu1/init.d/40vcs-init	2008-04-09 21:51:06.000000000 +0200
@@ -10,4 +10,5 @@
 	echo  "description = $(hostname) /etc repository" >> .hg/hgrc
 elif [ "$VCS" = bzr ] && [ ! -e .bzr ]; then
 	bzr init
+	bzr nick "$(hostname) /etc repository"
 fi