[pkg-boost-commits] r14533 - boost/trunk/debian

[Steven Michael Robbins]

Author: smr
Date: 2009-11-15 06:14:58 +0000 (Sun, 15 Nov 2009)
New Revision: 14533

Modified:
   boost/trunk/debian/rules
Log:
Simplify rules: use dh_install and dh_link once in binary-common and remove most invocations using -pPACKAGE-NAME.

Modified: boost/trunk/debian/rules
===================================================================
--- boost/trunk/debian/rules	2009-11-15 04:44:55 UTC (rev 14532)
+++ boost/trunk/debian/rules	2009-11-15 06:14:58 UTC (rev 14533)
@@ -238,7 +238,6 @@
 	@$(call mk_debhelper_files)
 
 	# package libboost-dbg
-	dh_install -plibboost$(PKGVERSION)-dbg
 
 	# package libboost$(PKGVERSION)-dev
 	dh_install -plibboost$(PKGVERSION)-dev \
@@ -269,48 +268,7 @@
 	find $(exampledir) -type f | xargs chmod 644
 
 
-	# package libboost-date-time$(SOVERSION)
-	dh_install -plibboost-date-time$(SOVERSION)
-	# package libboost-date-time$(PKGVERSION)-dev
-	dh_install -plibboost-date-time$(PKGVERSION)-dev
-	dh_link -plibboost-date-time$(PKGVERSION)-dev
 
-	# package libboost-filesystem$(SOVERSION)
-	dh_install -plibboost-filesystem$(SOVERSION)
-	# package libboost-filesystem$(PKGVERSION)-dev
-	dh_install -plibboost-filesystem$(PKGVERSION)-dev
-	dh_link -plibboost-filesystem$(PKGVERSION)-dev
-
-	# package libboost-graph-parallel$(SOVERSION)
-	dh_install -plibboost-graph-parallel$(SOVERSION)
-	# package libboost-graph-parallel$(PKGVERSION)-dev
-	dh_install -plibboost-graph-parallel$(PKGVERSION)-dev
-	dh_link -plibboost-graph-parallel$(PKGVERSION)-dev
-
-	# package libboost-graph$(SOVERSION)
-	dh_install -plibboost-graph$(SOVERSION)
-	# package libboost-graph$(PKGVERSION)-dev
-	dh_install -plibboost-graph$(PKGVERSION)-dev
-	dh_link -plibboost-graph$(PKGVERSION)-dev
-
-	# package libboost-iostreams$(SOVERSION)
-	dh_install -plibboost-iostreams$(SOVERSION)
-	# package libboost-iostreams$(PKGVERSION)-dev
-	dh_install -plibboost-iostreams$(PKGVERSION)-dev
-	dh_link -plibboost-iostreams$(PKGVERSION)-dev
-
-	# package libboost-math$(SOVERSION)
-	dh_install -plibboost-math$(SOVERSION)
-	# package libboost-math$(PKGVERSION)-dev
-	dh_install -plibboost-math$(PKGVERSION)-dev
-	dh_link -plibboost-math$(PKGVERSION)-dev
-
-	# package libboost-mpi$(SOVERSION)
-	dh_install -plibboost-mpi$(SOVERSION)
-	# package libboost-mpi$(PKGVERSION)-dev
-	dh_install -plibboost-mpi$(PKGVERSION)-dev
-	dh_link -plibboost-mpi$(PKGVERSION)-dev
-
 	# package libboost-mpi-python$(SOVERSION)
 	dh_install -plibboost-mpi-python$(SOVERSION)
 	dh_install -plibboost-mpi-python$(SOVERSION) libs/mpi/build/__init__.py usr/lib/python2.4/site-packages/boost
@@ -322,68 +280,15 @@
 	# package libboost-mpi-python$(PKGVERSION)-dev
 	dh_install -plibboost-python$(PKGVERSION)-dev --autodest \
 	   debian/tmp/usr/share/python/runtime.d/libboost-mpi-python$(PKGVERSION)-dev.rtupdate
