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

Wed Aug 8 07:09:53 UTC 2007

Author: cavok
Date: 2007-08-08 07:09:52 +0000 (Wed, 08 Aug 2007)
New Revision: 14119

Modified:
   boost/trunk/debian/changelog
   boost/trunk/debian/control
   boost/trunk/debian/rules
Log:
restored libboost-dbg. fixed #436446. bjam is always built using gcc 4.1.

Modified: boost/trunk/debian/changelog
===================================================================

--- boost/trunk/debian/changelog	2007-08-08 01:26:57 UTC (rev 14118)
+++ boost/trunk/debian/changelog	2007-08-08 07:09:52 UTC (rev 14119)
@@ -1,3 +1,12 @@
+boost (1.34.1-2) experimental; urgency=low
+
+  * Fixed gcc 4.1 vs. gcc 4.2 confusion on hppa (closes: #436446).
+  * Debug libraries and their symlinks are back in libboost-dbg.
+  * bjam is built using gcc 4.1 also in the case it is not the default
+    gcc version.
+
+ -- Domenico Andreoli <cavok at debian.org>  Wed, 08 Aug 2007 00:08:15 +0200
+
 boost (1.34.1-1) experimental; urgency=low
 
   * New upstream release (closes: #436091).

Modified: boost/trunk/debian/control
===================================================================
--- boost/trunk/debian/control	2007-08-08 01:26:57 UTC (rev 14118)
+++ boost/trunk/debian/control	2007-08-08 07:09:52 UTC (rev 14119)
@@ -23,6 +23,20 @@
  .
   Homepage: http://www.boost.org/tools/bcp/bcp.html
 
+Package: libboost-dbg
+Architecture: any
+Section: libdevel
+Priority: extra
+Depends: ${shlibs:Depends}
+Suggests: libboost-dev
+Description: Boost C++ Libraries with debug symbols
+ Part of the Boost C++ Libraries collection.
+ .
+ These libraries are built with debug symbols. They are useful to debug
+ programs which use Boost. These must be used also at build/link time.
+ .
+  Homepage: http://www.boost.org/
+
 Package: libboost-dev
 Architecture: any
 Section: libdevel
@@ -65,7 +79,6 @@
 Package: libboost-date-time1.34.1
 Architecture: any
 Section: libs
-Replaces: libboost-dbg
 Depends: ${shlibs:Depends}
 Description: set of date-time libraries based on generic programming concepts
  Part of the Boost C++ Libraries collection.
@@ -91,7 +104,6 @@
 Package: libboost-filesystem1.34.1
 Architecture: any
 Section: libs
-Replaces: libboost-dbg
 Depends: ${shlibs:Depends}
 Description: filesystem operations (portable paths, iteration over directories, etc) in C++
  Part of the Boost C++ Libraries collection.
@@ -119,7 +131,6 @@
 Package: libboost-graph1.34.1
 Architecture: any
 Section: libs
-Replaces: libboost-dbg
 Depends: ${shlibs:Depends}
 Suggests: graphviz
 Description: generic graph components and algorithms in C++
@@ -152,7 +163,6 @@
 Package: libboost-iostreams1.34.1
 Architecture: any
 Section: libs
-Replaces: libboost-dbg
 Depends: ${shlibs:Depends}
 Description: Boost.Iostreams Library
  Part of the Boost C++ Libraries collection.
@@ -180,7 +190,6 @@
 Package: libboost-program-options1.34.1
 Architecture: any
 Section: libs
-Replaces: libboost-dbg
 Depends: ${shlibs:Depends}
 Description: program options library for C++
  Part of the Boost C++ Libraries collection.
@@ -207,7 +216,6 @@
 Package: libboost-python1.34.1
 Architecture: any
 Section: python
-Replaces: libboost-dbg
 Depends: ${shlibs:Depends}
 Description: Boost.Python Library 
  Part of the Boost C++ Libraries collection.
@@ -249,7 +257,6 @@
 Package: libboost-regex1.34.1
 Architecture: any
 Section: libs
-Replaces: libboost-dbg
 Depends: ${shlibs:Depends}
 Description: regular expression library for C++
  Part of the Boost C++ Libraries collection.
@@ -290,7 +297,6 @@
 Package: libboost-serialization1.34.1
 Architecture: any
 Section: libs
-Replaces: libboost-dbg
 Depends: ${shlibs:Depends}
 Description: serialization library for C++
  This is a partial list of provided functionalities:
@@ -332,7 +338,6 @@
 Package: libboost-signals1.34.1
 Architecture: any
 Section: libs
-Replaces: libboost-dbg
 Depends: ${shlibs:Depends}
 Description: managed signals and slots library for C++
  Part of the Boost C++ Libraries collection.
@@ -363,7 +368,6 @@
 Package: libboost-test1.34.1
 Architecture: any
 Section: libs
-Replaces: libboost-dbg
 Depends: ${shlibs:Depends}
 Description: components for writing and executing test suites
  Part of the Boost C++ Libraries collection.  The library contains
@@ -393,7 +397,6 @@
 Package: libboost-thread1.34.1
 Architecture: any
 Section: libs
-Replaces: libboost-dbg
 Depends: ${shlibs:Depends}
 Description: portable C++ multi-threading
  Part of the Boost C++ Libraries collection.
@@ -423,7 +426,6 @@
 Package: libboost-wave1.34.1
 Architecture: any
 Section: libs
-Replaces: libboost-dbg
 Depends: ${shlibs:Depends}
 Description: C99/C++ preprocessor library
  Part of the Boost C++ Libraries collection.

Modified: boost/trunk/debian/rules
===================================================================
--- boost/trunk/debian/rules	2007-08-08 01:26:57 UTC (rev 14118)
+++ boost/trunk/debian/rules	2007-08-08 07:09:52 UTC (rev 14119)
@@ -37,12 +37,18 @@
 mk_base_name = usr/lib/libboost_$(subst -,_,$(1))$(2)
 mk_full_name = usr/lib/libboost_$(subst -,_,$(1))-$(gcc_version)$(2)-$(boost_version)
 
+# helpers to make proper release/debug package names
+mk_pkg_lib = libboost-$(if $(findstring -d,$(2)),dbg,$(1)$(SOVERSION)$(DEBIAN_SUFFIX))
+mk_pkg_dev = libboost-$(if $(findstring -d,$(2)),dbg,$(1)-dev)
+mk_deb_lib = debian/$(call mk_pkg_lib,$(1),$(2))
+mk_deb_dev = debian/$(call mk_pkg_dev,$(1),$(2))
+
 # helpers with the side effect of writing debhelper files
-mk_a_files = $(shell echo $(call mk_full_name,$(2),$(3)).a >> debian/libboost-$(1)-dev.install)
-mk_so_files = $(shell echo $(call mk_full_name,$(2),$(3)).so.$(SOVERSION) >> debian/libboost-$(1)$(SOVERSION)$(DEBIAN_SUFFIX).install)
-mk_ln_files = $(shell echo $(call mk_full_name,$(2),$(3)).so.$(SOVERSION) $(call mk_full_name,$(2),$(3)).so >> debian/libboost-$(1)-dev.links)
-mk_ln2_files = $(shell echo $(call mk_full_name,$(2),$(3)).so $(call mk_base_name,$(2),$(3)).so >> debian/libboost-$(1)-dev.links)
-mk_ln3_files = $(shell echo $(call mk_full_name,$(2),$(3)).a $(call mk_base_name,$(2),$(3)).a >> debian/libboost-$(1)-dev.links)
+mk_a_files = $(shell echo $(call mk_full_name,$(2),$(3)).a >> $(call mk_deb_dev,$(1),$(3)).install)
+mk_so_files = $(shell echo $(call mk_full_name,$(2),$(3)).so.$(SOVERSION) >> $(call mk_deb_lib,$(1),$(3)).install)
+mk_ln_files = $(shell echo $(call mk_full_name,$(2),$(3)).so.$(SOVERSION) $(call mk_full_name,$(2),$(3)).so >> $(call mk_deb_dev,$(1),$(3)).links)
+mk_ln2_files = $(shell echo $(call mk_full_name,$(2),$(3)).so $(call mk_base_name,$(2),$(3)).so >> $(call mk_deb_dev,$(1),$(3)).links)
+mk_ln3_files = $(shell echo $(call mk_full_name,$(2),$(3)).a $(call mk_base_name,$(2),$(3)).a >> $(call mk_deb_dev,$(1),$(3)).links)
 mk_files = $(foreach fn,a so ln ln2 ln3,$(call mk_$(fn)_files,$(1),$(2),$(3)))
 
 # invokes mk_files of every variant of every shared library of every Boost library
@@ -109,6 +115,8 @@
 	rm -rf debian/libboost-*$(SOVERSION).install
 	rm -rf debian/libboost-*-dev.install
 	rm -rf debian/libboost-*-dev.links
+	rm -rf debian/libboost-dbg.install
+	rm -rf debian/libboost-dbg.links
 
 	dh_clean
 
@@ -136,6 +144,12 @@
 	dh_install -pbcp dist/bin/bcp usr/bin
 	dh_installman -pbcp debian/bcp.1
 
+	# package libboost-dbg
+	dh_install --sourcedir=debian/tmp -plibboost-dbg
+	dh_link -plibboost-dbg \
+	   usr/lib/libboost_thread-mt-d.a usr/lib/libboost_thread-d.a \
+	   usr/lib/libboost_thread-mt-d.so usr/lib/libboost_thread-d.so
+
 	# package libboost-dev
 	dh_install -plibboost-dev \
 	   debian/tmp/usr/include/boost-$(boost_version)/boost \
@@ -145,7 +159,6 @@
 	   debian/libboost-dev.lintian-overrides \
 	   usr/share/lintian/overrides/libboost-dev
 
-
 	# package libboost-doc
 	rm -rf $(htmldir)
 	mkdir -p $(htmldir) $(htmldir)/more/css_0
@@ -267,8 +280,8 @@
 	   debian/libboost-thread-dev/usr/include/boost
 	dh_install --sourcedir=debian/tmp -plibboost-thread-dev
 	dh_link -plibboost-thread-dev \
-	   usr/lib/libboost_thread-mt.so usr/lib/libboost_thread.so \
-	   usr/lib/libboost_thread-mt-d.so usr/lib/libboost_thread-d.so
+	   usr/lib/libboost_thread-mt.a usr/lib/libboost_thread.a \
+	   usr/lib/libboost_thread-mt.so usr/lib/libboost_thread.so
 
 	# package libboost-wave$(SOVERSION)
 	dh_install --sourcedir=debian/tmp -plibboost-wave$(SOVERSION)$(DEBIAN_SUFFIX)


