diff -u appmenu-gtk-12.10.2/debian/changelog appmenu-gtk-12.10.2/debian/changelog --- appmenu-gtk-12.10.2/debian/changelog +++ appmenu-gtk-12.10.2/debian/changelog @@ -1,3 +1,9 @@ +appmenu-gtk (12.10.2-0ubuntu1.1) quantal-proposed; urgency=low + + * Add multiarch support (LP: #932860) + + -- Adam Stokes Wed, 17 Oct 2012 11:27:20 -0400 + appmenu-gtk (12.10.2-0ubuntu1) quantal; urgency=low * New upstream release. diff -u appmenu-gtk-12.10.2/debian/rules appmenu-gtk-12.10.2/debian/rules --- appmenu-gtk-12.10.2/debian/rules +++ appmenu-gtk-12.10.2/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 diff -u appmenu-gtk-12.10.2/debian/control appmenu-gtk-12.10.2/debian/control --- appmenu-gtk-12.10.2/debian/control +++ appmenu-gtk-12.10.2/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) only in patch2: unchanged: --- appmenu-gtk-12.10.2.orig/80appmenu.in +++ appmenu-gtk-12.10.2/80appmenu.in @@ -1,4 +1,8 @@ -if [ -f @moduledir@/libappmenu.so ] -then - export UBUNTU_MENUPROXY="libappmenu.so" -fi +for i in /usr/lib/*/@moduledir@/libappmenu.so +do + if [ -f $i ] + then + export UBUNTU_MENUPROXY="libappmenu.so" + break + fi +done only in patch2: unchanged: --- appmenu-gtk-12.10.2.orig/Makefile.am +++ appmenu-gtk-12.10.2/Makefile.am @@ -4,7 +4,7 @@ src $(sessionfile): 80appmenu.in - sed -e "s|\@moduledir\@|$(moduledir)|" $< > $@ + sed -e "s|\@moduledir\@|$(shell echo $(moduledir)|cut -d/ -f5-)|" $< > $@ xsessiondir = $(sysconfdir)/X11/Xsession.d