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

Steven Michael Robbins smr at alioth.debian.org
Sun Nov 8 01:36:47 UTC 2009


Author: smr
Date: 2009-11-08 01:36:47 +0000 (Sun, 08 Nov 2009)
New Revision: 14519

Modified:
   boost/trunk/debian/changelog
   boost/trunk/debian/rules
Log:
Keep all headers in libboostX.Y-dev.

Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog	2009-10-04 16:04:39 UTC (rev 14518)
+++ boost/trunk/debian/changelog	2009-11-08 01:36:47 UTC (rev 14519)
@@ -1,3 +1,11 @@
+boost1.40 (1.40.0-3) unstable; urgency=low
+
+  * rules: Keep all headers in package libboostX.Y-dev to avoid bugs about
+    one boost lib using headers of another boost lib.  Boost is developed
+    as a monolith.  Closes: #550006.
+
+ -- Steve M. Robbins <smr at debian.org>  Sat, 07 Nov 2009 19:25:33 -0600
+
 boost1.40 (1.40.0-2) unstable; urgency=low
 
   * rules:

Modified: boost/trunk/debian/rules
===================================================================
--- boost/trunk/debian/rules	2009-10-04 16:04:39 UTC (rev 14518)
+++ boost/trunk/debian/rules	2009-11-08 01:36:47 UTC (rev 14519)
@@ -266,86 +266,54 @@
 	# package libboost-date-time$(SOVERSION)
 	dh_install -plibboost-date-time$(SOVERSION)
 	# package libboost-date-time$(PKGVERSION)-dev
-	dh_installdirs -plibboost-date-time$(PKGVERSION)-dev usr/include/boost
-	mv debian/libboost$(PKGVERSION)-dev/usr/include/boost/date_time* \
-	   debian/libboost-date-time$(PKGVERSION)-dev/usr/include/boost
 	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_installdirs -plibboost-filesystem$(PKGVERSION)-dev usr/include/boost
-	mv debian/libboost$(PKGVERSION)-dev/usr/include/boost/filesystem* \
-	   debian/libboost-filesystem$(PKGVERSION)-dev/usr/include/boost
 	dh_install -plibboost-filesystem$(PKGVERSION)-dev
 	dh_link -plibboost-filesystem$(PKGVERSION)-dev
 
-# Includes for graph-parallel are a subdirectory of graph so we have
-# to move the former before moving the include/boost/graph files.
 	# package libboost-graph-parallel$(SOVERSION)
 	dh_install -plibboost-graph-parallel$(SOVERSION)
 	# package libboost-graph-parallel$(PKGVERSION)-dev
-	dh_installdirs -plibboost-graph-parallel$(PKGVERSION)-dev usr/include/boost/graph
-	# Move distributed & parallel
-	mv debian/libboost$(PKGVERSION)-dev/usr/include/boost/graph/distributed \
-	   debian/libboost-graph-parallel$(PKGVERSION)-dev/usr/include/boost/graph
-	mv debian/libboost$(PKGVERSION)-dev/usr/include/boost/graph/parallel \
-	   debian/libboost-graph-parallel$(PKGVERSION)-dev/usr/include/boost/graph
 	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_installdirs -plibboost-graph$(PKGVERSION)-dev usr/include/boost
-	mv debian/libboost$(PKGVERSION)-dev/usr/include/boost/graph \
-	   debian/libboost-graph$(PKGVERSION)-dev/usr/include/boost
 	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_installdirs -plibboost-iostreams$(PKGVERSION)-dev usr/include/boost
-	mv debian/libboost$(PKGVERSION)-dev/usr/include/boost/iostreams* \
-	   debian/libboost-iostreams$(PKGVERSION)-dev/usr/include/boost
 	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_installdirs -plibboost-math$(PKGVERSION)-dev usr/include/boost
-	mv debian/libboost$(PKGVERSION)-dev/usr/include/boost/math* \
-	   debian/libboost-math$(PKGVERSION)-dev/usr/include/boost
 	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_installdirs -plibboost-mpi$(PKGVERSION)-dev usr/include/boost
-	mv debian/libboost$(PKGVERSION)-dev/usr/include/boost/mpi* \
-	   debian/libboost-mpi$(PKGVERSION)-dev/usr/include/boost
 	dh_install -plibboost-mpi$(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_installdirs -plibboost-program-options$(PKGVERSION)-dev usr/include/boost
-	mv debian/libboost$(PKGVERSION)-dev/usr/include/boost/program_options* \
-	   debian/libboost-program-options$(PKGVERSION)-dev/usr/include/boost
 	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_installdirs -plibboost-python$(PKGVERSION)-dev usr/include/boost
-	mv debian/libboost$(PKGVERSION)-dev/usr/include/boost/python* \
-	   debian/libboost-python$(PKGVERSION)-dev/usr/include/boost
 	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
@@ -357,62 +325,42 @@
 	# package libboost-regex$(SOVERSION)
 	dh_install -plibboost-regex$(SOVERSION)
 	# package libboost-regex$(PKGVERSION)-dev
-	dh_installdirs -plibboost-regex$(PKGVERSION)-dev usr/include/boost
-	mv debian/libboost$(PKGVERSION)-dev/usr/include/boost/*regex* \
-	   debian/libboost-regex$(PKGVERSION)-dev/usr/include/boost
 	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_installdirs -plibboost-serialization$(PKGVERSION)-dev usr/include/boost
-	mv debian/libboost$(PKGVERSION)-dev/usr/include/boost/*serialization* \
-	   debian/libboost-serialization$(PKGVERSION)-dev/usr/include/boost
 	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_installdirs -plibboost-signals$(PKGVERSION)-dev usr/include/boost
-	mv debian/libboost$(PKGVERSION)-dev/usr/include/boost/*signal* \
-	   debian/libboost-signals$(PKGVERSION)-dev/usr/include/boost
 	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_installdirs -plibboost-system$(PKGVERSION)-dev usr/include/boost
-	mv debian/libboost$(PKGVERSION)-dev/usr/include/boost/system \
-	   debian/libboost-system$(PKGVERSION)-dev/usr/include/boost
 	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_installdirs -plibboost-test$(PKGVERSION)-dev usr/include/boost
-	mv debian/libboost$(PKGVERSION)-dev/usr/include/boost/test \
-	   debian/libboost-test$(PKGVERSION)-dev/usr/include/boost
 	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_installdirs -plibboost-thread$(PKGVERSION)-dev usr/include/boost
-	mv debian/libboost$(PKGVERSION)-dev/usr/include/boost/thread* \
-	   debian/libboost-thread$(PKGVERSION)-dev/usr/include/boost
 	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_installdirs -plibboost-wave$(PKGVERSION)-dev usr/include/boost
-	mv debian/libboost$(PKGVERSION)-dev/usr/include/boost/wave* \
-	   debian/libboost-wave$(PKGVERSION)-dev/usr/include/boost
 	dh_install -plibboost-wave$(PKGVERSION)-dev
 	dh_link -plibboost-wave$(PKGVERSION)-dev
 




More information about the pkg-boost-commits mailing list