On Mon, Feb 13, 2012 at 11:49:44AM +0000, Colin Watson wrote:
> I can think of one other possibility which might work, but needs to be
> tested. Introduce a libidl-common package, which is empty apart from
> documentation. The control metadata would look something like this:
OK, that seems to work. Riku, could you double-check this patch and
consider it for the NMU you were talking about doing?
diff -u libidl-0.8.14/debian/rules libidl-0.8.14/debian/rules
--- libidl-0.8.14/debian/rules
+++ libidl-0.8.14/debian/rules
@@ -4,6 +4,8 @@
include /usr/share/cdbs/1/class/autotools.mk
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+
install/libidl-dev::
- for file in debian/tmp/usr/lib/*.la; do \
+ for file in debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la; do \
sed -i "/dependency_libs/ s/'.*'/''/" $$file ; \
done
diff -u libidl-0.8.14/debian/libidl0.install
libidl-0.8.14/debian/libidl0.install
--- libidl-0.8.14/debian/libidl0.install
+++ libidl-0.8.14/debian/libidl0.install
@@ -1 +1 @@
-debian/tmp/usr/lib/lib*.so.*
+debian/tmp/usr/lib/*/lib*.so.*
diff -u libidl-0.8.14/debian/libidl-dev.install
libidl-0.8.14/debian/libidl-dev.install
--- libidl-0.8.14/debian/libidl-dev.install
+++ libidl-0.8.14/debian/libidl-dev.install
@@ -1,6 +1,6 @@
debian/tmp/usr/include
-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/*/*.la
+debian/tmp/usr/lib/*/*.a
+debian/tmp/usr/lib/*/pkgconfig
debian/tmp/usr/bin/libIDL-config-2
diff -u libidl-0.8.14/debian/control libidl-0.8.14/debian/control
--- libidl-0.8.14/debian/control
+++ libidl-0.8.14/debian/control
@@ -3,12 +3,14 @@
Maintainer: Sebastian Rittau <[email protected]>
Standards-Version: 3.8.3
Section: libs
-Build-Depends: libglib2.0-dev, pkg-config, bison, flex, texinfo, cdbs,
debhelper (>= 4.1.0)
+Build-Depends: libglib2.0-dev, pkg-config, bison, flex, texinfo, cdbs (>=
0.4.93~), debhelper (>= 8.1.3~)
Package: libidl0
Architecture: any
Section: libs
-Depends: cpp, ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libidl-common (>= ${source:Version}), libidl-common (<<
${source:Version}.1), ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
Description: library for parsing CORBA IDL files
libIDL is a small library for creating parse trees of CORBA v2.2 compliant
Interface Definition Language (IDL) files, which is a specification for
@@ -16,10 +19,25 @@
implementations. libIDL is used in the ORBit2 IDL compiler, as well
as various language bindings (Perl, Python, etc.) for ORBit2.
+Package: libidl-common
+Architecture: all
+Multi-Arch: foreign
+Depends: cpp
+Description: library for parsing CORBA IDL files (common files)
+ libIDL is a small library for creating parse trees of CORBA v2.2 compliant
+ Interface Definition Language (IDL) files, which is a specification for
+ defining interfaces which can be used between different CORBA
+ implementations. libIDL is used in the ORBit2 IDL compiler, as well
+ as various language bindings (Perl, Python, etc.) for ORBit2.
+ .
+ This package is a workaround for multiarch-related upgrade problems, and
+ will eventually be merged back into libidl0.
+
Package: libidl-dev
Architecture: any
Section: libdevel
-Depends: libidl0 (= ${binary:Version}), libglib2.0-dev, ${shlibs:Depends}, ,
${misc:Depends}
+Depends: libidl0 (= ${binary:Version}), libglib2.0-dev, ${shlibs:Depends},
${misc:Depends}
+Multi-Arch: same
Description: development files for programs that use libIDL
This package contains the header files and libraries needed for developing
programs which use libIDL.
--
Colin Watson [[email protected]]
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
