11 files changed, 21 insertions, 19 deletions
diff --git a/debian/changelog b/debian/changelog
index c60324c..ef4532d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ libappindicator (12.10.1-0ubuntu1) UNRELEASED; urgency=low
   * debian/compat: bump to compat level 9.
   * debian/rules:
     - Convert from cdbs to debhelper 9.
+  * debian/*.install:
+    - Update paths for multiarch and for use with dh9 (remove debian/tmp...)
 
  -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>  Mon, 26 Nov 2012 11:02:18 -0500
 
diff --git a/debian/gir1.2-appindicator-0.1.install b/debian/gir1.2-appindicator-0.1.install
index 13b1776..78b7732 100644
--- a/debian/gir1.2-appindicator-0.1.install
+++ b/debian/gir1.2-appindicator-0.1.install
@@ -1 +1 @@
-debian/tmp/usr/lib/girepository-1.0/AppIndicator-0.1.typelib
+usr/lib/*/girepository-1.0/AppIndicator-0.1.typelib
diff --git a/debian/gir1.2-appindicator3-0.1.install b/debian/gir1.2-appindicator3-0.1.install
index 54ce899..18925bd 100644
--- a/debian/gir1.2-appindicator3-0.1.install
+++ b/debian/gir1.2-appindicator3-0.1.install
@@ -1 +1 @@
-debian/tmp/usr/lib/girepository-1.0/AppIndicator3-0.1.typelib
+usr/lib/*/girepository-1.0/AppIndicator3-0.1.typelib
diff --git a/debian/libappindicator-dev.install b/debian/libappindicator-dev.install
index b401920..092a809 100644
--- a/debian/libappindicator-dev.install
+++ b/debian/libappindicator-dev.install
@@ -1,5 +1,5 @@
-debian/tmp/usr/include/libappindicator-0.1/*
-debian/tmp/usr/lib/libappindicator.so
-debian/tmp/usr/lib/pkgconfig/appindicator-0.1.pc
-debian/tmp/usr/share/gir-1.0/AppIndicator-0.1.gir
-debian/tmp/usr/share/vala/vapi/appindicator-0.1.vapi
+usr/include/libappindicator-0.1/*
+usr/lib/*/libappindicator.so
+usr/lib/*/pkgconfig/appindicator-0.1.pc
+usr/share/gir-1.0/AppIndicator-0.1.gir
+usr/share/vala/vapi/appindicator-0.1.vapi
diff --git a/debian/libappindicator-doc.install b/debian/libappindicator-doc.install
index 313fe33..f2d9d8e 100644
--- a/debian/libappindicator-doc.install
+++ b/debian/libappindicator-doc.install
@@ -1 +1 @@
-debian/tmp/usr/share/gtk-doc/html/libappindicator/*
+usr/share/gtk-doc/html/libappindicator/*
diff --git a/debian/libappindicator0.1-cil-dev.install b/debian/libappindicator0.1-cil-dev.install
index 6185943..231bcc4 100644
--- a/debian/libappindicator0.1-cil-dev.install
+++ b/debian/libappindicator0.1-cil-dev.install
@@ -1 +1 @@
-debian/tmp/usr/lib/pkgconfig/appindicator-sharp-0.1.pc
+usr/lib/*/pkgconfig/appindicator-sharp-0.1.pc
diff --git a/debian/libappindicator0.1-cil.install b/debian/libappindicator0.1-cil.install
index 106b727..1a0aeca 100644
--- a/debian/libappindicator0.1-cil.install
+++ b/debian/libappindicator0.1-cil.install
@@ -1 +1 @@
-debian/tmp/usr/lib/cli/appindicator-sharp-0.1/* 
+usr/lib/*/cli/appindicator-sharp-0.1/* /usr/lib/cli/appindicator-sharp-0.1/
diff --git a/debian/libappindicator1.install b/debian/libappindicator1.install
index a0b5976..94db7c9 100644
--- a/debian/libappindicator1.install
+++ b/debian/libappindicator1.install
@@ -1 +1 @@
-debian/tmp/usr/lib/libappindicator.so.*
+usr/lib/*/libappindicator.so.*
diff --git a/debian/libappindicator3-1.install b/debian/libappindicator3-1.install
index 8773436..b77e45c 100644
--- a/debian/libappindicator3-1.install
+++ b/debian/libappindicator3-1.install
@@ -1 +1 @@
-debian/tmp/usr/lib/libappindicator3.so.*
+usr/lib/*/libappindicator3.so.*
diff --git a/debian/libappindicator3-dev.install b/debian/libappindicator3-dev.install
index b18c92c..50dc770 100644
--- a/debian/libappindicator3-dev.install
+++ b/debian/libappindicator3-dev.install
@@ -1,5 +1,5 @@
-debian/tmp/usr/lib/libappindicator3.so
-debian/tmp/usr/lib/pkgconfig/appindicator3-0.1.pc
-debian/tmp/usr/include/libappindicator3-0.1/*
-debian/tmp/usr/share/gir-1.0/AppIndicator3-0.1.gir
-debian/tmp/usr/share/vala/vapi/appindicator3-0.1.vapi
+usr/lib/*/libappindicator3.so
+usr/lib/*/pkgconfig/appindicator3-0.1.pc
+usr/include/libappindicator3-0.1/*
+usr/share/gir-1.0/AppIndicator3-0.1.gir
+usr/share/vala/vapi/appindicator3-0.1.vapi
diff --git a/debian/python-appindicator.install b/debian/python-appindicator.install
index 00bdd51..b468dac 100644
--- a/debian/python-appindicator.install
+++ b/debian/python-appindicator.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/python2.*
-debian/tmp/usr/share/pygtk/*
+usr/lib/python2.*
+usr/share/pygtk/*