[Glibc-bsd-commits] r6026 - trunk/freebsd-libs/debian

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2016-04-20 22:18:11 +0000 (Wed, 20 Apr 2016)
New Revision: 6026

Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/control
   trunk/freebsd-libs/debian/libsbuf-dev.install
   trunk/freebsd-libs/debian/libusb2-dev.install
   trunk/freebsd-libs/debian/libusb3-udeb.install
   trunk/freebsd-libs/debian/libusb3.install
   trunk/freebsd-libs/debian/rules
Log:
Multi-archify libusb{2,3-dev}


Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2016-04-20 20:51:15 UTC (rev 6025)
+++ trunk/freebsd-libs/debian/changelog	2016-04-20 22:18:11 UTC (rev 6026)
@@ -3,6 +3,7 @@
   * Use new preferred hostname for upstream SVN with HTTPS
     (svn.freebsd.org).
   * Enable kinfo_getvmobject.c in libutil-freebsd 
+  * Multi-archify libusb{2,3-dev}
 
  -- Steven Chamberlain <steven at pyro.eu.org>  Mon, 04 Apr 2016 12:35:30 +0100
 

Modified: trunk/freebsd-libs/debian/control
===================================================================
--- trunk/freebsd-libs/debian/control	2016-04-20 20:51:15 UTC (rev 6025)
+++ trunk/freebsd-libs/debian/control	2016-04-20 22:18:11 UTC (rev 6026)
@@ -175,6 +175,7 @@
 
 Package: libusb3
 Architecture: kfreebsd-any
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: FreeBSD userspace USB programming library
  Library for programming USB applications without the knowledge

Modified: trunk/freebsd-libs/debian/libsbuf-dev.install
===================================================================
--- trunk/freebsd-libs/debian/libsbuf-dev.install	2016-04-20 20:51:15 UTC (rev 6025)
+++ trunk/freebsd-libs/debian/libsbuf-dev.install	2016-04-20 22:18:11 UTC (rev 6026)
@@ -1,3 +1,3 @@
 usr/lib/libsbuf.a
 usr/lib/libsbuf*.so
-sys/sys/sbuf.h		usr/include/sys
+usr/include/sys/sbuf.h

Modified: trunk/freebsd-libs/debian/libusb2-dev.install
===================================================================
--- trunk/freebsd-libs/debian/libusb2-dev.install	2016-04-20 20:51:15 UTC (rev 6025)
+++ trunk/freebsd-libs/debian/libusb2-dev.install	2016-04-20 22:18:11 UTC (rev 6026)
@@ -1,7 +1,7 @@
 usr/bin/libusb-config
-usr/lib/libusb.a
-usr/lib/libusb.so
-usr/lib/pkgconfig/libusb*.pc
+usr/lib/*/libusb.a
+usr/lib/*/libusb.so
+usr/lib/*/pkgconfig/libusb*.pc
 usr/include/usb.h
 usr/include/libusb*.h
 usr/share/man/man3/usb.3.gz

Modified: trunk/freebsd-libs/debian/libusb3-udeb.install
===================================================================
--- trunk/freebsd-libs/debian/libusb3-udeb.install	2016-04-20 20:51:15 UTC (rev 6025)
+++ trunk/freebsd-libs/debian/libusb3-udeb.install	2016-04-20 22:18:11 UTC (rev 6026)
@@ -1 +1 @@
-lib/libusb.so.*
+lib/*/libusb.so.*

Modified: trunk/freebsd-libs/debian/libusb3.install
===================================================================
--- trunk/freebsd-libs/debian/libusb3.install	2016-04-20 20:51:15 UTC (rev 6025)
+++ trunk/freebsd-libs/debian/libusb3.install	2016-04-20 22:18:11 UTC (rev 6026)
@@ -1 +1 @@
-lib/libusb.so.*
+lib/*/libusb.so.*

Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules	2016-04-20 20:51:15 UTC (rev 6025)
+++ trunk/freebsd-libs/debian/rules	2016-04-20 22:18:11 UTC (rev 6026)
@@ -2,6 +2,8 @@
 # -*- makefile -*-
 # Sample debian/rules that uses debhelper.
 
+DEB_HOST_MULTIARCH	?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 # Determine host architecture compiler
 DEB_HOST_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 ifeq ($(origin CC),default)
@@ -262,8 +264,11 @@
 
 	mkdir -p \
 		$(DESTDIR)/lib \
+		$(DESTDIR)/lib/$(DEB_HOST_MULTIARCH) \
 		$(DESTDIR)/usr/lib \
+		$(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH) \
 		$(DESTDIR)/usr/lib/pkgconfig \
+		$(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig \
 		$(DESTDIR)/usr/include \
 		$(DESTDIR)/usr/share/man/man3
 	$(PMAKE) -C $(CURDIR)/lib/libsbuf install SHLIBDIR=/lib
@@ -280,15 +285,18 @@
 	$(PMAKE) -C $(CURDIR)/lib/libmemstat install SHLIBDIR=/usr/lib
 	$(PMAKE) -C $(CURDIR)/lib/libnetgraph install SHLIBDIR=/usr/lib
 	$(PMAKE) -C $(CURDIR)/lib/libusbhid install SHLIBDIR=/usr/lib
-	$(PMAKE) -C $(CURDIR)/lib/libusb install SHLIBDIR=/lib
+	$(PMAKE) -C $(CURDIR)/lib/libusb install SHLIBDIR=/lib/$(DEB_HOST_MULTIARCH) LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
 	$(PMAKE) -C $(CURDIR)/lib/libjail install SHLIBDIR=/lib
 	$(PMAKE) -C $(CURDIR)/lib/libalias install SHLIBDIR=/usr/lib
 
 	mkdir -p $(CURDIR)/debian/tmp/usr/bin
 	install -m755 debian/libusb-config $(CURDIR)/debian/tmp/usr/bin
+
+	mkdir -p $(CURDIR)/debian/tmp/usr/include/sys
+	install -m644 sys/sys/sbuf.h $(CURDIR)/debian/tmp/usr/include/sys
 endif
 
-	dh_install -a --list-missing
+	dh_install -a --list-missing --sourcedir=debian/tmp
 
 # Build architecture-independent files here.
 binary-indep: install-indep