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

[Steven Michael Robbins]

Author: smr
Date: 2011-03-19 23:38:19 +0000 (Sat, 19 Mar 2011)
New Revision: 14632

Modified:
   boost/trunk/debian/NEWS.Debian
   boost/trunk/debian/changelog
   boost/trunk/debian/compat
   boost/trunk/debian/control
   boost/trunk/debian/rules
Log:
Fix install of boost-build and its examples.  Use debhelper compatibility level 8.  Update Standards-Version.

Modified: boost/trunk/debian/NEWS.Debian
===================================================================
--- boost/trunk/debian/NEWS.Debian	2011-03-19 22:42:39 UTC (rev 14631)
+++ boost/trunk/debian/NEWS.Debian	2011-03-19 23:38:19 UTC (rev 14632)
@@ -1,3 +1,11 @@
+boost1.46 (1.46.1-3)
+
+  * Boost.Build and bjam now ship in the main -dev package (currently
+    libboost1.46-dev).  Packages boost-build and bjam are obsolete and to
+    be removed from the archive.
+
+ -- Steve M. Robbins <smr at debian.org>  Sat, 19 Mar 2011 18:26:39 -0500
+
 boost1.39 (1.39.0-4) unstable; urgency=low
   
   Since only one (the multi-threaded) variant of each library is built,

Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog	2011-03-19 22:42:39 UTC (rev 14631)
+++ boost/trunk/debian/changelog	2011-03-19 23:38:19 UTC (rev 14632)
@@ -4,8 +4,14 @@
     package.  The latter now conflicts and replaces the old bjam and
     boost-build packages.
 
- -- Steve M. Robbins <smr at debian.org>  Sat, 19 Mar 2011 17:41:33 -0500
+  * control:
+  * compat: Use debhelper compatibility level 8.
+  
+  * control: Set Standards-Version to 3.9.1.  Don't build using _REENTRANT
+    flag.
 
+ -- Steve M. Robbins <smr at debian.org>  Sat, 19 Mar 2011 18:25:49 -0500
+
 boost1.46 (1.46.1-2) unstable; urgency=low
 
   * control (libboost-mpi-python1.46.1): Add conflict with

Modified: boost/trunk/debian/compat
===================================================================
--- boost/trunk/debian/compat	2011-03-19 22:42:39 UTC (rev 14631)
+++ boost/trunk/debian/compat	2011-03-19 23:38:19 UTC (rev 14632)
@@ -1 +1 @@
-7
+8

Modified: boost/trunk/debian/control
===================================================================
--- boost/trunk/debian/control	2011-03-19 22:42:39 UTC (rev 14631)
+++ boost/trunk/debian/control	2011-03-19 23:38:19 UTC (rev 14632)
@@ -4,13 +4,13 @@
 Priority: optional
 Maintainer: Debian Boost Team <pkg-boost-devel at lists.alioth.debian.org>
 Uploaders: Steve M. Robbins <smr at debian.org>, Domenico Andreoli <cavok at debian.org>
-Build-Depends: debhelper (>= 7), bison, flex, docbook-to-man, help2man, xsltproc, doxygen, zlib1g-dev, libbz2-dev, libicu-dev, python-all-dev, python3-all-dev (>= 3.1), python-support (>= 0.6), mpi-default-dev
+Build-Depends: debhelper (>= 8), bison, flex, docbook-to-man, help2man, xsltproc, doxygen, zlib1g-dev, libbz2-dev, libicu-dev, python-all-dev, python3-all-dev (>= 3.1), python-support (>= 0.6), mpi-default-dev
 Build-Conflicts: libopenmpi-dev (= 1.3.2-2)
 X-Python-Version: >= 2.4
 X-Python3-Version: >= 3.0
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-boost/boost/trunk/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-boost/boost/trunk
-Standards-Version: 3.8.3
+Standards-Version: 3.9.1
 
 Package: libboost1.46-dbg
 Architecture: any

Modified: boost/trunk/debian/rules
===================================================================
--- boost/trunk/debian/rules	2011-03-19 22:42:39 UTC (rev 14631)
+++ boost/trunk/debian/rules	2011-03-19 23:38:19 UTC (rev 14632)
@@ -246,7 +246,8 @@
 	done
 
 	# Install Boost.Build v2 & jam
-	cd $(bbv2dir) && ./bjam install --prefix=$(CURDIR)/tmp/usr
+	cd $(bbv2dir) && ./bjam install --prefix=$(CURDIR)/debian/tmp/usr
+	mv debian/tmp/usr/share/boost-build/example debian/boost-build-examples
 
 	install --mode=755 -D debian/rtupdate debian/tmp/usr/share/python/runtime.d/libboost-python$(PKGVERSION)-dev.rtupdate
 	install --mode=755 -D debian/rtupdate debian/tmp/usr/share/python/runtime.d/libboost-mpi-python$(PKGVERSION)-dev.rtupdate
@@ -273,9 +274,8 @@
 	dh_installman -plibboost$(PKGVERSION)-dev debian/bjam.1 debian/bcp.1 debian/inspect.1 debian/quickbook.1
 	dh_install -plibboost$(PKGVERSION)-dev tools/boostbook/xsl/* usr/share/boostbook/xsl
 	dh_install -plibboost$(PKGVERSION)-dev tools/boostbook/dtd/* usr/share/boostbook/dtd
-	dh_install -plibboost$(PKGVERSION)-dev debian/tmp/usr/share/boost-build usr/share
+	dh_install -plibboost$(PKGVERSION)-dev debian/tmp/usr/share/boost-build
 
-
 	# package libboost-doc
 	rm -rf $(htmldir)
 	mkdir -p $(htmldir) 
@@ -290,6 +290,7 @@
 	   usr/share/doc/libboost$(PKGVERSION)-doc/HTML \
 	   usr/share/doc/libboost-doc/HTML
 
+	dh_installexamples -plibboost$(PKGVERSION)-doc debian/boost-build-examples
 	mkdir -p $(exampledir)
 	cat debian/example-files | xargs cp -a --parents --target-directory=$(exampledir)
 	find $(exampledir) -type f | xargs chmod 644