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

[Aurelien Jarno]

Author: aurel32
Date: 2010-01-08 10:53:09 +0000 (Fri, 08 Jan 2010)
New Revision: 2910

Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/rules
Log:
  * Add udeb package to libusb2's shlib.



Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2010-01-08 00:08:07 UTC (rev 2909)
+++ trunk/freebsd-libs/debian/changelog	2010-01-08 10:53:09 UTC (rev 2910)
@@ -3,8 +3,9 @@
   * libusb2-dev: add a libusb-1.0.so -> libusb.so symlink to make
     configure scripts happy.
   * Add patches/13_libusb-update.diff from upstream to update the API.
+  * Add udeb package to libusb2's shlib.
 
- -- Aurelien Jarno <aurel32 at debian.org>  Fri, 08 Jan 2010 01:07:39 +0100
+ -- Aurelien Jarno <aurel32 at debian.org>  Fri, 08 Jan 2010 11:52:33 +0100
 
 freebsd-libs (8.0-3) unstable; urgency=low
 

Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules	2010-01-08 00:08:07 UTC (rev 2909)
+++ trunk/freebsd-libs/debian/rules	2010-01-08 10:53:09 UTC (rev 2910)
@@ -26,8 +26,6 @@
 export SHLIB_MAJOR=0
 export SHLIBDIR=/usr/lib
 
-build: build-arch build-indep
-
 get-orig-source:
 	rm -rf $(ORIGDIR)
 	for i in lib/libcam lib/libdevstat lib/libgeom lib/libipx \
@@ -50,7 +48,7 @@
 	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
 	touch $@
 
-build-arch: build-cam build-geom build-sbuf build-ipx build-kiconv build-kvm build-usbhid build-usb build-devstat build-memstat build-netgraph
+build: build-cam build-geom build-sbuf build-ipx build-kiconv build-kvm build-usbhid build-usb build-devstat build-memstat build-netgraph
 
 build-cam: build-cam-stamp
 build-cam-stamp: patch build-sbuf
@@ -107,10 +105,6 @@
 	$(PMAKE) -C $(CURDIR)/lib/libusb
 	touch $@
 
-build-indep: build-indep-stamp
-build-indep-stamp:
-	touch $@
-
 clean:
 	dh_testdir
 	dh_testroot
@@ -130,10 +124,7 @@
 	rm -f *stamp
 	dh_clean
 
-install: install-indep install-arch
-install-indep:
-
-install-arch:
+install: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k -s
@@ -159,44 +150,34 @@
 
 	dh_install -s --list-missing --sourcedir=debian/tmp
 
-# Must not depend on anything. This is to be called by
-# binary-arch/binary-indep
-# in another 'make' thread.
-binary-common:
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
+	dh_installchangelogs -a
+	dh_installdocs -a
 #	dh_installexamples
-#	dh_installmenu
-#	dh_installdebconf
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
 #	dh_installinit
 #	dh_installcron
 #	dh_installinfo
 #	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
+	dh_link -a
+	dh_strip -a
+	dh_compress -a
+	dh_fixperms -a
 #	dh_perl
 #	dh_python
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-# Build architecture independant packages using the common target.
-binary-indep: build-indep install-indep
-#	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+	dh_makeshlibs -a
+	dh_makeshlibs -plibusb2 --add-udeb=libusb2-udeb
+	dh_installdeb -a
+	dh_shlibdeps -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
 
-# Build architecture dependant packages using the common target.
-binary-arch: build-arch install-arch
-	$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
-
 binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
+.PHONY: build clean binary-indep binary-arch binary install configure