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

[smr at alioth.debian.org]

Author: smr
Date: 2008-11-09 21:51:00 +0000 (Sun, 09 Nov 2008)
New Revision: 14309

Modified:
   boost/trunk/debian/changelog
   boost/trunk/debian/compat
   boost/trunk/debian/control
   boost/trunk/debian/rules
Log:
Merge CL 14308 from branches/1.36.0: Fix symbol generation for -dbg.

Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog	2008-11-09 21:26:09 UTC (rev 14308)
+++ boost/trunk/debian/changelog	2008-11-09 21:51:00 UTC (rev 14309)
@@ -18,8 +18,15 @@
   * rtupdate: Test for link target existence, since we no longer build
     single-threaded libraries.
 
- -- Steve M. Robbins <smr at debian.org>  Sun, 09 Nov 2008 11:01:40 -0600
+  * debian/rules: Include debug symbols in libboost-dbg.  Thanks for Tim
+    Ansell for the patch.  Closes: #495812.
 
+  * control: Increase build-dep to debhelper >= 7.
+  * compat: Set to level 7.  Level 4 or better required for debug
+    symbols fix.
+
+ -- Steve M. Robbins <smr at debian.org>  Sun, 09 Nov 2008 15:46:50 -0600
+
 boost1.36 (1.36.0-2) unstable; urgency=low
 
   * debian/patches/endian.patch: New.  Include <endian.h> unconditionally

Modified: boost/trunk/debian/compat
===================================================================
--- boost/trunk/debian/compat	2008-11-09 21:26:09 UTC (rev 14308)
+++ boost/trunk/debian/compat	2008-11-09 21:51:00 UTC (rev 14309)
@@ -1 +1 @@
-4
+7

Modified: boost/trunk/debian/control
===================================================================
--- boost/trunk/debian/control	2008-11-09 21:26:09 UTC (rev 14308)
+++ boost/trunk/debian/control	2008-11-09 21:51:00 UTC (rev 14309)
@@ -4,7 +4,7 @@
 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>, Christophe Prud'homme <prudhomm at debian.org>
-Build-Depends: debhelper (>= 6.0.7), quilt, bison, flex, docbook-to-man, xsltproc, doxygen, zlib1g-dev, libbz2-dev, libicu-dev, python-all-dev, python-support (>= 0.6)
+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)
 XS-Python-Version: 2.4, 2.5
 Standards-Version: 3.8.0
 

Modified: boost/trunk/debian/rules
===================================================================
--- boost/trunk/debian/rules	2008-11-09 21:26:09 UTC (rev 14308)
+++ boost/trunk/debian/rules	2008-11-09 21:51:00 UTC (rev 14309)
@@ -147,7 +147,7 @@
 bjam = $(CURDIR)/tools/jam/src/bjam
 
 # FIXME: find a flag to disable reading /etc/site-config.jam
-JAM = $(bjam) $(JOBS) -d2 --user-config=$(CURDIR)/user-config.jam -sHAVE_ICU=1
+JAM = $(bjam) $(JOBS) -d2 --user-config=$(CURDIR)/user-config.jam -sHAVE_ICU=1 debug-symbols=on
 jam_variants = variant=release,debug threading=multi link=shared,static
 
 $(bjam):
@@ -402,7 +402,7 @@
 	dh_installinfo
 	dh_installchangelogs
 	dh_lintian
-	dh_strip -Nlibboost-dbg
+	dh_strip --dbg-package=libboost-dbg -X"-d-"
 	dh_link
 	dh_compress -Xlibboost$(PKGVERSION)-doc/HTML
 	dh_pysupport