Package: orbit2
Version:
Severity: normal
User: debian-d...@lists.debian.org
Usertags: multiarch
Tags: patch
The attached patch add multiarch to orbit2. Since the maintainers seems MIA,
I shall NMU this next week unless I hear objections. The patch is against ubuntu
version of packaging, but needs only small mods to apply on debian package.
Riku
diff -u orbit2-2.14.19/debian/rules orbit2-2.14.19/debian/rules
--- orbit2-2.14.19/debian/rules
+++ orbit2-2.14.19/debian/rules
@@ -14,7 +14,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)
@@ -32,5 +32,5 @@
install/liborbit2-dev::
- for file in debian/tmp/usr/lib/*.la; do \
+ for file in debian/tmp/usr/lib/*/*.la; do \
sed -i "/dependency_libs/ s/'.*'/''/" $$file ; \
done
diff -u orbit2-2.14.19/debian/changelog orbit2-2.14.19/debian/changelog
--- orbit2-2.14.19/debian/changelog
+++ orbit2-2.14.19/debian/changelog
@@ -1,3 +1,9 @@
+orbit2 (1:2.14.19-0ubuntu3) oneiric; urgency=low
+
+ * Multiarchize
+
+ -- Riku Voipio <riku.voi...@linaro.org> Wed, 14 Sep 2011 12:20:56 +0300
+
orbit2 (1:2.14.19-0ubuntu2) natty; urgency=low
* debian/rules: clean the dependency_libs out of libORBit-2.la at build
diff -u orbit2-2.14.19/debian/liborbit2-dev.install orbit2-2.14.19/debian/liborbit2-dev.install
--- orbit2-2.14.19/debian/liborbit2-dev.install
+++ orbit2-2.14.19/debian/liborbit2-dev.install
@@ -3,10 +3,10 @@
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/*/*.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/bin/orbit2-config
debian/tmp/usr/bin/orbit-idl-2
diff -u orbit2-2.14.19/debian/control orbit2-2.14.19/debian/control
--- orbit2-2.14.19/debian/control
+++ orbit2-2.14.19/debian/control
@@ -4,12 +4,14 @@
Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com>
XSBC-Original-Maintainer: Sebastian Rittau <srit...@debian.org>
Standards-Version: 3.9.1
-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
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
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)
Description: libraries for ORBit2 - a CORBA ORB
@@ -27,6 +29,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
@@ -42,6 +45,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
diff -u orbit2-2.14.19/debian/liborbit2.install orbit2-2.14.19/debian/liborbit2.install
--- orbit2-2.14.19/debian/liborbit2.install
+++ orbit2-2.14.19/debian/liborbit2.install
@@ -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
