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

[Steven Michael Robbins]

Author: smr
Date: 2011-03-19 22:42:39 +0000 (Sat, 19 Mar 2011)
New Revision: 14631

Modified:
   boost/trunk/debian/changelog
   boost/trunk/debian/control
   boost/trunk/debian/rules
Log:
Install bjam and Boost.Build with the -dev package.

Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog	2011-03-19 20:56:20 UTC (rev 14630)
+++ boost/trunk/debian/changelog	2011-03-19 22:42:39 UTC (rev 14631)
@@ -1,3 +1,11 @@
+boost1.46 (1.46.1-3) unstable; urgency=low
+
+  * control: Remove package bjam; install bjam and Boost.Build with -dev
+    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
+
 boost1.46 (1.46.1-2) unstable; urgency=low
 
   * control (libboost-mpi-python1.46.1): Add conflict with

Modified: boost/trunk/debian/control
===================================================================
--- boost/trunk/debian/control	2011-03-19 20:56:20 UTC (rev 14630)
+++ boost/trunk/debian/control	2011-03-19 22:42:39 UTC (rev 14631)
@@ -12,16 +12,6 @@
 Vcs-Svn: svn://svn.debian.org/svn/pkg-boost/boost/trunk
 Standards-Version: 3.8.3
 
-Package: bjam
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Software build tool 
- Boost.Jam (BJam) is a portable build tool with its own interpreted language,
- which allows to implement rather complex logic in a readable way and without
- resorting to external programs. It is a descendant of Jam/MR tool modified to
- suit the needs of Boost.Build. In particular, modules and rule parameters
- were added, as well as several new builtins.
-
 Package: libboost1.46-dbg
 Architecture: any
 Section: debug
@@ -62,7 +52,8 @@
  docbook-xsl (>= 1.73.2),
  default-jdk (>= 1.4),
  fop (>= 0.94)
-Conflicts: libboost1.42-dev
+Conflicts: bjam, boost-build, libboost1.42-dev
+Replaces: bjam, boost-build
 Description: Boost C++ Libraries development files
  The Boost web site provides free, peer-reviewed, portable C++ source
  libraries. The emphasis is on libraries which work well with the C++
@@ -72,8 +63,8 @@
  already been proposed for inclusion in the C++ Standards Committee's
  upcoming C++ Standard Library Technical Report.
  .
- This package provides headers and the auxiliary tools bcp, inspect,
- boostbook and quickbook.
+ This package provides headers and the auxiliary tools bjam, Boost.Build,
+ bcp, inspect, boostbook and quickbook.
  .
  For the following subprojects separate packages exist: date-time,
  filesystem, graph, iostreams, math, mpi, program_options, python,

Modified: boost/trunk/debian/rules
===================================================================
--- boost/trunk/debian/rules	2011-03-19 20:56:20 UTC (rev 14630)
+++ boost/trunk/debian/rules	2011-03-19 22:42:39 UTC (rev 14631)
@@ -155,6 +155,7 @@
 htmldir = debian/libboost$(PKGVERSION)-doc/usr/share/doc/libboost$(PKGVERSION)-doc/HTML
 pyste_prefix = $(CURDIR)/debian/libboost-python$(PKGVERSION)-dev/usr
 bjam = $(CURDIR)/bjam
+bbv2dir = $(CURDIR)/tools/build/v2
 
 # With --ignore-site-config, can probably drop Build-Conflicts on boost-build.
 JAM = $(bjam) $(JOBS) -d2 $(JAM_OPT) --layout=system --ignore-site-config --user-config=$(CURDIR)/user-config.jam debug-symbols=on
@@ -184,6 +185,7 @@
 	 	mv stage/lib/mpi.so stage/lib/mpi-py$$pyid.so; \
 	done
 
+	cd $(bbv2dir) && ./bootstrap.sh --with-toolset=gcc
 	cd tools/bcp && $(JAM)
 	cd tools/inspect/build && $(JAM)
 	cd tools/quickbook && $(JAM)
@@ -243,6 +245,9 @@
 		$(JAM) --prefix=$(CURDIR)/debian/tmp/usr install --with-python --with-mpi --python-buildid=py$$pyid python=$$pyver; \
 	done
 
+	# Install Boost.Build v2 & jam
+	cd $(bbv2dir) && ./bjam install --prefix=$(CURDIR)/tmp/usr
+
 	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
 
@@ -253,10 +258,6 @@
 	# generate (some) debhelper files
 	@$(call mk_debhelper_files)
 
-	# package bjam
-	dh_install -pbjam bjam usr/bin
-	dh_installman -pbjam debian/bjam.1
-
 	# package libboost-dbg
 
 	# package libboost$(PKGVERSION)-dev
@@ -264,14 +265,17 @@
 	   debian/tmp/usr/include/boost \
 	   usr/include
 	dh_install -plibboost$(PKGVERSION)-dev \
+	   debian/tmp/usr/bin/bjam \
 	   dist/bin/bcp \
 	   dist/bin/inspect \
 	   dist/bin/quickbook \
 	   usr/bin
-	dh_installman -plibboost$(PKGVERSION)-dev debian/bcp.1 debian/inspect.1 debian/quickbook.1
+	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
 
+
 	# package libboost-doc
 	rm -rf $(htmldir)
 	mkdir -p $(htmldir)