-	dh_install -plibboost-mpi-python$(PKGVERSION)-dev
-	dh_link -plibboost-mpi$(PKGVERSION)-dev
-
-	# package libboost-program-options$(SOVERSION)
-	dh_install -plibboost-program-options$(SOVERSION)
-	# package libboost-program-options$(PKGVERSION)-dev
-	dh_install -plibboost-program-options$(PKGVERSION)-dev
-	dh_link -plibboost-program-options$(PKGVERSION)-dev
-
-	# package libboost-python$(SOVERSION)
-	dh_install -plibboost-python$(SOVERSION)
 	# package libboost-python$(PKGVERSION)-dev
 	dh_install -plibboost-python$(PKGVERSION)-dev --autodest \
 	   debian/tmp/usr/share/python/runtime.d/libboost-python$(PKGVERSION)-dev.rtupdate
-	dh_link -plibboost-python$(PKGVERSION)-dev
 
 	cd libs/python/pyste/install && python setup.py install --no-compile --prefix=$(pyste_prefix) --install-lib=$(pyste_prefix)/share/python-support/pyste
 	mv $(pyste_prefix)/bin/pyste.py $(pyste_prefix)/bin/pyste
 	dh_installman -plibboost-python$(PKGVERSION)-dev debian/pyste.1
 
-	# package libboost-regex$(SOVERSION)
-	dh_install -plibboost-regex$(SOVERSION)
-	# package libboost-regex$(PKGVERSION)-dev
-	dh_install -plibboost-regex$(PKGVERSION)-dev
-	dh_link -plibboost-regex$(PKGVERSION)-dev
 
-	# package libboost-serialization$(SOVERSION)
-	dh_install -plibboost-serialization$(SOVERSION)
-	# package libboost-serialization$(PKGVERSION)-dev
-	dh_install -plibboost-serialization$(PKGVERSION)-dev
-	dh_link -plibboost-serialization$(PKGVERSION)-dev
-
-	# package libboost-signals$(SOVERSION)
-	dh_install -plibboost-signals$(SOVERSION)
-	# package libboost-signals$(PKGVERSION)-dev
-	dh_install -plibboost-signals$(PKGVERSION)-dev
-	dh_link -plibboost-signals$(PKGVERSION)-dev
-
-	# package libboost-system$(SOVERSION)
-	dh_install -plibboost-system$(SOVERSION)
-	# package libboost-system$(PKGVERSION)-dev
-	dh_install -plibboost-system$(PKGVERSION)-dev
-	dh_link -plibboost-system$(PKGVERSION)-dev
-
-	# package libboost-test$(SOVERSION)
-	dh_install -plibboost-test$(SOVERSION)
-	# package libboost-test$(PKGVERSION)-dev
-	dh_install -plibboost-test$(PKGVERSION)-dev
-	dh_link -plibboost-test$(PKGVERSION)-dev
-
-	# package libboost-thread$(SOVERSION)
-	dh_install -plibboost-thread$(SOVERSION)
-	# package libboost-thread$(PKGVERSION)-dev
-	dh_install -plibboost-thread$(PKGVERSION)-dev
-	dh_link -plibboost-thread$(PKGVERSION)-dev
-
-	# package libboost-wave$(SOVERSION)
-	dh_install -plibboost-wave$(SOVERSION)
-	# package libboost-wave$(PKGVERSION)-dev
-	dh_install -plibboost-wave$(PKGVERSION)-dev
-	dh_link -plibboost-wave$(PKGVERSION)-dev
-
 # This single target is used to build all the packages, all at once, or
 # one at a time. So keep in mind: any options passed to commands here will
 # affect _all_ packages. Anything you want to only affect one package
@@ -391,6 +296,7 @@
 binary-common:
 	dh_testdir
 	dh_testroot
+	dh_install
 	dh_installdocs --all debian/README.Debian debian/NEWS.Debian
 	dh_installexamples
 	dh_installinfo