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

[Steven Michael Robbins]

Author: smr
Date: 2011-08-12 03:47:01 +0000 (Fri, 12 Aug 2011)
New Revision: 14653

Modified:
   boost/trunk/debian/changelog
   boost/trunk/debian/control
   boost/trunk/debian/rules
Log:
Fix package description.  Dump bootstrap.log on failure.

Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog	2011-06-12 06:47:34 UTC (rev 14652)
+++ boost/trunk/debian/changelog	2011-08-12 03:47:01 UTC (rev 14653)
@@ -1,3 +1,12 @@
+boost1.46 (1.46.1-7) UNRELEASED; urgency=low
+
+  * control: Fix ungrammatical description for iostreams packages.
+    Closes: #633865.
+  
+  * rules: Dump boostrap log file if bootstrapping fails.
+
+ -- Steve M. Robbins <smr at debian.org>  Thu, 11 Aug 2011 22:46:29 -0500
+
 boost1.46 (1.46.1-6) unstable; urgency=low
 
   * control(libboost-mpi-python1.46.1, libboost-python1.46.1): Suggests a

Modified: boost/trunk/debian/control
===================================================================
--- boost/trunk/debian/control	2011-06-12 06:47:34 UTC (rev 14652)
+++ boost/trunk/debian/control	2011-08-12 03:47:01 UTC (rev 14653)
@@ -260,7 +260,7 @@
 Description: Boost.Iostreams Library
  This package forms part of the Boost C++ Libraries collection.
  .
- Boost.Iostreams are a collection of concepts and set of templates
+ Boost.Iostreams are a collection of concepts and a set of templates
  which turn models of these concepts into C++ standard library streams
  and stream buffers.
 
@@ -276,7 +276,7 @@
 Description: Boost.Iostreams Library development files
  This package forms part of the Boost C++ Libraries collection.
  .
- Boost.Iostreams are a collection of concepts and set of templates
+ Boost.Iostreams are a collection of concepts and a set of templates
  which turn models of these concepts into C++ standard library streams
  and stream buffers.
 

Modified: boost/trunk/debian/rules
===================================================================
--- boost/trunk/debian/rules	2011-06-12 06:47:34 UTC (rev 14652)
+++ boost/trunk/debian/rules	2011-08-12 03:47:01 UTC (rev 14653)
@@ -161,7 +161,8 @@
 JAM = $(bjam) $(JOBS) -d2 $(JAM_OPT) --layout=system --ignore-site-config --user-config=$(CURDIR)/user-config.jam debug-symbols=on
 
 $(bjam):
-	./bootstrap.sh --with-icu --prefix=$(CURDIR)/debian/tmp/usr
+	./bootstrap.sh --with-icu --prefix=$(CURDIR)/debian/tmp/usr \
+	  || cat bootstrap.log
 
 debian/bjam.1: $(bjam)
 	help2man --name 'software build tool' --no-info ./bjam > $@