user debian-d...@lists.debian.org
usertag 528205 + multiarch
tags 528205 + patch
thanks
Attached parch that uses the actual multiarch spec fields.
The bug has been marked blocking due to waiting for libopensync-plugin-palm
and libopensync-plugin-gnokii to clean their .la files. However, these .la
files are not used by any other package in the archive. Both packages are
also uninstallable and thus also RC-buggy. Other reverse dependencies with
.la issues have already been fixed.
Riku
diff -u libusb-0.1.12/debian/rules libusb-0.1.12/debian/rules
--- libusb-0.1.12/debian/rules
+++ libusb-0.1.12/debian/rules
@@ -16,6 +16,8 @@
# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_BUILD_MULTIARCH ?= $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)
+
ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) \
LDFLAGS="-L/usr/$(DEB_HOST_GNU_TYPE)/lib"
@@ -67,6 +69,7 @@
cd $(objdir) && \
CFLAGS="$(CFLAGS)" ../configure $(CROSS) \
--prefix=/usr \
+ --libdir=/usr/lib/$(DEB_BUILD_MULTIARCH) \
--mandir=/usr/share/man \
--infodir=/usr/share/info
@@ -145,12 +148,14 @@
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
# Move the library to /lib
- mkdir $(CURDIR)/debian/tmp/lib/
- mv $(CURDIR)/debian/tmp/usr/lib/libusb-0.1.so.* \
- $(CURDIR)/debian/tmp/lib/
- ln -sf /lib/libusb-0.1.so.4 $(CURDIR)/debian/tmp/usr/lib/libusb-0.1.so.4
- ln -sf /lib/libusb-0.1.so.4.4.4 $(CURDIR)/debian/tmp/usr/lib/libusb.so
- sed -i "/dependency_libs/ s/'.*'/''/" $(CURDIR)/debian/tmp/usr/lib/libusb.la
+ mkdir -p $(CURDIR)/debian/tmp/lib/$(DEB_BUILD_MULTIARCH)
+ mv $(CURDIR)/debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libusb-0.1.so.* \
+ $(CURDIR)/debian/tmp/lib/$(DEB_BUILD_MULTIARCH)
+ ln -sf /lib/$(DEB_BUILD_MULTIARCH)/libusb-0.1.so.4 \
+ $(CURDIR)/debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libusb-0.1.so.4
+ ln -sf /lib/$(DEB_BUILD_MULTIARCH)/libusb-0.1.so.4.4.4 \
+ $(CURDIR)/debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libusb.so
+ sed -i "/dependency_libs/ s/'.*'/''/" $(CURDIR)/debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/libusb.la
# Move all files in their corresponding package
dh_install -s -Nlibusb-0.1-udeb --list-missing --sourcedir=debian/tmp
diff -u libusb-0.1.12/debian/libusb-0.1-4.install libusb-0.1.12/debian/libusb-0.1-4.install
--- libusb-0.1.12/debian/libusb-0.1-4.install
+++ libusb-0.1.12/debian/libusb-0.1-4.install
@@ -1,2 +1,2 @@
-/lib/libusb-0.1.so.*
-/usr/lib/libusb-0.1.so.*
+/lib/*/libusb-0.1.so.*
+/usr/lib/*/libusb-0.1.so.*
diff -u libusb-0.1.12/debian/control libusb-0.1.12/debian/control
--- libusb-0.1.12/debian/control
+++ libusb-0.1.12/debian/control
@@ -2,7 +2,7 @@
Section: libs
Priority: optional
Maintainer: Aurelien Jarno <aure...@debian.org>
-Build-Depends: debhelper (>= 5.0.22), autotools-dev, pkg-config, docbook, docbook-dsssl, quilt
+Build-Depends: debhelper (>= 8.1.3), autotools-dev, pkg-config, docbook, docbook-dsssl, quilt
Standards-Version: 3.9.2
Package: libusb-0.1-4
@@ -10,8 +10,10 @@
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
Conflicts: libusb0, libccid (<< 0.9.2-3)
Replaces: libusb0
+Multi-Arch: same
Homepage: http://www.linux-usb.org/
Description: userspace USB programming library
Library for programming USB applications without the knowledge
@@ -22,6 +24,7 @@
Architecture: any
Depends: libusb-0.1-4 (= ${binary:Version}), libc6-dev | libc-dev, ${misc:Depends}
Replaces: libusb0 (<< 1:0.1.5-1)
+Multi-Arch: same
Homepage: http://www.linux-usb.org/
Description: userspace USB programming library development files
Library for programming USB applications without the knowledge
@@ -31,9 +34,11 @@
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
Conflicts: libusb++-0.1-4
Replaces: libusb++-0.1-4
Suggests: hotplug
+Multi-Arch: same
Homepage: http://www.linux-usb.org/
Description: userspace C++ USB programming library
Library for programming USB applications without the knowledge
diff -u libusb-0.1.12/debian/libusb-dev.install libusb-0.1.12/debian/libusb-dev.install
--- libusb-0.1.12/debian/libusb-dev.install
+++ libusb-0.1.12/debian/libusb-dev.install
@@ -3,4 +3,4 @@
-usr/lib/libusb.a
-usr/lib/libusb.la
-usr/lib/libusb.so
-usr/lib/pkgconfig/libusb.pc
+usr/lib/*/libusb.a
+usr/lib/*/libusb.la
+usr/lib/*/libusb.so
+usr/lib/*/pkgconfig/libusb.pc
diff -u libusb-0.1.12/debian/libusb++-dev.install libusb-0.1.12/debian/libusb++-dev.install
--- libusb-0.1.12/debian/libusb++-dev.install
+++ libusb-0.1.12/debian/libusb++-dev.install
@@ -2,3 +2,3 @@
-usr/lib/libusbpp.a
-usr/lib/libusbpp.la
-usr/lib/libusbpp.so
+usr/lib/*/libusbpp.a
+usr/lib/*/libusbpp.la
+usr/lib/*/libusbpp.so
diff -u libusb-0.1.12/debian/changelog libusb-0.1.12/debian/changelog
--- libusb-0.1.12/debian/changelog
+++ libusb-0.1.12/debian/changelog
@@ -1,3 +1,9 @@
+libusb (2:0.1.12-19) unstable; urgency=low
+
+ * Multi-Arch conversion
+
+ -- Riku Voipio <riku.voi...@linaro.org> Tue, 16 Aug 2011 12:43:24 +0300
+
libusb (2:0.1.12-18) unstable; urgency=low
* Upgraded policy compliance to 3.9.2 (no changes).
diff -u libusb-0.1.12/debian/libusb++-0.1-4c2.install libusb-0.1.12/debian/libusb++-0.1-4c2.install
--- libusb-0.1.12/debian/libusb++-0.1-4c2.install
+++ libusb-0.1.12/debian/libusb++-0.1-4c2.install
@@ -1 +1 @@
-usr/lib/libusbpp-0.1.so.*
+usr/lib/*/libusbpp-0.1.so.*
