Package: wireless-tools Version: 30~pre9-5 Severity: normal User: [email protected] Usertags: multiarch Tags: patch
Hi, The following patch converts wireless-tools to multiarch directories and adds needed Multi-Arch: stanzas to control.in file. http://wiki.debian.org/Multiarch/Implementation Riku
diff -urN orig/wireless-tools-30~pre9//debian/control wireless-tools-30~pre9//debian/control --- orig/wireless-tools-30~pre9//debian/control 2010-07-04 12:19:11.000000000 +0300 +++ wireless-tools-30~pre9//debian/control 2011-09-22 17:49:55.791538093 +0300 @@ -3,12 +3,13 @@ Priority: extra Maintainer: Guus Sliepen <[email protected]> Standards-Version: 3.9.0 -Build-Depends: debhelper (>= 7) +Build-Depends: debhelper (>= 8.1.3) Homepage: http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html Package: wireless-tools Section: net Architecture: linux-any +Multi-Arch: foreign Depends: ${shlibs:Depends}, ${misc:Depends} Description: Tools for manipulating Linux Wireless Extensions This package contains the Wireless tools, used to manipulate @@ -20,6 +21,7 @@ Section: net Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends} +Multi-Arch: foreign Conflicts: wireless-tools (<< 27+28pre9) Description: Rename network interfaces based on various static criteria Ifrename allow the user to decide what name a network interface will have. @@ -30,6 +32,8 @@ Package: libiw30 Section: libs Architecture: linux-any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Description: Wireless tools - library Wireless tools are used to manipulate the Linux Wireless Extensions. The @@ -41,6 +45,7 @@ Package: libiw-dev Section: libdevel Architecture: linux-any +Multi-Arch: same Depends: libiw30 (= ${binary:Version}), libc6-dev, ${misc:Depends} Description: Wireless tools - development files Wireless tools are used to manipulate the Linux Wireless Extensions. The diff -urN orig/wireless-tools-30~pre9//debian/libiw30.install wireless-tools-30~pre9//debian/libiw30.install --- orig/wireless-tools-30~pre9//debian/libiw30.install 2009-11-26 17:20:00.000000000 +0200 +++ wireless-tools-30~pre9//debian/libiw30.install 1970-01-01 02:00:00.000000000 +0200 @@ -1 +0,0 @@ -debian/tmp/lib/*.so.* diff -urN orig/wireless-tools-30~pre9//debian/libiw-dev.install wireless-tools-30~pre9//debian/libiw-dev.install --- orig/wireless-tools-30~pre9//debian/libiw-dev.install 2009-11-26 17:20:19.000000000 +0200 +++ wireless-tools-30~pre9//debian/libiw-dev.install 2011-09-22 17:43:19.731537910 +0300 @@ -1,2 +1 @@ -debian/tmp/lib/*.a usr/lib/ debian/tmp/usr/include/* diff -urN orig/wireless-tools-30~pre9//debian/libiw-dev.links wireless-tools-30~pre9//debian/libiw-dev.links --- orig/wireless-tools-30~pre9//debian/libiw-dev.links 2009-11-26 17:20:18.000000000 +0200 +++ wireless-tools-30~pre9//debian/libiw-dev.links 1970-01-01 02:00:00.000000000 +0200 @@ -1 +0,0 @@ -/lib/libiw.so.30 /usr/lib/libiw.so diff -urN orig/wireless-tools-30~pre9//debian/rules wireless-tools-30~pre9//debian/rules --- orig/wireless-tools-30~pre9//debian/rules 2010-01-24 00:51:06.000000000 +0200 +++ wireless-tools-30~pre9//debian/rules 2011-09-22 18:44:51.991539612 +0300 @@ -3,6 +3,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) UDEB_CFLAGS=-Os -I. build: build-stamp @@ -25,8 +26,12 @@ dh_installdirs $(MAKE) install install-static PREFIX="`pwd`/debian/tmp" cp 19-udev-ifrename.rules debian/ifrename.udev - dh_link dh_install + mkdir -p debian/libiw30/lib/$(DEB_HOST_MULTIARCH)/ + mkdir -p debian/libiw-dev/usr/lib/$(DEB_HOST_MULTIARCH)/ + cp debian/tmp/lib/libiw.so.30 debian/libiw30/lib/$(DEB_HOST_MULTIARCH)/libiw.so.30 + cp debian/tmp/lib/libiw.a debian/libiw-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libiw.a + ln -s /lib/$(DEB_HOST_MULTIARCH)/libiw.so.30 debian/libiw-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libiw.so $(MAKE) clean $(MAKE) BUILD_NOLIBM=y CFLAGS="$(UDEB_CFLAGS)" PREFIX="`pwd`/debian/tmp" dh_install -pwireless-tools-udeb iwconfig iwgetid sbin/
