=== modified file 'bonobo-activation-config.xml'
--- bonobo-activation-config.xml 2005-02-18 14:40:51 +0000
+++ bonobo-activation-config.xml 2012-06-29 19:31:17 +0000
@@ -8,6 +8,7 @@
+ - /usr/lib/bonobo/servers
=== modified file 'debian/changelog'
--- debian/changelog 2011-04-06 12:02:31 +0000
+++ debian/changelog 2012-06-29 19:31:17 +0000
@@ -1,3 +1,9 @@
+libbonobo (2.32.1-0ubuntu2) quantal; urgency=low
+
+ * Rebuild with multi-arch support (LP: #977947)
+
+ -- Adam Stokes Fri, 29 Jun 2012 14:59:54 -0400
+
libbonobo (2.32.1-0ubuntu1) natty; urgency=low
* New upstream release
=== modified file 'debian/control'
--- debian/control 2011-04-06 12:02:31 +0000
+++ debian/control 2012-06-29 19:31:17 +0000
@@ -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,11 +73,14 @@
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}),
+ orbit2 (>= 2.14.19-0.1),
${shlibs:Depends}
Recommends: dbus-x11
Replaces: libbonobo-activation4 (<< 1:2.4),
=== modified file 'debian/control.in'
--- debian/control.in 2011-04-06 12:02:31 +0000
+++ debian/control.in 2012-06-29 19:31:17 +0000
@@ -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,11 +68,14 @@
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}),
+ orbit2 (>= 2.14.19-0.1),
${shlibs:Depends}
Recommends: dbus-x11
Replaces: libbonobo-activation4 (<< 1:2.4),
=== modified file 'debian/libbonobo2-0.install'
--- debian/libbonobo2-0.install 2008-01-28 16:44:09 +0000
+++ debian/libbonobo2-0.install 2012-06-29 19:31:17 +0000
@@ -1,4 +1,5 @@
-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
+debian/tmp/usr/lib/*/bonobo/servers/*.server
=== modified file 'debian/libbonobo2-bin.install'
--- debian/libbonobo2-bin.install 2008-01-28 16:44:09 +0000
+++ debian/libbonobo2-bin.install 2012-06-29 19:31:17 +0000
@@ -1,3 +1,3 @@
debian/tmp/usr/bin
debian/tmp/usr/sbin
-debian/tmp/usr/lib/bonobo-2.0
+debian/tmp/usr/lib/*/bonobo-2.0
=== modified file 'debian/libbonobo2-common.install'
--- debian/libbonobo2-common.install 2008-01-28 16:44:09 +0000
+++ debian/libbonobo2-common.install 2012-06-29 19:31:17 +0000
@@ -1,5 +1,4 @@
debian/tmp/usr/share/idl
debian/tmp/usr/share/man
debian/tmp/usr/share/locale
-debian/tmp/usr/lib/bonobo/servers/*.server
debian/tmp/etc/bonobo-activation
=== modified file 'debian/libbonobo2-dev.install'
--- debian/libbonobo2-dev.install 2008-01-28 16:44:09 +0000
+++ debian/libbonobo2-dev.install 2012-06-29 19:31:17 +0000
@@ -1,7 +1,6 @@
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/*/*.a
debian/tmp/usr/share/gtk-doc
=== modified file 'debian/rules'
--- debian/rules 2010-04-05 03:10:35 +0000
+++ debian/rules 2012-06-29 19:31:17 +0000
@@ -10,8 +10,8 @@
DEB_DH_MAKESHLIBS_ARGS_ALL += -V 'libbonobo2-0 (>= 2.15.0)'
DEB_DH_SHLIBDEPS_ARGS_ALL += -Llibbonobo2-0
-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