8 files changed, 23 insertions, 14 deletions
diff --git a/debian/changelog b/debian/changelog
index f129b47..dbe6fad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,11 @@ libindicator (12.10.2-0ubuntu1) UNRELEASED; urgency=low
   * debian/rules:
     - Convert to using the dh9 sequencer.
     - Override dh_autoreconf to run autogen.sh and not call configure.
+    - Use calls to dh_install per-package to use the right source
+      directories.
   * debian/compat: bump compat level to 9. 
+  * debian/*.install: drop the debian/tmp/gtk* path elements and update for
+    multiarch.
 
  -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>  Wed, 21 Nov 2012 14:23:18 -0500
 
diff --git a/debian/libindicator-dev.install b/debian/libindicator-dev.install
index 25c2128..fb02937 100644
--- a/debian/libindicator-dev.install
+++ b/debian/libindicator-dev.install
@@ -1,4 +1,4 @@
-debian/tmp/gtk2/usr/include /usr/
-debian/tmp/gtk2/usr/lib/pkgconfig/indicator-0.4.pc /usr/lib/pkgconfig/
-debian/tmp/gtk2/usr/lib/libindicator.a /usr/lib/
-debian/tmp/gtk2/usr/lib/libindicator.so /usr/lib/
+usr/include /usr/
+usr/lib/*/pkgconfig/indicator-0.4.pc
+usr/lib/*/libindicator.a
+usr/lib/*/libindicator.so
diff --git a/debian/libindicator-tools.install b/debian/libindicator-tools.install
index 20b86c8..a92f82e 100644
--- a/debian/libindicator-tools.install
+++ b/debian/libindicator-tools.install
@@ -1,2 +1,2 @@
-debian/tmp/gtk2/usr/lib/libindicator/indicator-loader /usr/lib/libindicator/
-debian/tmp/gtk2/usr/share/libindicator/80indicator-debugging /usr/share/libindicator/
+usr/lib/*/indicator-loader
+usr/share/libindicator/80indicator-debugging /usr/share/libindicator/
diff --git a/debian/libindicator3-7.install b/debian/libindicator3-7.install
index 75485eb..a4694a6 100644
--- a/debian/libindicator3-7.install
+++ b/debian/libindicator3-7.install
@@ -1 +1 @@
-debian/tmp/gtk3/usr/lib/libindicator3.so.* /usr/lib/
+usr/lib/*/libindicator3.so.*
diff --git a/debian/libindicator3-dev.install b/debian/libindicator3-dev.install
index e556af3..866f3eb 100644
--- a/debian/libindicator3-dev.install
+++ b/debian/libindicator3-dev.install
@@ -1,4 +1,4 @@
-debian/tmp/gtk3/usr/include /usr/
-debian/tmp/gtk3/usr/lib/pkgconfig/indicator3-0.4.pc /usr/lib/pkgconfig/
-debian/tmp/gtk3/usr/lib/libindicator3.a /usr/lib/
-debian/tmp/gtk3/usr/lib/libindicator3.so /usr/lib/
+usr/include /usr/
+usr/lib/*/pkgconfig/indicator3-0.4.pc
+usr/lib/*/libindicator3.a
+usr/lib/*/libindicator3.so
diff --git a/debian/libindicator3-tools.install b/debian/libindicator3-tools.install
index 47689fd..b73bb85 100644
--- a/debian/libindicator3-tools.install
+++ b/debian/libindicator3-tools.install
@@ -1 +1 @@
-debian/tmp/gtk3/usr/lib/libindicator/indicator-loader3 /usr/lib/libindicator/
+usr/lib/*/indicator-loader3
diff --git a/debian/libindicator7.install b/debian/libindicator7.install
index c3bfad0..4e561b8 100644
--- a/debian/libindicator7.install
+++ b/debian/libindicator7.install
@@ -1 +1 @@
-debian/tmp/gtk2/usr/lib/libindicator.so.* /usr/lib/
+usr/lib/*/libindicator.so.* /usr/lib/
diff --git a/debian/rules b/debian/rules
index 35b1bb9..0ff1401 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,7 +34,12 @@ override_dh_install:
 	find debian/tmp -name \*.la -delete
 	find debian/tmp -name libdummy-indicator\* -delete
 	rm -f debian/tmp/gtk3/usr/share/libindicator/80indicator-debugging
-	dh_install --fail-missing
+	dh_install -plibindicator7 --fail-missing --sourcedir=debian/tmp/gtk2
+	dh_install -plibindicator-dev --fail-missing --sourcedir=debian/tmp/gtk2
+	dh_install -plibindicator-tools --fail-missing --sourcedir=debian/tmp/gtk2
+	dh_install -plibindicator3-7 --fail-missing --sourcedir=debian/tmp/gtk3
+	dh_install -plibindicator3-dev --fail-missing --sourcedir=debian/tmp/gtk3
+	dh_install -plibindicator3-tools --fail-missing --sourcedir=debian/tmp/gtk3
 
 override_dh_makeshlibs:
 	dh_makeshlibs -plibindicator7 -V 'libindicator7 (>= 0.4.90)'