tags 641614 + pending
thanks
Dear maintainer,
I've prepared an NMU for libidl (versioned as 0.8.14-0.3) and
uploaded it to DELAYED/3. Please feel free to tell me if I
should delay it longer.
Regards.
--
Josselin Mouette
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
@@ -6,4 +6 @@
-install/libidl-dev::
- for file in debian/tmp/usr/lib/*.la; do \
- sed -i "/dependency_libs/ s/'.*'/''/" $$file ; \
- done
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
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
@@ -2,5 +2,4 @@
-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
+debian/tmp/usr/lib/*/*.so
+debian/tmp/usr/lib/*/*.a
+debian/tmp/usr/lib/*/pkgconfig
+debian/libIDL-config-2 usr/bin
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
@@ -7,8 +7,10 @@
Package: libidl0
Architecture: any
+Multi-Arch: same
Section: libs
-Depends: cpp, ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Depends: cpp:any, ${shlibs:Depends}, ${misc:Depends}
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
@@ -18,8 +20,9 @@
Package: libidl-dev
Architecture: any
+Multi-Arch: same
Section: libdevel
-Depends: libidl0 (= ${binary:Version}), libglib2.0-dev, ${shlibs:Depends}, , ${misc:Depends}
+Depends: libidl0 (= ${binary:Version}), libglib2.0-dev, ${shlibs:Depends}, pkg-config, ${misc:Depends}
Description: development files for programs that use libIDL
This package contains the header files and libraries needed for developing
programs which use libIDL.
diff -u libidl-0.8.14/debian/changelog libidl-0.8.14/debian/changelog
--- libidl-0.8.14/debian/changelog
+++ libidl-0.8.14/debian/changelog
@@ -1,3 +1,17 @@
+libidl (0.8.14-0.3) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Replace libidl-config by a wrapper for pkg-config.
+ * Add corresponding dependency on pkg-config.
+ * Drop .la files.
+ * Switch to multiarch. Closes: #641614.
+ + Set libdir accordingly.
+ + Update installation paths.
+ + Make both packages MA: same.
+ + Depend on cpp:any.
+
+ -- Josselin Mouette <[email protected]> Thu, 07 Nov 2013 14:00:10 +0100
+
libidl (0.8.14-0.2) unstable; urgency=low
* Non-maintainer upload.
only in patch2:
unchanged:
--- libidl-0.8.14.orig/debian/libIDL-config-2
+++ libidl-0.8.14/debian/libIDL-config-2
@@ -0,0 +1,59 @@
+#! /bin/sh
+usage()
+{
+ cat <<EOF
+Usage: libIDL-config [OPTIONS]
+Options:
+ [--prefix]
+ [--exec-prefix]
+ [--version]
+ [--libs]
+ [--cflags]
+EOF
+ exit $1
+}
+
+if test $# -eq 0; then
+ usage 1 1>&2
+fi
+
+call_pkgconfig=no
+pkgconfig_flags=
+
+while test $# -gt 0; do
+ case "$1" in
+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+ *) optarg= ;;
+ esac
+
+ case $1 in
+ --prefix)
+ pkg-config --variable=prefix libIDL-2.0
+ ;;
+ --exec-prefix)
+ pkg-config --variable=exec_prefix libIDL-2.0
+ ;;
+ --version)
+ pkg-config --modversion libIDL-2.0
+ exit 0
+ ;;
+ --cflags)
+ call_pkgconfig=yes
+ pkgconfig_flags="$pkgconfig_flags --cflags"
+ ;;
+ --libs)
+ call_pkgconfig=yes
+ pkgconfig_flags="$pkgconfig_flags --libs"
+ ;;
+ *)
+ usage 1 1>&2
+ ;;
+ esac
+ shift
+done
+
+if test "$call_pkgconfig" = "yes"; then
+ exec pkg-config $pkgconfig_flags libIDL-2.0
+fi
+
+exit 0
