18 files changed, 138 insertions, 44 deletions
diff --git a/debian/changelog b/debian/changelog
index a274ee3..9ed20be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libdbusmenu (0.5.1-0ubuntu1~ppa1) oneiric; urgency=low
+libdbusmenu (0.5.1-0ubuntu1) precise; urgency=low
 
   * New upstream release.
     * Allow for an ID of 0 in about_to_show for indicators (LP: #862989)
@@ -6,7 +6,35 @@ libdbusmenu (0.5.1-0ubuntu1~ppa1) oneiric; urgency=low
     * Ensure we drop all references to the GTK widget when a menuitem
       gets destroyed (LP: #835646)
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 13 Oct 2011 11:31:15 -0500
+ -- Ted Gould <ted@ubuntu.com>  Fri, 28 Oct 2011 09:35:13 -0400
+
+libdbusmenu (0.5.0-1ubuntu1) precise; urgency=low
+
+  * Multiarch conversion (partial, gobject instrospection not touched)
+    (LP: #859512)
+
+ -- Riku Voipio <riku.voipio@linaro.org>  Mon, 26 Sep 2011 12:13:07 +0300
+
+libdbusmenu (0.5.0-1) experimental; urgency=low
+
+  * Merge from Ubuntu.
+    + Re-enable GTK3 packages.
+  * Re-order includes in debian/rules to prevent lintian's
+    E: libdbusmenu source: temporary-debhelper-file
+
+ -- Evgeni Golov <evgeni@debian.org>  Sat, 15 Oct 2011 09:29:54 +0200
+
+libdbusmenu (0.5.0-0ubuntu3) oneiric; urgency=low
+
+  * libdbusmenu-gtk/client.c:
+    - Make sure to actually free memory associated with GtkMenuItems we
+      create.  We are holding the sunk floating ref, so we have to
+      actually unref as well as destroy the widget.  Part of bug 835646.
+  * libdbusmenu-gtk/genericmenuitem.c:
+    - When setting an image on a menu item for the second time before
+      setting a label, don't try to use free'd memory. 
+
+ -- Michael Terry <mterry@ubuntu.com>  Thu, 06 Oct 2011 10:35:21 -0400
 
 libdbusmenu (0.5.0-0ubuntu2) oneiric; urgency=low
 
@@ -129,6 +157,15 @@ libdbusmenu (0.4.4-0ubuntu1~ppa1) natty; urgency=low
 
  -- Ted Gould <ted@ubuntu.com>  Mon, 25 Apr 2011 15:19:25 -0500
 
+libdbusmenu (0.4.3-1) unstable; urgency=low
+
+  * Merge new upstream release from Ubuntu.
+  * Do not build-depend on gir-repository-dev, libgtk2.0-dev 
+    has Gtk-2.0.gir since 2.24.4-1 (bump B-D accordingly).
+  * Standards-Version: 3.9.2
+
+ -- Evgeni Golov <evgeni@debian.org>  Wed, 27 Apr 2011 14:00:04 +0200
+
 libdbusmenu (0.4.3-0ubuntu3) natty; urgency=low
 
   * Backport bug fixes from trunk:
@@ -169,6 +206,12 @@ libdbusmenu (0.4.3-0ubuntu1) natty; urgency=low
 
  -- Ted Gould <ted@ubuntu.com>  Thu, 14 Apr 2011 16:49:13 -0500
 
+libdbusmenu (0.4.2-1) unstable; urgency=low
+
+  * Merge new upstream release from Ubuntu.
+
+ -- Evgeni Golov <evgeni@debian.org>  Mon, 11 Apr 2011 12:43:49 +0200
+
 libdbusmenu (0.4.2-0ubuntu3) natty; urgency=low
 
   * Merged fix, guard against an activation that does not actually have 
@@ -206,6 +249,27 @@ libdbusmenu (0.4.1-0ubuntu1) natty; urgency=low
 
  -- Ted Gould <ted@ubuntu.com>  Thu, 31 Mar 2011 13:56:54 -0500
 
+libdbusmenu (0.4.0-2) unstable; urgency=low
+
+  * Build-depend on gir1.2-atk-1.0, it's not pulled in by gir1.2-gtk-2.0
+    on ia64, mipsel and sparc64, causing FTBFS there.
+
+ -- Evgeni Golov <evgeni@debian.org>  Wed, 30 Mar 2011 10:16:59 +0200
+
+libdbusmenu (0.4.0-1) unstable; urgency=low
+
+  * Merge new upstream release from Ubuntu.
+    This builds with gir-1.2 and thus closes: #614490.
+    Also builds fine with --as-needed, closes: #615741.
+  * Disable GTK3 packages for now.
+  * Fix DEB_DH_MAKESHLIBS_ARGS_* for the latest SONAME bump.
+  * Also fix cdbs targets for it.
+  * Use valac-0.10, valac-0.12 is only in experimental.
+  * Add gir-repository-dev back to Build-Depends,
+    it still has Gtk-2.0.gir on Debian.
+
+ -- Evgeni Golov <evgeni@debian.org>  Fri, 25 Mar 2011 15:55:16 +0100
+
 libdbusmenu (0.4.0-0ubuntu2) natty; urgency=low
 
   * Cherry picked fix for potential memory issues to fix unity-panel-service
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..45a4fb7
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+8
diff --git a/debian/control b/debian/control
index 2555cd1..a7ff43d 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,13 @@
 Source: libdbusmenu
 Section: gnome
 Priority: optional
-Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: The Ayatana Packagers <pkg-ayatana-devel@lists.alioth.debian.org>
 Uploaders: Evgeni Golov <evgeni@debian.org>
-Build-Depends: debhelper (>= 5.0),
-               cdbs (>= 0.4.41),
+Build-Depends: debhelper (>= 8.1.3),
+               cdbs (>= 0.4.93),
                quilt,
-               libgtk2.0-dev (>= 2.23.2-0ubuntu2),
+               libgtk2.0-dev (>= 2.24.4-1~),
                libgtk-3-dev (>= 2.99.2-1ubuntu2),
                libgdk-pixbuf2.0-dev (>= 2.22.1-0ubuntu4),
                libdbus-glib-1-dev,
@@ -26,8 +26,8 @@ Build-Depends: debhelper (>= 5.0),
                valac-0.14
 Standards-Version: 3.9.2
 Homepage: https://launchpad.net/dbusmenu
-Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu
-Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/dbusmenu/ubuntu
+Vcs-Bzr: http://bzr.debian.org/bzr/pkg-ayatana/libdbusmenu/debian
+Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-ayatana/libdbusmenu/debian
 
 Package: libdbusmenu-glib4
 Section: libs
@@ -39,6 +39,8 @@ Breaks: indicator-messages (<< 0.3.0),
         libdbusmenu-glib0,
         gir1.2-unity-3.0 (<< 3.8.4-0ubuntu2),
         gir1.2-indicate-0.5 (<< 0.5.0-0ubuntu4)
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: library for passing menus over DBus
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
@@ -54,6 +56,7 @@ Depends: ${shlibs:Depends},
          libdbusmenu-glib4 (= ${binary:Version}),
          libdbus-glib-1-dev (>= 0.76),
          libgtk2.0-dev (>= 2.12.0)
+Multi-Arch: same
 Description: library for passing menus over DBus - development files
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
@@ -66,6 +69,8 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: library for passing menus over DBus - GTK+ version
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
@@ -82,6 +87,7 @@ Depends: ${shlibs:Depends},
          libdbus-glib-1-dev (>= 0.76),
          libgtk2.0-dev (>= 2.12.0),
          libdbusmenu-glib-dev
+Multi-Arch: same
 Description: library for passing menus over DBus - GTK+ version developement files
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
@@ -96,6 +102,7 @@ Depends: ${shlibs:Depends},
          ${misc:Depends},
          python,
          libdbusmenu-glib4 (= ${binary:Version})
+Multi-Arch: foreign
 Description: tools useful during development with libdbusmenu
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
@@ -161,6 +168,8 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: library for passing menus over DBus - Test lib
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
@@ -178,6 +187,7 @@ Depends: ${shlibs:Depends},
          libdbus-glib-1-dev (>= 0.76),
          libdbusmenu-glib-dev (= ${binary:Version}),
          libjson-glib-dev
+Multi-Arch: same
 Description: library for passing menus over DBus - Test lib development files
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
@@ -191,6 +201,8 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: library for passing menus over DBus - GTK+ version
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
@@ -207,6 +219,7 @@ Depends: ${shlibs:Depends},
          libdbus-glib-1-dev (>= 0.76),
          libgtk-3-dev (>= 2.91.4-0ubuntu1),
          libdbusmenu-glib-dev
+Multi-Arch: same
 Description: library for passing menus over DBus - GTK+ version developement files
  libdbusmenu passes a menu structure across DBus so that a program can
  create a menu simply without worrying about how it is displayed on the
diff --git a/debian/gir1.2-dbusmenu-glib-0.4.install b/debian/gir1.2-dbusmenu-glib-0.4.install
index a9808fc..da62142 100644
--- a/debian/gir1.2-dbusmenu-glib-0.4.install
+++ b/debian/gir1.2-dbusmenu-glib-0.4.install
@@ -1 +1 @@
-debian/tmp/gtk3/usr/lib/girepository-1.0/Dbusmenu-0.4.typelib /usr/lib/girepository-1.0/
+usr/lib/*/girepository-1.0/Dbusmenu-0.4.typelib /usr/lib/girepository-1.0/
diff --git a/debian/gir1.2-dbusmenu-gtk-0.4.install b/debian/gir1.2-dbusmenu-gtk-0.4.install
index 3493751..1a62fd5 100644
--- a/debian/gir1.2-dbusmenu-gtk-0.4.install
+++ b/debian/gir1.2-dbusmenu-gtk-0.4.install
@@ -1 +1 @@
-debian/tmp/gtk2/usr/lib/girepository-1.0/DbusmenuGtk-0.4.typelib /usr/lib/girepository-1.0/
+usr/lib/*/girepository-1.0/DbusmenuGtk-0.4.typelib /usr/lib/girepository-1.0/
diff --git a/debian/gir1.2-dbusmenu-gtk3-0.4.install b/debian/gir1.2-dbusmenu-gtk3-0.4.install
index 64a74b6..4c56230 100644
--- a/debian/gir1.2-dbusmenu-gtk3-0.4.install
+++ b/debian/gir1.2-dbusmenu-gtk3-0.4.install
@@ -1 +1 @@
-debian/tmp/gtk3/usr/lib/girepository-1.0/DbusmenuGtk3-0.4.typelib /usr/lib/girepository-1.0/
+usr/lib/*/girepository-1.0/DbusmenuGtk3-0.4.typelib /usr/lib/girepository-1.0/
diff --git a/debian/libdbusmenu-glib-dev.install b/debian/libdbusmenu-glib-dev.install
index 197e9de..fc7079c 100644
--- a/debian/libdbusmenu-glib-dev.install
+++ b/debian/libdbusmenu-glib-dev.install
@@ -1,6 +1,6 @@
-debian/tmp/gtk3/usr/include/libdbusmenu-0.4/libdbusmenu-glib /usr/include/libdbusmenu-0.4/
-debian/tmp/gtk3/usr/lib/pkgconfig/dbusmenu-glib-0.4.pc /usr/lib/pkgconfig/
-debian/tmp/gtk3/usr/lib/libdbusmenu-glib.a /usr/lib/
-debian/tmp/gtk3/usr/lib/libdbusmenu-glib.so /usr/lib/
-debian/tmp/gtk3/usr/share/gir-1.0/Dbusmenu-0.4.gir /usr/share/gir-1.0/
-debian/tmp/gtk3/usr/share/vala/vapi/Dbusmenu-0.4.vapi /usr/share/vala/vapi/
+usr/include/libdbusmenu-0.4/libdbusmenu-glib /usr/include/libdbusmenu-0.4/
+usr/lib/*/pkgconfig/dbusmenu-glib-0.4.pc
+usr/lib/*/libdbusmenu-glib.a
+usr/lib/*/libdbusmenu-glib.so
+usr/share/gir-1.0/Dbusmenu-0.4.gir /usr/share/gir-1.0/
+usr/share/vala/vapi/Dbusmenu-0.4.vapi /usr/share/vala/vapi/
diff --git a/debian/libdbusmenu-glib-doc.install b/debian/libdbusmenu-glib-doc.install
index ec8274e..5d99d73 100644
--- a/debian/libdbusmenu-glib-doc.install
+++ b/debian/libdbusmenu-glib-doc.install
@@ -1 +1 @@
-debian/tmp/gtk3/usr/share/gtk-doc/html/libdbusmenu-glib /usr/share/gtk-doc/html/
+usr/share/gtk-doc/html/libdbusmenu-glib /usr/share/gtk-doc/html/
diff --git a/debian/libdbusmenu-glib4.install b/debian/libdbusmenu-glib4.install
index a98765c..4c05f07 100644
--- a/debian/libdbusmenu-glib4.install
+++ b/debian/libdbusmenu-glib4.install
@@ -1 +1 @@
-debian/tmp/gtk3/usr/lib/libdbusmenu-glib.so.* /usr/lib/
+usr/lib/*/libdbusmenu-glib.so.*
diff --git a/debian/libdbusmenu-gtk-dev.install b/debian/libdbusmenu-gtk-dev.install
index 2e5dc02..ab8e8a9 100644
--- a/debian/libdbusmenu-gtk-dev.install
+++ b/debian/libdbusmenu-gtk-dev.install
@@ -1,6 +1,6 @@
-debian/tmp/gtk2/usr/include/libdbusmenu-0.4/libdbusmenu-gtk /usr/include/libdbusmenu-0.4/
-debian/tmp/gtk2/usr/lib/pkgconfig/dbusmenu-gtk-0.4.pc /usr/lib/pkgconfig/
-debian/tmp/gtk2/usr/lib/libdbusmenu-gtk.a /usr/lib/
-debian/tmp/gtk2/usr/lib/libdbusmenu-gtk.so /usr/lib/
-debian/tmp/gtk2/usr/share/gir-1.0/DbusmenuGtk-0.4.gir /usr/share/gir-1.0/
-debian/tmp/gtk2/usr/share/vala/vapi/DbusmenuGtk-0.4.vapi /usr/share/vala/vapi/
+usr/include/libdbusmenu-0.4/libdbusmenu-gtk /usr/include/libdbusmenu-0.4/
+usr/lib/*/pkgconfig/dbusmenu-gtk-0.4.pc
+usr/lib/*/libdbusmenu-gtk.a
+usr/lib/*/libdbusmenu-gtk.so
+usr/share/gir-1.0/DbusmenuGtk-0.4.gir /usr/share/gir-1.0/
+usr/share/vala/vapi/DbusmenuGtk-0.4.vapi /usr/share/vala/vapi/
diff --git a/debian/libdbusmenu-gtk-doc.install b/debian/libdbusmenu-gtk-doc.install
index b7dae35..664f00c 100644
--- a/debian/libdbusmenu-gtk-doc.install
+++ b/debian/libdbusmenu-gtk-doc.install
@@ -1 +1 @@
-debian/tmp/gtk2/usr/share/gtk-doc/html/libdbusmenu-gtk /usr/share/gtk-doc/html/
+usr/share/gtk-doc/html/libdbusmenu-gtk /usr/share/gtk-doc/html/
diff --git a/debian/libdbusmenu-gtk3-4.install b/debian/libdbusmenu-gtk3-4.install
index 2bf1f59..a425da7 100644
--- a/debian/libdbusmenu-gtk3-4.install
+++ b/debian/libdbusmenu-gtk3-4.install
@@ -1 +1 @@
-debian/tmp/gtk3/usr/lib/libdbusmenu-gtk3.so.* /usr/lib/
+usr/lib/*/libdbusmenu-gtk3.so.*
diff --git a/debian/libdbusmenu-gtk3-dev.install b/debian/libdbusmenu-gtk3-dev.install
index 6d3fa0b..56f8fba 100644
--- a/debian/libdbusmenu-gtk3-dev.install
+++ b/debian/libdbusmenu-gtk3-dev.install
@@ -1,6 +1,6 @@
-debian/tmp/gtk3/usr/include/libdbusmenu-0.4/libdbusmenu-gtk3 /usr/include/libdbusmenu-0.4/
-debian/tmp/gtk3/usr/lib/pkgconfig/dbusmenu-gtk3-0.4.pc /usr/lib/pkgconfig/
-debian/tmp/gtk3/usr/lib/libdbusmenu-gtk3.a /usr/lib/
-debian/tmp/gtk3/usr/lib/libdbusmenu-gtk3.so /usr/lib/
-debian/tmp/gtk3/usr/share/gir-1.0/DbusmenuGtk3-0.4.gir /usr/share/gir-1.0/
-debian/tmp/gtk3/usr/share/vala/vapi/DbusmenuGtk3-0.4.vapi /usr/share/gir-1.0/
+usr/include/libdbusmenu-0.4/libdbusmenu-gtk3 /usr/include/libdbusmenu-0.4/
+usr/lib/*/pkgconfig/dbusmenu-gtk3-0.4.pc
+usr/lib/*/libdbusmenu-gtk3.a
+usr/lib/*/libdbusmenu-gtk3.so
+usr/share/gir-1.0/DbusmenuGtk3-0.4.gir /usr/share/gir-1.0/
+usr/share/vala/vapi/DbusmenuGtk3-0.4.vapi /usr/share/gir-1.0/
diff --git a/debian/libdbusmenu-gtk4.install b/debian/libdbusmenu-gtk4.install
index 2605240..546d698 100644
--- a/debian/libdbusmenu-gtk4.install
+++ b/debian/libdbusmenu-gtk4.install
@@ -1 +1 @@
-debian/tmp/gtk2/usr/lib/libdbusmenu-gtk.so.* /usr/lib/
+usr/lib/*/libdbusmenu-gtk.so.*
diff --git a/debian/libdbusmenu-jsonloader-dev.install b/debian/libdbusmenu-jsonloader-dev.install
index 95902cd..ebbb5ea 100644
--- a/debian/libdbusmenu-jsonloader-dev.install
+++ b/debian/libdbusmenu-jsonloader-dev.install
@@ -1,4 +1,4 @@
-debian/tmp/gtk3/usr/include/libdbusmenu-0.4/libdbusmenu-jsonloader /usr/include/libdbusmenu-0.4/
-debian/tmp/gtk3/usr/lib/pkgconfig/dbusmenu-jsonloader-0.4.pc /usr/lib/pkgconfig/
-debian/tmp/gtk3/usr/lib/libdbusmenu-jsonloader.a /usr/lib/
-debian/tmp/gtk3/usr/lib/libdbusmenu-jsonloader.so /usr/lib/
+usr/include/libdbusmenu-0.4/libdbusmenu-jsonloader /usr/include/libdbusmenu-0.4/
+usr/lib/*/pkgconfig/dbusmenu-jsonloader-0.4.pc
+usr/lib/*/libdbusmenu-jsonloader.a
+usr/lib/*/libdbusmenu-jsonloader.so
diff --git a/debian/libdbusmenu-jsonloader4.install b/debian/libdbusmenu-jsonloader4.install
index 74f887b..67976fd 100644
--- a/debian/libdbusmenu-jsonloader4.install
+++ b/debian/libdbusmenu-jsonloader4.install
@@ -1 +1 @@
-debian/tmp/gtk3/usr/lib/libdbusmenu-jsonloader.so.* /usr/lib/
+usr/lib/*/libdbusmenu-jsonloader.so.*
diff --git a/debian/libdbusmenu-tools.install b/debian/libdbusmenu-tools.install
index 1019dd8..1a79739 100644
--- a/debian/libdbusmenu-tools.install
+++ b/debian/libdbusmenu-tools.install
@@ -1,3 +1,3 @@
-debian/tmp/gtk3/usr/lib/libdbusmenu/dbusmenu-* /usr/lib/libdbusmenu/
-debian/tmp/gtk3/usr/share/libdbusmenu/* /usr/share/libdbusmenu-tools/
-debian/tmp/gtk3/usr/share/doc/libdbusmenu/README.dbusmenu-bench /usr/share/doc/libdbusmenu-tools/
+usr/lib/libdbusmenu/dbusmenu-* /usr/lib/libdbusmenu/
+usr/share/libdbusmenu/* /usr/share/libdbusmenu-tools/
+usr/share/doc/libdbusmenu/README.dbusmenu-bench /usr/share/doc/libdbusmenu-tools/
diff --git a/debian/rules b/debian/rules
index 07f6d3a..8eeb376 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,18 +3,34 @@
 DEB_BUILDDIR = build
 DEB_MAKE_FLAVORS = gtk2 gtk3
 
-include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
 
 DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@
 DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/
 
+DEB_DH_INSTALL_ARGS_libdbusmenu-gtk4 += --sourcedir=debian/tmp/gtk2
+DEB_DH_INSTALL_ARGS_libdbusmenu-gtk-dev += --sourcedir=debian/tmp/gtk2
+DEB_DH_INSTALL_ARGS_libdbusmenu-gtk-doc += --sourcedir=debian/tmp/gtk2
+DEB_DH_INSTALL_ARGS_gir1.2-dbusmenu-gtk-0.4 += --sourcedir=debian/tmp/gtk2
+
+DEB_DH_INSTALL_ARGS_gir1.2-dbusmenu-glib-0.4 += --sourcedir=debian/tmp/gtk3
+DEB_DH_INSTALL_ARGS_gir1.2-dbusmenu-gtk3-0.4 += --sourcedir=debian/tmp/gtk3
+DEB_DH_INSTALL_ARGS_libdbusmenu-glib4 += --sourcedir=debian/tmp/gtk3
+DEB_DH_INSTALL_ARGS_libdbusmenu-glib-dev += --sourcedir=debian/tmp/gtk3
+DEB_DH_INSTALL_ARGS_libdbusmenu-glib-doc += --sourcedir=debian/tmp/gtk3
+DEB_DH_INSTALL_ARGS_libdbusmenu-gtk3-4 += --sourcedir=debian/tmp/gtk3
+DEB_DH_INSTALL_ARGS_libdbusmenu-gtk3-dev += --sourcedir=debian/tmp/gtk3
+DEB_DH_INSTALL_ARGS_libdbusmenu-jsonloader4 += --sourcedir=debian/tmp/gtk3
+DEB_DH_INSTALL_ARGS_libdbusmenu-jsonloader-dev += --sourcedir=debian/tmp/gtk3
+DEB_DH_INSTALL_ARGS_libdbusmenu-tools += --sourcedir=debian/tmp/gtk3
+
 DEB_CONFIGURE_FLAGS_gtk2 = --with-gtk=2
 DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3
 
-DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-introspection
+DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-introspection  --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 
 DEB_DH_SHLIBDEPS_ARGS_libdbusmenu-gtk4 = -- -xlibgtk2.0-0
 DEB_DH_SHLIBDEPS_ARGS_libdbusmenu-gtk3-4 = -- -xlibgtk-3-0