Package: libusb
Version: 0.1.12-13
Severity: wishlist
Tags: patch
Hi,
the attached patch converts libusb to multiarch format.
MfG
Goswin
-- System Information:
Debian Release: squeeze/sid
APT prefers unstable
APT policy: (500, 'unstable'), (400, 'unstable-i386')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.26-xen-1 (SMP w/2 CPU cores)
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
Shell: /bin/sh linked to /bin/bash
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
@@ -9,6 +9,7 @@
Priority: important
Section: libs
Architecture: any
+Multi-Arch: yes
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libusb0, libccid (<< 0.9.2-3)
Replaces: libusb0
@@ -30,6 +31,7 @@
Package: libusb++-0.1-4c2
Section: libs
Architecture: any
+Multi-Arch: yes
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libusb++-0.1-4
Replaces: libusb++-0.1-4
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/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.*
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-13a0.multi.1) unstable; urgency=low
+
+ * Convert to multiarch
+
+ -- Goswin von Brederlow <[email protected]> Mon, 11 May 2009 13:15:03 +0200
+
libusb (2:0.1.12-13) unstable; urgency=low
* Use quilt to manage patches.
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/rules libusb-0.1.12/debian/rules
--- libusb-0.1.12/debian/rules
+++ libusb-0.1.12/debian/rules
@@ -67,6 +67,7 @@
cd $(objdir) && \
CFLAGS="$(CFLAGS)" ../configure $(CROSS) \
--prefix=/usr \
+ --libdir=/usr/lib/$(DEB_HOST_GNU_TYPE)
--mandir=/usr/share/man \
--infodir=/usr/share/info
@@ -145,11 +146,11 @@
$(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
+ mkdir -p $(CURDIR)/debian/tmp/lib/$(DEB_HOST_GNU_TYPE)
+ mv $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_GNU_TYPE)/libusb-0.1.so.* \
+ $(CURDIR)/debian/tmp/lib/$(DEB_HOST_GNU_TYPE)/
+ ln -sf /lib/$(DEB_HOST_GNU_TYPE)/libusb-0.1.so.4 $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_GNU_TYPE)/libusb-0.1.so.4
+ ln -sf /lib/$(DEB_HOST_GNU_TYPE)/libusb-0.1.so.4.4.4 $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_GNU_TYPE)/libusb.so
# Move all files in their corresponding package
dh_install -s -Nlibusb-0.1-udeb --list-missing --sourcedir=debian/tmp
