diff -Nru libgnome-2.32.1/debian/changelog libgnome-2.32.1/debian/changelog --- libgnome-2.32.1/debian/changelog 2011-12-14 11:32:05.000000000 -0500 +++ libgnome-2.32.1/debian/changelog 2012-08-15 21:38:05.000000000 -0400 @@ -1,3 +1,9 @@ +libgnome (2.32.1-2ubuntu1.1) quantal-proposed; urgency=low + + * Transition to multi-arch (LP: #977959) + + -- Adam Stokes Wed, 15 Aug 2012 21:37:08 -0400 + libgnome (2.32.1-2ubuntu1) precise; urgency=low * Merge with debian, remaining changes: diff -Nru libgnome-2.32.1/debian/control libgnome-2.32.1/debian/control --- libgnome-2.32.1/debian/control 2011-12-14 11:32:06.000000000 -0500 +++ libgnome-2.32.1/debian/control 2012-08-15 23:16:13.000000000 -0400 @@ -10,7 +10,7 @@ XSBC-Original-Maintainer: Josselin Mouette Uploaders: Debian GNOME Maintainers , Josselin Mouette , Michael Biebl , Sebastian Dröge Standards-Version: 3.9.2 -Build-Depends: debhelper (>= 8), +Build-Depends: debhelper (>= 8.1.3), dh-autoreconf, gnome-common, libgnomevfs2-dev (>= 2.7.91-3), @@ -20,7 +20,7 @@ libgconf2-dev (>= 2.7.92), libcanberra-dev, libglib2.0-dev (>= 2.16.0), - cdbs (>= 0.4.41), + cdbs (>= 0.4.93~), gnome-pkg-tools (>= 0.10), dpkg-dev (>= 1.13.19), gtk-doc-tools (>= 1.0), @@ -30,19 +30,35 @@ Package: libgnome2-0 Architecture: any +Multi-Arch: same Section: libs +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, libgnome2-common (>= ${gnome:Version}), - libgnome2-common (<< ${gnome:NextVersion}) + libgnome2-common (<< ${gnome:NextVersion}), + libgnome2-bin Recommends: gvfs Description: The GNOME library - runtime files This package contains the shared library for the base GNOME library functions. +Package: libgnome2-bin +Architecture: any +Section: libs +Depends: ${misc:Depends}, + ${shlibs:Depends}, +Replaces: libgnome2-0 (<=2.32.1-1) +Multi-Arch: foreign +Description: The GNOME library - binary files + This package contains the binary for the base GNOME library + functions. + Package: libgnome2-dev Architecture: any +Multi-Arch: same Section: libdevel +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, libgnome2-0 (= ${binary:Version}), libglib2.0-dev, @@ -59,6 +75,7 @@ Package: libgnome2-common Architecture: all +Multi-Arch: foreign Section: libs Depends: ${misc:Depends} Breaks: gnome-panel (<< 2.28) diff -Nru libgnome-2.32.1/debian/control.in libgnome-2.32.1/debian/control.in --- libgnome-2.32.1/debian/control.in 2011-12-14 11:32:05.000000000 -0500 +++ libgnome-2.32.1/debian/control.in 2012-08-15 22:49:27.000000000 -0400 @@ -5,7 +5,7 @@ XSBC-Original-Maintainer: Josselin Mouette Uploaders: @GNOME_TEAM@ Standards-Version: 3.9.2 -Build-Depends: debhelper (>= 8), +Build-Depends: debhelper (>= 8.1.3), dh-autoreconf, gnome-common, libgnomevfs2-dev (>= 2.7.91-3), @@ -15,7 +15,7 @@ libgconf2-dev (>= 2.7.92), libcanberra-dev, libglib2.0-dev (>= 2.16.0), - cdbs (>= 0.4.41), + cdbs (>= 0.4.93~), gnome-pkg-tools (>= 0.10), dpkg-dev (>= 1.13.19), gtk-doc-tools (>= 1.0), @@ -25,19 +25,35 @@ Package: libgnome2-0 Architecture: any +Multi-Arch: same Section: libs +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, libgnome2-common (>= ${gnome:Version}), - libgnome2-common (<< ${gnome:NextVersion}) + libgnome2-common (<< ${gnome:NextVersion}), + libgnome2-bin Recommends: gvfs Description: The GNOME library - runtime files This package contains the shared library for the base GNOME library functions. +Package: libgnome2-bin +Architecture: any +Section: libs +Depends: ${misc:Depends}, + ${shlibs:Depends}, +Replaces: libgnome2-0 (<=2.32.1-1) +Multi-Arch: foreign +Description: The GNOME library - binary files + This package contains the binary for the base GNOME library + functions. + Package: libgnome2-dev Architecture: any +Multi-Arch: same Section: libdevel +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, libgnome2-0 (= ${binary:Version}), libglib2.0-dev, @@ -54,6 +70,7 @@ Package: libgnome2-common Architecture: all +Multi-Arch: foreign Section: libs Depends: ${misc:Depends} Breaks: gnome-panel (<< 2.28) diff -Nru libgnome-2.32.1/debian/libgnome2-0.install libgnome-2.32.1/debian/libgnome2-0.install --- libgnome-2.32.1/debian/libgnome2-0.install 2011-12-14 11:32:05.000000000 -0500 +++ libgnome-2.32.1/debian/libgnome2-0.install 2012-08-15 22:47:42.000000000 -0400 @@ -1,4 +1,3 @@ -usr/lib/libgnome-2.so.* -usr/lib/bonobo/monikers/libmoniker_extra_2.so -usr/lib/bonobo/servers/ -usr/bin/ +usr/lib/*/libgnome-2.so.* +usr/lib/*/bonobo/monikers/libmoniker_extra_2.so +usr/lib/*/bonobo/servers/ diff -Nru libgnome-2.32.1/debian/libgnome2-bin.install libgnome-2.32.1/debian/libgnome2-bin.install --- libgnome-2.32.1/debian/libgnome2-bin.install 1969-12-31 19:00:00.000000000 -0500 +++ libgnome-2.32.1/debian/libgnome2-bin.install 2012-08-15 22:47:53.000000000 -0400 @@ -0,0 +1 @@ +usr/bin/ \ No newline at end of file diff -Nru libgnome-2.32.1/debian/libgnome2-dev.install libgnome-2.32.1/debian/libgnome2-dev.install --- libgnome-2.32.1/debian/libgnome2-dev.install 2011-12-14 11:32:05.000000000 -0500 +++ libgnome-2.32.1/debian/libgnome2-dev.install 2012-08-15 21:33:28.000000000 -0400 @@ -1,4 +1,4 @@ usr/include -usr/lib/pkgconfig -usr/lib/libgnome-2.a -usr/lib/libgnome-2.so +usr/lib/*/pkgconfig +usr/lib/*/libgnome-2.a +usr/lib/*/libgnome-2.so diff -Nru libgnome-2.32.1/debian/rules libgnome-2.32.1/debian/rules --- libgnome-2.32.1/debian/rules 2011-12-14 11:32:05.000000000 -0500 +++ libgnome-2.32.1/debian/rules 2012-08-15 21:34:03.000000000 -0400 @@ -12,7 +12,7 @@ CFLAGS += -include debian.h -DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc +DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) makebuilddir:: echo '#define MULTIARCH "${DEB_HOST_MULTIARCH}"' >debian.h