Package: libgnome
Version: 2.32.1-1
Severity: wishlist
User: debian-d...@lists.debian.org
Usertags: multiarch
Hi,
The following patch converts libgnome to multiarch directories and adds
needed Multi-Arch: stanzas to control file. gnome-open binary is split to
a separate package (libgnome2-bin) as exacutable binaries can't be multiarch
(at least for now).
The attached patch probably brakes bonobo features of libgnome, unless
libbonobo
is converted too. In fact, so far the patch has only been tested that the
library is installed to the correct place for cross-compiling firefox.
Hence, I haven't set the "Patch" tag for this bug. The patch is ment for
discussion rather than to be applied as is.
http://wiki.debian.org/Multiarch/Implementation
https://wiki.ubuntu.com/MultiarchSpec#Dependencies_involving_Architecture:_all_packages
Riku
diff -urN orig/libgnome-2.32.1//debian/changelog libgnome-2.32.1//debian/changelog
--- orig/libgnome-2.32.1//debian/changelog 2011-05-29 10:59:11.000000000 +0300
+++ libgnome-2.32.1//debian/changelog 2011-09-22 16:01:19.011535088 +0300
@@ -1,3 +1,9 @@
+libgnome (2.32.1-1.1) experimental; urgency=low
+
+ * Multiarch conversion
+
+ -- Riku Voipio <riku.voi...@linaro.org> Thu, 22 Sep 2011 15:31:10 +0300
+
libgnome (2.32.1-1) unstable; urgency=low
* New upstream release.
diff -urN orig/libgnome-2.32.1//debian/control.in libgnome-2.32.1//debian/control.in
--- orig/libgnome-2.32.1//debian/control.in 2011-05-29 10:59:11.000000000 +0300
+++ libgnome-2.32.1//debian/control.in 2011-09-22 16:03:20.761535144 +0300
@@ -4,7 +4,7 @@
Maintainer: Josselin Mouette <j...@debian.org>
Uploaders: @GNOME_TEAM@
Standards-Version: 3.8.1
-Build-Depends: debhelper (>= 5.0.13),
+Build-Depends: debhelper (>= 8.1.3),
libgnomevfs2-dev (>= 2.7.91-3),
libbonobo2-dev (>= 2.13.0),
libpopt-dev,
@@ -12,7 +12,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),
@@ -26,7 +26,21 @@
${shlibs:Depends},
libgnome2-common (>= ${gnome:Version}),
libgnome2-common (<< ${gnome:NextVersion}),
- gvfs
+ gvfs,
+ libgnome2-bin
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+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 - runtime files
This package contains the shared library for the base GNOME library
functions.
@@ -44,6 +58,7 @@
libcanberra-dev,
libpopt-dev
Suggests: libgnome2-doc
+Multi-Arch: same
Description: The GNOME library - development files
This package contains the shared library for the base GNOME library
functions.
diff -urN orig/libgnome-2.32.1//debian/libgnome2-0.install libgnome-2.32.1//debian/libgnome2-0.install
--- orig/libgnome-2.32.1//debian/libgnome2-0.install 2004-04-04 11:55:33.000000000 +0300
+++ libgnome-2.32.1//debian/libgnome2-0.install 2011-09-22 14:41:57.981532893 +0300
@@ -1,4 +1,3 @@
-debian/tmp/usr/lib/libgnome-2.so.*
-debian/tmp/usr/lib/bonobo/monikers/libmoniker_extra_2.so
-debian/tmp/usr/lib/bonobo/servers/
-debian/tmp/usr/bin/
+debian/tmp/usr/lib/*/libgnome-2.so.*
+debian/tmp/usr/lib/*/bonobo/monikers/libmoniker_extra_2.so
+debian/tmp/usr/lib/*/bonobo/servers/
diff -urN orig/libgnome-2.32.1//debian/libgnome2-0.manpages libgnome-2.32.1//debian/libgnome2-0.manpages
--- orig/libgnome-2.32.1//debian/libgnome2-0.manpages 2008-09-25 18:57:04.000000000 +0300
+++ libgnome-2.32.1//debian/libgnome2-0.manpages 1970-01-01 02:00:00.000000000 +0200
@@ -1 +0,0 @@
-debian/gnome-open.1
diff -urN orig/libgnome-2.32.1//debian/libgnome2-bin.install libgnome-2.32.1//debian/libgnome2-bin.install
--- orig/libgnome-2.32.1//debian/libgnome2-bin.install 1970-01-01 02:00:00.000000000 +0200
+++ libgnome-2.32.1//debian/libgnome2-bin.install 2011-09-22 14:42:41.521532913 +0300
@@ -0,0 +1 @@
+debian/tmp/usr/bin
diff -urN orig/libgnome-2.32.1//debian/libgnome2-bin.manpages libgnome-2.32.1//debian/libgnome2-bin.manpages
--- orig/libgnome-2.32.1//debian/libgnome2-bin.manpages 1970-01-01 02:00:00.000000000 +0200
+++ libgnome-2.32.1//debian/libgnome2-bin.manpages 2008-09-25 18:57:04.000000000 +0300
@@ -0,0 +1 @@
+debian/gnome-open.1
diff -urN orig/libgnome-2.32.1//debian/libgnome2-dev.install libgnome-2.32.1//debian/libgnome2-dev.install
--- orig/libgnome-2.32.1//debian/libgnome2-dev.install 2004-03-24 15:29:31.000000000 +0200
+++ libgnome-2.32.1//debian/libgnome2-dev.install 2011-09-22 13:44:43.641531309 +0300
@@ -1,5 +1,5 @@
debian/tmp/usr/include
-debian/tmp/usr/lib/pkgconfig
-debian/tmp/usr/lib/libgnome-2.a
-debian/tmp/usr/lib/libgnome-2.la
-debian/tmp/usr/lib/libgnome-2.so
+debian/tmp/usr/lib/*/pkgconfig
+debian/tmp/usr/lib/*/libgnome-2.a
+debian/tmp/usr/lib/*/libgnome-2.la
+debian/tmp/usr/lib/*/libgnome-2.so
diff -urN orig/libgnome-2.32.1//debian/rules libgnome-2.32.1//debian/rules
--- orig/libgnome-2.32.1//debian/rules 2011-05-29 10:52:08.000000000 +0300
+++ libgnome-2.32.1//debian/rules 2011-09-22 13:54:27.891531579 +0300
@@ -10,7 +10,7 @@
LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
clean::
dh_clean intltool-extract intltool-merge intltool-update \
diff -urN orig/libgnome-2.32.1//libgnome2-bin.install libgnome-2.32.1//libgnome2-bin.install
--- orig/libgnome-2.32.1//libgnome2-bin.install 1970-01-01 02:00:00.000000000 +0200
+++ libgnome-2.32.1//libgnome2-bin.install 2011-09-22 15:18:03.000000000 +0300
@@ -0,0 +1 @@
+debian/tmp/usr/bin/
