diff -u appmenu-gtk-0.3.91/debian/changelog appmenu-gtk-0.3.91/debian/changelog --- appmenu-gtk-0.3.91/debian/changelog +++ appmenu-gtk-0.3.91/debian/changelog @@ -1,3 +1,9 @@ +appmenu-gtk (0.3.91-0ubuntu2) precise; urgency=low + + * Rebuild with multi-arch support (LP: #968351) + + -- Tom Ellis Thu, 29 Mar 2012 16:50:19 +0100 + appmenu-gtk (0.3.91-0ubuntu1) precise; urgency=low * New upstream release. diff -u appmenu-gtk-0.3.91/debian/appmenu-gtk3.install appmenu-gtk-0.3.91/debian/appmenu-gtk3.install --- appmenu-gtk-0.3.91/debian/appmenu-gtk3.install +++ appmenu-gtk-0.3.91/debian/appmenu-gtk3.install @@ -1 +1,2 @@ -debian/tmp/gtk3/* / +debian/tmp/gtk3/etc/* /etc +debian/tmp/gtk3/usr/lib/$(DEB_HOST_MULTIARCH)/* /usr/lib/$(DEB_HOST_MULTIARCH)/ diff -u appmenu-gtk-0.3.91/debian/rules appmenu-gtk-0.3.91/debian/rules --- appmenu-gtk-0.3.91/debian/rules +++ appmenu-gtk-0.3.91/debian/rules @@ -12,7 +12,7 @@ DEB_CONFIGURE_FLAGS_gtk2 = --with-gtk2 DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk3 -DEB_CONFIGURE_EXTRA_FLAGS = --disable-static +DEB_CONFIGURE_EXTRA_FLAGS += --disable-static --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) LDFLAGS += -Wl,-z,defs -Wl,--as-needed @@ -25,2 +25,8 @@ common-install-arch:: + sed -e"s/\$${DEB_HOST_MULTIARCH}/$(DEB_HOST_MULTIARCH)/g" \ + < debian/appmenu-gtk.install.in \ + > debian/appmenu-gtk.install + sed -e"s/\$${DEB_HOST_MULTIARCH}/$(DEB_HOST_MULTIARCH)/g" \ + < debian/appmenu-gtk3.install.in \ + > debian/appmenu-gtk3.install find debian/tmp -name \*.la -delete diff -u appmenu-gtk-0.3.91/debian/appmenu-gtk.install appmenu-gtk-0.3.91/debian/appmenu-gtk.install --- appmenu-gtk-0.3.91/debian/appmenu-gtk.install +++ appmenu-gtk-0.3.91/debian/appmenu-gtk.install @@ -1 +1,2 @@ -debian/tmp/gtk2/* / +debian/tmp/gtk2/etc/* /etc +debian/tmp/gtk2/usr/lib/$(DEB_HOST_MULTIARCH)/* /usr/lib/$(DEB_HOST_MULTIARCH)/ diff -u appmenu-gtk-0.3.91/debian/control appmenu-gtk-0.3.91/debian/control --- appmenu-gtk-0.3.91/debian/control +++ appmenu-gtk-0.3.91/debian/control @@ -2,8 +2,8 @@ Section: libs Priority: optional Maintainer: Ubuntu Desktop Team -Build-Depends: debhelper (>= 5.0), - cdbs (>= 0.4.41), +Build-Depends: debhelper (>= 8.1.3), + cdbs (>= 0.4.93~), libgtk2.0-dev (>= 2.21.2-0ubuntu6), libgtk-3-dev (>= 3.0.8-0ubuntu1), libx11-dev, @@ -20,6 +20,8 @@ Package: appmenu-gtk Section: libs Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, Conflicts: indicator-appmenu (<< 0.0.9) @@ -30,6 +32,8 @@ Package: appmenu-gtk3 Section: libs Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, Conflicts: indicator-appmenu (<< 0.0.9)