diff -u evince-0.9.3/debian/rules evince-0.9.3/debian/rules
--- evince-0.9.3/debian/rules
+++ evince-0.9.3/debian/rules
@@ -1,9 +1,8 @@
 #!/usr/bin/make -f
 
 DEB_BUILDDIR := $(CURDIR)/debian/build/evince
-DEB_DESTDIR := $(CURDIR)/debian/tmp/
 DEB_BUILDDIR_evince-gtk := $(CURDIR)/debian/build/evince-gtk
-DEB_DESTDIR_evince-gtk := $(CURDIR)/debian/tmp-gtk
+DEB_DESTDIR_evince-gtk := $(CURDIR)/debian/tmp/evince-gtk
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
@@ -12,6 +11,8 @@
 include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
+DEB_DESTDIR := $(CURDIR)/debian/tmp/evince
+
 DEB_CONFIGURE_EXTRA_FLAGS := --disable-scrollkeeper --enable-djvu \
 			--enable-dvi --with-print=gtk --enable-pixbuf \
 			--enable-comics --enable-impress --disable-gtk-doc
diff -u evince-0.9.3/debian/evince-gtk.install.disabled evince-0.9.3/debian/evince-gtk.install.disabled
--- evince-0.9.3/debian/evince-gtk.install.disabled
+++ evince-0.9.3/debian/evince-gtk.install.disabled
@@ -1,14 +1,14 @@
-/etc/gconf/schemas/
-/usr/share/applications/evince.desktop
-/usr/share/evince/
-/usr/share/icons/hicolor/
-/usr/share/gnome/help/evince/
-/usr/share/locale/
-/usr/share/omf/evince/
-/usr/share/man/man1/
+evince-gtk/etc/gconf/schemas/ etc/gconf
+evince-gtk/usr/share/applications/evince.desktop usr/share/applications
+evince-gtk/usr/share/evince/ usr/share
+evince-gtk/usr/share/icons/hicolor/ usr/share/icons
+evince-gtk/usr/share/gnome/help/evince/ usr/share/gnome/help
+evince-gtk/usr/share/locale/ usr/share
+evince-gtk/usr/share/omf/evince/ usr/share/omf
+evince-gtk/usr/share/man/man1/ usr/share/man
 
 #Don't install gtk-doc for usual application package:
 #/usr/share/gtk-doc/
 
-/usr/bin/evince
-/usr/bin/evince-thumbnailer
+evince-gtk/usr/bin/evince usr/bin
+evince-gtk/usr/bin/evince-thumbnailer usr/bin
diff -u evince-0.9.3/debian/evince.install.disabled evince-0.9.3/debian/evince.install.disabled
--- evince-0.9.3/debian/evince.install.disabled
+++ evince-0.9.3/debian/evince.install.disabled
@@ -1,15 +1,15 @@
-/etc/gconf/schemas/
-/usr/share/applications/evince.desktop
-/usr/share/evince/
-/usr/share/icons/hicolor/
-/usr/share/gnome/help/evince/
-/usr/share/locale/
-/usr/share/omf/evince/
-/usr/share/man/man1/
+evince/etc/gconf/schemas/ etc/gconf
+evince/usr/share/applications/evince.desktop usr/share/applications
+evince/usr/share/evince/ usr/share
+evince/usr/share/icons/hicolor/ usr/share/icons
+evince/usr/share/gnome/help/evince/ usr/share/gnome/help
+evince/usr/share/locale/ usr/share
+evince/usr/share/omf/evince/ usr/share/omf
+evince/usr/share/man/man1/ usr/share/man
 
 #Don't install gtk-doc for usual application package:
-/usr/share/gtk-doc/
+evince/usr/share/gtk-doc/ usr/share
 
-/usr/bin/evince
-/usr/bin/evince-thumbnailer
-/usr/lib/nautilus/extensions-1.0/libevince-properties-page.so
+evince/usr/bin/evince usr/bin
+evince/usr/bin/evince-thumbnailer usr/bin
+evince/usr/lib/nautilus/extensions-1.0/libevince-properties-page.so usr/lib/nautilus/extensions-1.0
diff -u evince-0.9.3/debian/changelog evince-0.9.3/debian/changelog
--- evince-0.9.3/debian/changelog
+++ evince-0.9.3/debian/changelog
@@ -1,3 +1,13 @@
+evince (0.9.3-0ubuntu2) gutsy; urgency=low
+
+  * debian/rules:
+    - use DEB_DESTDIR=debian/tmp/evince{,gtk} for evince{,gtk} so that the right
+      files go in evince-gtk, instead of being copied from evince. (LP: #121871)
+    - Move DEB_DESTDIR declaration after the includes so that it's not overriden
+  * debian/evince{,gtk}.install.disabled: Make them work with the changes
+
+ -- Albin Tonnerre <lut1n.tne@gmail.com>  Tue, 21 Aug 2007 21:27:47 +0200
+
 evince (0.9.3-0ubuntu1) gutsy; urgency=low
 
   * New upstream release: