[Glibc-bsd-commits] r4122 - trunk/libbsd/debian

[Guillem Jover]

Author: guillem
Date: 2012-02-25 19:51:38 +0000 (Sat, 25 Feb 2012)
New Revision: 4122

Modified:
   trunk/libbsd/debian/changelog
   trunk/libbsd/debian/control
   trunk/libbsd/debian/libbsd-dev.install
   trunk/libbsd/debian/libbsd0-udeb.install
   trunk/libbsd/debian/libbsd0.install
   trunk/libbsd/debian/rules
Log:
Make shared library packages multiarch

Build-Depend on debhelper 8.1.3.
Add misc:Pre-Depends substvar to Pre-Depends field in libbsd0.
Add ?\226?\128?\156Multi-Arch: same?\226?\128?\157 field to libbsd0 and libbsd0-dbg.
Define DEB_HOST_MULTIARCH and use it to set libdir and usrlibdir.
Change paths from lib/ to lib/* in install files.


Modified: trunk/libbsd/debian/changelog
===================================================================
--- trunk/libbsd/debian/changelog	2012-02-25 16:28:27 UTC (rev 4121)
+++ trunk/libbsd/debian/changelog	2012-02-25 19:51:38 UTC (rev 4122)
@@ -1,3 +1,14 @@
+libbsd (0.3.0-2) UNRELEASED; urgency=low
+
+  * Make shared library packages multiarch:
+    - Build-Depend on debhelper 8.1.3.
+    - Add misc:Pre-Depends substvar to Pre-Depends field in libbsd0.
+    - Add “Multi-Arch: same” field to libbsd0 and libbsd0-dbg.
+    - Define DEB_HOST_MULTIARCH and use it to set libdir and usrlibdir.
+    - Change paths from lib/ to lib/* in install files.
+
+ -- Guillem Jover <guillem at debian.org>  Sat, 25 Feb 2012 20:36:23 +0100
+
 libbsd (0.3.0-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/libbsd/debian/control
===================================================================
--- trunk/libbsd/debian/control	2012-02-25 16:28:27 UTC (rev 4121)
+++ trunk/libbsd/debian/control	2012-02-25 19:51:38 UTC (rev 4122)
@@ -6,7 +6,7 @@
  Guillem Jover <guillem at debian.org>, Aurelien Jarno <aurel32 at debian.org>
 Vcs-Browser: http://svn.debian.org/wsvn/glibc-bsd/trunk/libbsd/
 Vcs-Svn: svn://svn.debian.org/glibc-bsd/trunk/libbsd/
-Build-Depends: dpkg-dev (>= 1.15.7), debhelper (>= 7)
+Build-Depends: dpkg-dev (>= 1.15.7), debhelper (>= 8.1.3)
 Standards-Version: 3.9.2
 Homepage: http://libbsd.freedesktop.org/
 
@@ -46,6 +46,8 @@
 
 Package: libbsd0
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: net-tools (<< 7.0-2) [kfreebsd-any]
 Description: utility functions from BSD systems - shared library
@@ -65,6 +67,7 @@
 Section: debug
 Priority: extra
 Architecture: any
+Multi-Arch: same
 Depends: libbsd0 (= ${binary:Version}), ${misc:Depends}
 Description: utility functions from BSD systems - debugging symbols
  This library provides some functions commonly available on BSD systems

Modified: trunk/libbsd/debian/libbsd-dev.install
===================================================================
--- trunk/libbsd/debian/libbsd-dev.install	2012-02-25 16:28:27 UTC (rev 4121)
+++ trunk/libbsd/debian/libbsd-dev.install	2012-02-25 19:51:38 UTC (rev 4122)
@@ -1,5 +1,5 @@
-usr/lib/*.so
-usr/lib/*.a
-usr/lib/pkgconfig/*.pc
+usr/lib/*/*.so
+usr/lib/*/*.a
+usr/lib/*/pkgconfig/*.pc
 usr/include
 usr/share/man

Modified: trunk/libbsd/debian/libbsd0-udeb.install
===================================================================
--- trunk/libbsd/debian/libbsd0-udeb.install	2012-02-25 16:28:27 UTC (rev 4121)
+++ trunk/libbsd/debian/libbsd0-udeb.install	2012-02-25 19:51:38 UTC (rev 4122)
@@ -1 +1 @@
-lib/*.so.*
+lib/*/*.so.*

Modified: trunk/libbsd/debian/libbsd0.install
===================================================================
--- trunk/libbsd/debian/libbsd0.install	2012-02-25 16:28:27 UTC (rev 4121)
+++ trunk/libbsd/debian/libbsd0.install	2012-02-25 19:51:38 UTC (rev 4122)
@@ -1 +1 @@
-lib/*.so.*
+lib/*/*.so.*

Modified: trunk/libbsd/debian/rules
===================================================================
--- trunk/libbsd/debian/rules	2012-02-25 16:28:27 UTC (rev 4121)
+++ trunk/libbsd/debian/rules	2012-02-25 19:51:38 UTC (rev 4122)
@@ -3,6 +3,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
 CFLAGS := -Wall $(shell dpkg-buildflags --get CFLAGS)
 LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
@@ -36,7 +38,9 @@
 	dh_prep
 	dh_installdirs
 
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp \
+		libdir=/lib/$(DEB_HOST_MULTIARCH) \
+		usrlibdir=/usr/lib/$(DEB_HOST_MULTIARCH)
 
 binary-indep:
 # Nothing to do.