Package: orbit2
Version: 1:2.14.19-0.1
Followup-For: Bug #641615
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch
Hi there,
Please find attached an updated patch to orbit2 to implement the additional
requested fixes for multiarch support.
I'm intending to include this fix in Ubuntu 12.04 LTS.
Thanks for considering the patch.
--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
Ubuntu Developer http://www.debian.org/
slanga...@ubuntu.com vor...@debian.org
=== modified file 'debian/control'
--- debian/control 2011-10-18 01:09:32 +0000
+++ debian/control 2012-04-23 07:02:45 +0000
@@ -3,11 +3,13 @@
Priority: optional
Maintainer: Sebastian Rittau <srit...@debian.org>
Standards-Version: 3.8.3
-Build-Depends: libglib2.0-dev (>= 2.8.0), libidl-dev (>= 0.8.10), pkg-config (>= 0.20), cdbs, debhelper (>= 7.0.0), docbook-xsl, gtk-doc-tools (>= 1.6-2), autotools-dev, dh-autoreconf
+Build-Depends: libglib2.0-dev (>= 2.8.0), libidl-dev (>= 0.8.10), pkg-config (>= 0.20), cdbs (>= 0.4.93), debhelper (>= 8.1.3), docbook-xsl, gtk-doc-tools (>= 1.6-2), autotools-dev, dh-autoreconf
Package: liborbit2
Architecture: any
+Multi-Arch: same
Section: libs
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: liborbit2-dev (<< 2.8.1-1)
Conflicts: liborbit2-dev (<< 2.8.1-1), liblinc1 (<< 1.0.3-4), libbonobo-activation4 (<< 1:2.4.0)
@@ -26,6 +28,7 @@
Architecture: any
Section: devel
Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: foreign
Description: a CORBA ORB
ORBit2 is a high-performance CORBA (Common Object Request Broker
Architecture) ORB (Object Request Broker). It allows programs to send
@@ -41,6 +44,7 @@
Architecture: any
Section: devel
Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: foreign
Description: a CORBA name server
ORBit2 is a high-performance CORBA (Common Object Request Broker
Architecture) ORB (Object Request Broker). It allows programs to send
=== modified file 'debian/liborbit2-dev.install'
--- debian/liborbit2-dev.install 2005-11-10 22:07:52 +0000
+++ debian/liborbit2-dev.install 2012-04-20 04:20:20 +0000
@@ -2,11 +2,9 @@
debian/tmp/usr/share/aclocal/ORBit2.m4
debian/tmp/usr/share/idl/orbit-2.0
debian/tmp/usr/share/doc/liborbit2-dev/ORBit2
-debian/tmp/usr/lib/*.so
-debian/tmp/usr/lib/*.la
-debian/tmp/usr/lib/*.a
-debian/tmp/usr/lib/orbit-2.0/Everything_module.la
-debian/tmp/usr/lib/orbit-2.0/Everything_module.a
-debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/lib/*/*.so
+debian/tmp/usr/lib/*/*.a
+debian/tmp/usr/lib/*/orbit-2.0/Everything_module.a
+debian/tmp/usr/lib/*/pkgconfig
debian/tmp/usr/bin/orbit2-config
debian/tmp/usr/bin/orbit-idl-2
=== modified file 'debian/liborbit2.install'
--- debian/liborbit2.install 2005-04-19 16:01:06 +0000
+++ debian/liborbit2.install 2012-04-20 04:16:45 +0000
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/lib*.so.*
-debian/tmp/usr/lib/orbit-2.0/Everything_module.so
+debian/tmp/usr/lib/*/lib*.so.*
+debian/tmp/usr/lib/*/orbit-2.0/Everything_module.so
=== added file 'debian/patches/pre-multiarch-compatibility.patch'
--- debian/patches/pre-multiarch-compatibility.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/pre-multiarch-compatibility.patch 2012-04-20 23:34:22 +0000
@@ -0,0 +1,16 @@
+Author: Steve Langasek <steve.langa...@ubuntu.com>
+Description: Support pre-multiarch directory as a compatibility fallback
+Bug-Debian: http://bugs.debian.org/641615
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/977966
+
+diff -Nur -x '*.orig' -x '*~' trunk/src/orb/orb-core/orbit-typelib.c trunk.new/src/orb/orb-core/orbit-typelib.c
+--- trunk/src/orb/orb-core/orbit-typelib.c 2012-04-18 20:39:57.000000000 +0000
++++ trunk.new/src/orb/orb-core/orbit-typelib.c 2012-04-20 23:27:57.969753251 +0000
+@@ -218,6 +218,7 @@
+ paths = g_ptr_array_sized_new (8);
+
+ g_ptr_array_add (paths, g_strdup (ORBIT_TYPELIB_DIR));
++ g_ptr_array_add (paths, g_strdup ("/usr/lib/orbit-2.0"));
+
+ if ((path = g_getenv ("ORBIT_TYPELIB_PATH"))) {
+ char **strv;
=== modified file 'debian/rules'
--- debian/rules 2011-10-18 01:09:32 +0000
+++ debian/rules 2012-04-20 04:19:31 +0000
@@ -13,7 +13,7 @@
DEB_DH_MAKESHLIBS_ARGS_liborbit2 := -V 'liborbit2 $(shlibver)'
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-purify --enable-gtk-doc --with-html-dir=/usr/share/doc/liborbit2-dev
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-purify --enable-gtk-doc --with-html-dir=/usr/share/doc/liborbit2-dev --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
#
# Man page generation (from Docbook source)
@@ -30,4 +30,4 @@
rm -f debian/name-client-2.1 debian/orbit-name-server-2.1
install/liborbit2-dev::
- sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'`
+ rm `find debian/tmp -name '*.la'`
