diff -u libbonobo-2.32.1/debian/rules libbonobo-2.32.1/debian/rules --- libbonobo-2.32.1/debian/rules +++ libbonobo-2.32.1/debian/rules @@ -13,5 +13,5 @@ -DEB_CONFIGURE_LIBEXECDIR := "\$${prefix}/lib/bonobo-activation" -DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc +DEB_CONFIGURE_LIBEXECDIR := "\$${prefix}/lib/$(DEB_HOST_MULTIARCH)/bonobo-activation" +DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) install/libbonobo2-common:: - rm -f $(CURDIR)/debian/tmp/usr/lib/bonobo/servers/broken.server + rm -f $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/bonobo/servers/broken.server diff -u libbonobo-2.32.1/debian/libbonobo2-bin.install libbonobo-2.32.1/debian/libbonobo2-bin.install --- libbonobo-2.32.1/debian/libbonobo2-bin.install +++ libbonobo-2.32.1/debian/libbonobo2-bin.install @@ -3 +3 @@ -debian/tmp/usr/lib/bonobo-2.0 +debian/tmp/usr/lib/*/bonobo-2.0 diff -u libbonobo-2.32.1/debian/control.in libbonobo-2.32.1/debian/control.in --- libbonobo-2.32.1/debian/control.in +++ libbonobo-2.32.1/debian/control.in @@ -1,10 +1,11 @@ Source: libbonobo Section: gnome Priority: optional -Maintainer: Debian GNOME Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ -Build-Depends: cdbs, - debhelper (>= 5), +Build-Depends: cdbs (>= 0.4.93~), + debhelper (>= 8.1.3~), gnome-pkg-tools (>= 0.10), bison, flex, @@ -22,6 +23,7 @@ Package: libbonobo2-common Architecture: all +Multi-Arch: foreign Depends: ${misc:Depends} Conflicts: bonobo-activation (<< 1:2.4) Replaces: bonobo-activation (<< 1:2.4) @@ -39,8 +41,10 @@ Package: libbonobo2-dev Architecture: any +Multi-Arch: same Section: libdevel Conflicts: libbonobo-activation-dev (<< 1:2.4) +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, libbonobo2-0 (= ${binary:Version}), ${shlibs:Depends}, @@ -64,9 +68,11 @@ Package: libbonobo2-0 Architecture: any +Multi-Arch: same Section: libs Conflicts: libbonobo-activation4 (<< 1:2.4), nautilus (<< 2.2.4-5) +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, libbonobo2-common (= ${source:Version}), ${shlibs:Depends} diff -u libbonobo-2.32.1/debian/libbonobo2-dev.install libbonobo-2.32.1/debian/libbonobo2-dev.install --- libbonobo-2.32.1/debian/libbonobo2-dev.install +++ libbonobo-2.32.1/debian/libbonobo2-dev.install @@ -1,7 +1,7 @@ debian/tmp/usr/include -debian/tmp/usr/lib/pkgconfig -debian/tmp/usr/lib/*.so -debian/tmp/usr/lib/*.la -debian/tmp/usr/lib/*.a +debian/tmp/usr/lib/*/pkgconfig +debian/tmp/usr/lib/*/*.so +debian/tmp/usr/lib/*/*.la +debian/tmp/usr/lib/*/*.a debian/tmp/usr/share/gtk-doc diff -u libbonobo-2.32.1/debian/libbonobo2-common.install libbonobo-2.32.1/debian/libbonobo2-common.install --- libbonobo-2.32.1/debian/libbonobo2-common.install +++ libbonobo-2.32.1/debian/libbonobo2-common.install @@ -3,3 +3,3 @@ debian/tmp/usr/share/locale -debian/tmp/usr/lib/bonobo/servers/*.server +debian/tmp/usr/lib/*/bonobo/servers/*.server debian/tmp/etc/bonobo-activation diff -u libbonobo-2.32.1/debian/changelog libbonobo-2.32.1/debian/changelog --- libbonobo-2.32.1/debian/changelog +++ libbonobo-2.32.1/debian/changelog @@ -1,3 +1,9 @@ +libbonobo (2.32.1-0ubuntu2) precise; urgency=low + + * Rebuild with multi-arch support (LP: #977947) + + -- Tom Ellis Tue, 24 Jan 2012 17:05:35 +0000 + libbonobo (2.32.1-0ubuntu1) natty; urgency=low * New upstream release diff -u libbonobo-2.32.1/debian/control libbonobo-2.32.1/debian/control --- libbonobo-2.32.1/debian/control +++ libbonobo-2.32.1/debian/control @@ -6,10 +6,11 @@ Source: libbonobo Section: gnome Priority: optional -Maintainer: Debian GNOME Maintainers -Uploaders: David Weinehall , Josselin Mouette , Loic Minier , Sebastian Dröge -Build-Depends: cdbs, - debhelper (>= 5), +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers +Uploaders: David Weinehall , Debian GNOME Maintainers , Josselin Mouette , Sebastian Dröge +Build-Depends: cdbs (>= 0.4.93~), + debhelper (>= 8.1.3~), gnome-pkg-tools (>= 0.10), bison, flex, @@ -27,6 +28,7 @@ Package: libbonobo2-common Architecture: all +Multi-Arch: foreign Depends: ${misc:Depends} Conflicts: bonobo-activation (<< 1:2.4) Replaces: bonobo-activation (<< 1:2.4) @@ -44,8 +46,10 @@ Package: libbonobo2-dev Architecture: any +Multi-Arch: same Section: libdevel Conflicts: libbonobo-activation-dev (<< 1:2.4) +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, libbonobo2-0 (= ${binary:Version}), ${shlibs:Depends}, @@ -69,9 +73,11 @@ Package: libbonobo2-0 Architecture: any +Multi-Arch: same Section: libs Conflicts: libbonobo-activation4 (<< 1:2.4), nautilus (<< 2.2.4-5) +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, libbonobo2-common (= ${source:Version}), ${shlibs:Depends} diff -u libbonobo-2.32.1/debian/libbonobo2-0.install libbonobo-2.32.1/debian/libbonobo2-0.install --- libbonobo-2.32.1/debian/libbonobo2-0.install +++ libbonobo-2.32.1/debian/libbonobo2-0.install @@ -1,4 +1,4 @@ -debian/tmp/usr/lib/lib*.so.* -debian/tmp/usr/lib/bonobo-activation -debian/tmp/usr/lib/bonobo/monikers/*.so -debian/tmp/usr/lib/orbit-2.0/*.so +debian/tmp/usr/lib/*/lib*.so.* +debian/tmp/usr/lib/*/bonobo-activation +debian/tmp/usr/lib/*/bonobo/monikers/*.so +debian/tmp/usr/lib/*/orbit-2.0/*.so