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

[Steven Michael Robbins]

Author: smr
Date: 2009-06-07 18:25:44 +0000 (Sun, 07 Jun 2009)
New Revision: 14447

Modified:
   boost/trunk/debian/changelog
   boost/trunk/debian/control
Log:
Build-conflict with boost-build to avoid duplicate initialization of gcc

Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog	2009-05-30 15:12:18 UTC (rev 14446)
+++ boost/trunk/debian/changelog	2009-06-07 18:25:44 UTC (rev 14447)
@@ -1,8 +1,11 @@
 boost1.38 (1.38.0-7) unstable; urgency=low
 
   * control(libboost1.38-dev): downgrade the -doc and all -dev packages to Suggests.
-    Closes: #529258, #529622.
-  
+    Closes: #529258, #529622.  Add build-conflict against boost-build;
+    otherwise bjam fails with diagnostic "duplicate initialization of gcc ..."
+    because both /etc/site-config.jam and ./user-config.jam have
+    "using gcc" lines.
+
   * patches/boost-python-examples.patch: New.  Patch example Jamroot to
     use installed libboost_python (thanks, Georg Schmid).  
     Closes: #452410.
@@ -10,7 +13,7 @@
   * libboost-doc.README.Debian: Explain how to build Boost.Python
     examples.
 
- -- Steve M. Robbins <smr at debian.org>  Sat, 30 May 2009 10:10:38 -0500
+ -- Steve M. Robbins <smr at debian.org>  Sun, 07 Jun 2009 12:55:19 -0500
 
 boost1.38 (1.38.0-6) unstable; urgency=low
 

Modified: boost/trunk/debian/control
===================================================================
--- boost/trunk/debian/control	2009-05-30 15:12:18 UTC (rev 14446)
+++ boost/trunk/debian/control	2009-06-07 18:25:44 UTC (rev 14447)
@@ -5,6 +5,7 @@
 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>, Christophe Prud'homme <prudhomm at debian.org>
 Build-Depends: debhelper (>= 7), quilt, bison, flex, docbook-to-man, xsltproc, doxygen, zlib1g-dev, libbz2-dev, libicu-dev, python-all-dev, python-support (>= 0.6), mpi-default-dev
+Build-Conflicts: boost-build
 XS-Python-Version: 2.4, 2.5
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-boost/boost/trunk/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-boost/boost/trunk