diff -Nru bzr-gtk-0.100.0+bzr737/debian/bzr-gtk.install bzr-gtk-0.100.0+bzr737/debian/bzr-gtk.install
--- bzr-gtk-0.100.0+bzr737/debian/bzr-gtk.install	2011-08-22 17:33:55.000000000 +0000
+++ bzr-gtk-0.100.0+bzr737/debian/bzr-gtk.install	2011-11-05 13:23:05.000000000 +0000
@@ -1,9 +1,9 @@
-/usr/bin/bzr-handle-patch
-/usr/bin/bzr-notify
-/usr/lib/python*
-/usr/share/application-registry/bzr-gtk.applications
-/usr/share/applications/*.desktop
-/usr/share/bzr-gtk
-/usr/share/icons/hicolor/scalable/apps/bzr-panel.svg
-/usr/share/pixmaps/bzr-icon-64.png
+usr/bin/bzr-handle-patch
+usr/bin/bzr-notify
+usr/lib/python*
+usr/share/application-registry/bzr-gtk.applications
+usr/share/applications/*.desktop
+usr/share/bzr-gtk
+usr/share/icons/hicolor/scalable/apps/bzr-panel.svg
+usr/share/pixmaps/bzr-icon-64.png
 bzr-notify.desktop etc/xdg/autostart
diff -Nru bzr-gtk-0.100.0+bzr737/debian/changelog bzr-gtk-0.100.0+bzr737/debian/changelog
--- bzr-gtk-0.100.0+bzr737/debian/changelog	2011-11-04 14:17:00.000000000 +0000
+++ bzr-gtk-0.100.0+bzr737/debian/changelog	2011-11-05 22:19:37.000000000 +0000
@@ -1,8 +1,18 @@
-bzr-gtk (0.100.0+bzr737-2~bazaar1~lucid1) lucid; urgency=low
+bzr-gtk (0.100.0+bzr737-2.1~bazaar1~lucid1) lucid; urgency=low
 
   * Rebuild in PPA.
 
- -- Max Bowsher <_@maxb.eu>  Fri, 04 Nov 2011 14:17:00 +0000
+ -- Max Bowsher <_@maxb.eu>  Sat, 05 Nov 2011 22:19:37 +0000
+
+bzr-gtk (0.100.0+bzr737-2.1) unstable; urgency=low
+
+  * Non-maintainer upload, for the GNOME 3 transition.
+  * Drop the nautilus-bzr package (closes: #644689).
+  * Pass --destdir=debian/tmp to dh_auto_install to avoid dh_install
+    getting confused on where to get things from, as now there's just one
+    binary package. Don't fail on --list-missing anymore.
+
+ -- Jordi Mallach <jordi@debian.org>  Sat, 05 Nov 2011 14:11:11 +0100
 
 bzr-gtk (0.100.0+bzr737-2) unstable; urgency=low
 
diff -Nru bzr-gtk-0.100.0+bzr737/debian/control bzr-gtk-0.100.0+bzr737/debian/control
--- bzr-gtk-0.100.0+bzr737/debian/control	2011-08-27 13:07:01.000000000 +0000
+++ bzr-gtk-0.100.0+bzr737/debian/control	2011-11-05 13:35:58.000000000 +0000
@@ -34,17 +34,17 @@
  tool: gannotate, gbranch, gcheckout, gcommit, gconflicts, gdiff, gloom,
  gmissing, gpreferences, gpush, gstatus, visualise.
 
-Package: nautilus-bzr
-Architecture: all
-Depends: bzr-gtk (= ${source:Version}),
-         python-nautilus (>= 0.5.0),
-         ${misc:Depends}
-Enhances: nautilus
-Suggests: nautilus-scripts-manager
-Description: Bazaar (bzr) integration for nautilus
- Basic plugin for Nautilus that provides integration for the
- Bazaar version control system (bzr).
- .
- The plugin adds icon overlays to versioned files indicating
- their status and provides access to the dialogs in the bzr-gtk
- package from a context menu.
+#Package: nautilus-bzr
+#Architecture: all
+#Depends: bzr-gtk (= ${source:Version}),
+#         python-nautilus (>= 0.5.0),
+#         ${misc:Depends}
+#Enhances: nautilus
+#Suggests: nautilus-scripts-manager
+#Description: Bazaar (bzr) integration for nautilus
+# Basic plugin for Nautilus that provides integration for the
+# Bazaar version control system (bzr).
+# .
+# The plugin adds icon overlays to versioned files indicating
+# their status and provides access to the dialogs in the bzr-gtk
+# package from a context menu.
diff -Nru bzr-gtk-0.100.0+bzr737/debian/rules bzr-gtk-0.100.0+bzr737/debian/rules
--- bzr-gtk-0.100.0+bzr737/debian/rules	2011-10-01 11:05:53.000000000 +0000
+++ bzr-gtk-0.100.0+bzr737/debian/rules	2011-11-05 13:41:44.000000000 +0000
@@ -6,7 +6,7 @@
 override_dh_auto_install:
 	-test -f credits.pickle && touch credits.pickle.preserve
 	cp debian/credits.pickle credits.pickle
-	dh_auto_install
+	dh_auto_install --destdir=debian/tmp
 
 override_dh_auto_clean:
 	-test -f credits.pickle.preserve || rm credits.pickle
@@ -14,7 +14,8 @@
 	dh_auto_clean
 
 override_dh_install:
-	dh_install --list-missing --fail-missing
+	#dh_install --list-missing --fail-missing
+	dh_install --list-missing
 
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 override_dh_auto_test: