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

Christophe Prudhomme prudhomm at costa.debian.org
Mon Nov 21 06:08:15 UTC 2005


Author: prudhomm
Date: 2005-11-21 06:08:14 +0000 (Mon, 21 Nov 2005)
New Revision: 13891

Modified:
   boost/trunk/debian/changelog
   boost/trunk/debian/control
   boost/trunk/debian/rules
Log:
update Depends for libboost*-dev and Conflicts/Replaces with libboost*

Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog	2005-11-20 23:09:52 UTC (rev 13890)
+++ boost/trunk/debian/changelog	2005-11-21 06:08:14 UTC (rev 13891)
@@ -1,8 +1,9 @@
 boost (1.33.0-4) unstable; urgency=low
 
-  * debian/control: renamed DSO packages to '*c2a'.  Closes: #339154.
+  * debian/control, debian/rulles: renamed DSO packages to '*c2a'.
+    Closes: #339154.
 
- -- Domenico Andreoli <cavok at debian.org>  Sat, 19 Nov 2005 15:55:50 +0100
+ -- Christophe Prud'homme <prudhomm at debian.org>  Mon, 21 Nov 2005 07:05:58 +0100
 
 boost (1.33.0-3) unstable; urgency=low
 

Modified: boost/trunk/debian/control
===================================================================
--- boost/trunk/debian/control	2005-11-20 23:09:52 UTC (rev 13890)
+++ boost/trunk/debian/control	2005-11-21 06:08:14 UTC (rev 13891)
@@ -79,6 +79,8 @@
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
+Conflicts: libboost-date-time1.33.0
+Replaces: libboost-date-time1.33.0
 Description: set of date-time libraries based on generic programming concepts
  Part of the Boost C++ Libraries collection.
  .
@@ -90,7 +92,7 @@
 Package: libboost-date-time-dev
 Architecture: any
 Section: libdevel
-Depends: libboost-dev (=${Source-Version}), libboost-date-time1.33.0 (=${Source-Version})
+Depends: libboost-dev (=${Source-Version}), libboost-date-time1.33.0c2a (=${Source-Version})
 Replaces: libboost-dev (<< 1.30.0-1)
 Description: set of date-time libraries based on generic programming concepts
  Part of the Boost C++ Libraries collection.
@@ -104,6 +106,8 @@
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
+Conflicts: libboost-filesystem1.33.0
+Replaces: libboost-filesystem1.33.0
 Description: filesystem operations (portable paths, iteration over directories, etc) in C++
  Part of the Boost C++ Libraries collection.
  .
@@ -116,7 +120,7 @@
 Package: libboost-filesystem-dev
 Architecture: any
 Section: libdevel
-Depends: libboost-dev (=${Source-Version}), libboost-filesystem1.33.0 (=${Source-Version})
+Depends: libboost-dev (=${Source-Version}), libboost-filesystem1.33.0c2a (=${Source-Version})
 Replaces: libboost-dev (<< 1.31.0-1)
 Description: filesystem operations (portable paths, iteration over directories, etc) in C++
  Part of the Boost C++ Libraries collection.
@@ -132,6 +136,8 @@
 Section: libs
 Depends: ${shlibs:Depends}
 Suggests: graphviz
+Conflicts: libboost-graph1.33.0
+Replaces: libboost-graph1.33.0
 Description: generic graph components and algorithms in C++
  Part of the Boost C++ Libraries collection.
  .
@@ -147,7 +153,7 @@
 Architecture: any
 Section: libdevel
 Depends: libboost-dev (=${Source-Version})
-Recommends: libboost-graph1.33.0 (=${Source-Version})
+Recommends: libboost-graph1.33.0c2a (=${Source-Version})
 Description: generic graph components and algorithms in C++
  Part of the Boost C++ Libraries collection.
  .
@@ -163,6 +169,8 @@
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
+Conflicts: libboost-iostreams1.33.0
+Replaces: libboost-iostreams1.33.0
 Description: Boost.Iostreams Library
  Part of the Boost C++ Libraries collection.
  .
@@ -175,7 +183,7 @@
 Package: libboost-iostreams-dev
 Architecture: any
 Section: libdevel
-Depends: libboost-dev (=${Source-Version}), libboost-iostreams1.33.0 (=${Source-Version})
+Depends: libboost-dev (=${Source-Version}), libboost-iostreams1.33.0c2a (=${Source-Version})
 Replaces: libboost-dev (<< 1.33.0-2)
 Description: Boost.Iostreams Library development files
  Part of the Boost C++ Libraries collection.
@@ -190,6 +198,8 @@
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
+Conflicts: libboost-program-options1.33.0
+Replaces: libboost-program-options1.33.0
 Description: program options library for C++
  Part of the Boost C++ Libraries collection.
  .
@@ -202,7 +212,7 @@
 Package: libboost-program-options-dev
 Architecture: any
 Section: libdevel
-Depends: libboost-dev (= ${Source-Version}), libboost-program-options1.33.0 (= ${Source-Version})
+Depends: libboost-dev (= ${Source-Version}), libboost-program-options1.33.0c2a (= ${Source-Version})
 Description: program options library for C++
  Part of the Boost C++ Libraries collection.
  .
@@ -216,6 +226,8 @@
 Architecture: any
 Section: python
 Depends: ${shlibs:Depends}
+Conflicts: libboost-python1.33.0
+Replaces: libboost-python1.33.0
 Description: Boost.Python Library 
  Part of the Boost C++ Libraries collection.
  .
@@ -235,7 +247,7 @@
 Package: libboost-python-dev
 Architecture: any
 Section: libdevel
-Depends: libboost-dev (=${Source-Version}), libboost-python1.33.0 (=${Source-Version}), python2.3-dev
+Depends: libboost-dev (=${Source-Version}), libboost-python1.33.0c2a (=${Source-Version}), python2.3-dev
 Replaces: libboost-dev (<< 1.31.0-3)
 Description: Boost.Python Library development files
  Part of the Boost C++ Libraries collection.
@@ -257,6 +269,8 @@
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
+Conflicts: libboost-regex1.33.0
+Replaces: libboost-regex1.33.0
 Description: regular expression library for C++
  Part of the Boost C++ Libraries collection.
  .
@@ -276,7 +290,7 @@
 Package: libboost-regex-dev
 Architecture: any
 Section: libdevel
-Depends: libboost-dev (= ${Source-Version}), libboost-regex1.33.0 (= ${Source-Version}), libicu34-dev
+Depends: libboost-dev (= ${Source-Version}), libboost-regex1.33.0c2a (= ${Source-Version}), libicu34-dev
 Description: regular expression library for C++
  Part of the Boost C++ Libraries collection.
  .
@@ -318,6 +332,8 @@
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
+Conflicts: libboost-signals1.33.0
+Replaces: libboost-signals1.33.0
 Description: managed signals and slots library for C++
  Part of the Boost C++ Libraries collection.
  .
@@ -332,7 +348,7 @@
 Package: libboost-signals-dev
 Architecture: any
 Section: libdevel
-Depends: libboost-dev (= ${Source-Version}), libboost-signals1.33.0 (= ${Source-Version})
+Depends: libboost-dev (= ${Source-Version}), libboost-signals1.33.0c2a (= ${Source-Version})
 Description: managed signals and slots library for C++
  Part of the Boost C++ Libraries collection.
  .
@@ -348,6 +364,8 @@
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
+Conflicts: libboost-test1.33.0
+Replaces: libboost-test1.33.0
 Description: components for writing and executing test suites
  Part of the Boost C++ Libraries collection.  The library contains
  several components.
@@ -361,7 +379,7 @@
 Package: libboost-test-dev
 Architecture: any
 Section: libdevel
-Depends: libboost-dev (= ${Source-Version}), libboost-test1.33.0 (= ${Source-Version})
+Depends: libboost-dev (= ${Source-Version}), libboost-test1.33.0c2a (= ${Source-Version})
 Replaces: libboost-dev (<< 1.30.0-1)
 Description: components for writing and executing test suites
  Part of the Boost C++ Libraries collection.  The library contains
@@ -377,6 +395,8 @@
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}
+Conflicts: libboost-thread1.33.0
+Replaces: libboost-thread1.33.0
 Description: portable C++ multi-threading
  Part of the Boost C++ Libraries collection.
  .
@@ -390,7 +410,7 @@
 Package: libboost-thread-dev
 Architecture: any
 Section: libdevel
-Depends: libboost-dev (= ${Source-Version}), libboost-thread1.33.0 (= ${Source-Version})
+Depends: libboost-dev (= ${Source-Version}), libboost-thread1.33.0c2a (= ${Source-Version})
 Replaces: libboost-dev (<< 1.30.0-1)
 Description: portable C++ multi-threading
  Part of the Boost C++ Libraries collection.

Modified: boost/trunk/debian/rules
===================================================================
--- boost/trunk/debian/rules	2005-11-20 23:09:52 UTC (rev 13890)
+++ boost/trunk/debian/rules	2005-11-21 06:08:14 UTC (rev 13891)
@@ -25,6 +25,7 @@
 # Boost does not guarantee any ABI, it uses the full version in SONAME
 #
 SOVERSION = 1.33.0
+DEBIAN_SUFFIX = c2a
 
 DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
@@ -158,11 +159,11 @@
 
 
 	# package libboost-date-time$(SOVERSION)
-	dh_install -plibboost-date-time$(SOVERSION) --autodest \
+	dh_install -plibboost-date-time$(SOVERSION)$(DEBIAN_SUFFIX) --autodest \
 	   debian/tmp/usr/lib/libboost_date_time$(release_suffix).so.$(SOVERSION)
 	dh_install -plibboost-dbg --autodest \
 	   debian/tmp/usr/lib/libboost_date_time$(debug_suffix).so.$(SOVERSION)
-	dh_install -plibboost-date-time$(SOVERSION) --autodest \
+	dh_install -plibboost-date-time$(SOVERSION)$(DEBIAN_SUFFIX) --autodest \
 	   debian/tmp/usr/lib/libboost_date_time$(release_suffix_st).so.$(SOVERSION)
 	dh_install -plibboost-dbg --autodest \
 	   debian/tmp/usr/lib/libboost_date_time$(debug_suffix_st).so.$(SOVERSION)
@@ -187,11 +188,11 @@
 
 
 	# package libboost-filesystem$(SOVERSION)
-	dh_install -plibboost-filesystem$(SOVERSION) --autodest \
+	dh_install -plibboost-filesystem$(SOVERSION)$(DEBIAN_SUFFIX) --autodest \
 	   debian/tmp/usr/lib/libboost_filesystem$(release_suffix).so.$(SOVERSION)
 	dh_install -plibboost-dbg --autodest \
 	   debian/tmp/usr/lib/libboost_filesystem$(debug_suffix).so.$(SOVERSION)
-	dh_install -plibboost-filesystem$(SOVERSION) --autodest \
+	dh_install -plibboost-filesystem$(SOVERSION)$(DEBIAN_SUFFIX) --autodest \
 	   debian/tmp/usr/lib/libboost_filesystem$(release_suffix_st).so.$(SOVERSION)
 	dh_install -plibboost-dbg --autodest \
 	   debian/tmp/usr/lib/libboost_filesystem$(debug_suffix_st).so.$(SOVERSION)
@@ -216,7 +217,7 @@
 
 
 	# package libboost-graph$(SOVERSION)
-	dh_install -plibboost-graph$(SOVERSION) \
+	dh_install -plibboost-graph$(SOVERSION)$(DEBIAN_SUFFIX) \
 	   libs/graph/src/libbgl-viz.so.$(SOVERSION) \
 	   usr/lib
 	dh_install -plibboost-dbg \
@@ -234,7 +235,7 @@
 
 
 	# package libboost-iostreams$(SOVERSION)
-	dh_install -plibboost-iostreams$(SOVERSION) --autodest \
+	dh_install -plibboost-iostreams$(SOVERSION)$(DEBIAN_SUFFIX) --autodest \
 	   debian/tmp/usr/lib/libboost_iostreams$(release_suffix).so.$(SOVERSION)
 	dh_install -plibboost-dbg --autodest \
 	   debian/tmp/usr/lib/libboost_iostreams$(debug_suffix).so.$(SOVERSION)
@@ -254,11 +255,11 @@
 
 
 	# package libboost-program-options$(SOVERSION)
-	dh_install -plibboost-program-options$(SOVERSION) --autodest \
+	dh_install -plibboost-program-options$(SOVERSION)$(DEBIAN_SUFFIX) --autodest \
 	   debian/tmp/usr/lib/libboost_program_options$(release_suffix).so.$(SOVERSION)
 	dh_install -plibboost-dbg --autodest \
 	   debian/tmp/usr/lib/libboost_program_options$(debug_suffix).so.$(SOVERSION)
-	dh_install -plibboost-program-options$(SOVERSION) --autodest \
+	dh_install -plibboost-program-options$(SOVERSION)$(DEBIAN_SUFFIX) --autodest \
 	   debian/tmp/usr/lib/libboost_program_options$(release_suffix_st).so.$(SOVERSION)
 	dh_install -plibboost-dbg --autodest \
 	   debian/tmp/usr/lib/libboost_program_options$(debug_suffix_st).so.$(SOVERSION)
@@ -283,9 +284,9 @@
 
 
 	# package libboost-python$(SOVERSION)
-	dh_install -plibboost-python$(SOVERSION) --autodest \
+	dh_install -plibboost-python$(SOVERSION)$(DEBIAN_SUFFIX) --autodest \
 	   debian/tmp/usr/lib/libboost_python$(release_suffix_st).so.$(SOVERSION)
-	dh_install -plibboost-python$(SOVERSION) --autodest \
+	dh_install -plibboost-python$(SOVERSION)$(DEBIAN_SUFFIX) --autodest \
 	   debian/tmp/usr/lib/libboost_python$(release_suffix).so.$(SOVERSION)
 	mkdir -p debian/libboost-python$(SOVERSION)/usr/share/lintian/overrides
 	install -m644 \
@@ -317,11 +318,11 @@
 
 
 	# package libboost-regex$(SOVERSION)
-	dh_install -plibboost-regex$(SOVERSION) --autodest \
+	dh_install -plibboost-regex$(SOVERSION)$(DEBIAN_SUFFIX) --autodest \
 	   debian/tmp/usr/lib/libboost_regex$(release_suffix).so.$(SOVERSION)
 	dh_install -plibboost-dbg --autodest \
 	   debian/tmp/usr/lib/libboost_regex$(debug_suffix).so.$(SOVERSION)
-	dh_install -plibboost-regex$(SOVERSION) --autodest \
+	dh_install -plibboost-regex$(SOVERSION)$(DEBIAN_SUFFIX) --autodest \
 	   debian/tmp/usr/lib/libboost_regex$(release_suffix_st).so.$(SOVERSION)
 	dh_install -plibboost-dbg --autodest \
 	   debian/tmp/usr/lib/libboost_regex$(debug_suffix_st).so.$(SOVERSION)
@@ -361,11 +362,11 @@
 
 
 	# package libboost-signals$(SOVERSION)
-	dh_install -plibboost-signals$(SOVERSION) --autodest \
+	dh_install -plibboost-signals$(SOVERSION)$(DEBIAN_SUFFIX) --autodest \
 	   debian/tmp/usr/lib/libboost_signals$(release_suffix).so.$(SOVERSION)
 	dh_install -plibboost-dbg --autodest \
 	   debian/tmp/usr/lib/libboost_signals$(debug_suffix).so.$(SOVERSION)
-	dh_install -plibboost-signals$(SOVERSION) --autodest \
+	dh_install -plibboost-signals$(SOVERSION)$(DEBIAN_SUFFIX) --autodest \
 	   debian/tmp/usr/lib/libboost_signals$(release_suffix_st).so.$(SOVERSION)
 	dh_install -plibboost-dbg --autodest \
 	   debian/tmp/usr/lib/libboost_signals$(debug_suffix_st).so.$(SOVERSION)
@@ -390,7 +391,7 @@
 
 
 	# package libboost-test$(SOVERSION)
-	dh_install -plibboost-test$(SOVERSION) --autodest \
+	dh_install -plibboost-test$(SOVERSION)$(DEBIAN_SUFFIX) --autodest \
 	   debian/tmp/usr/lib/libboost_prg_exec_monitor$(release_suffix_st).so.$(SOVERSION) \
 	   debian/tmp/usr/lib/libboost_test_exec_monitor$(release_suffix_st).so.$(SOVERSION) \
 	   debian/tmp/usr/lib/libboost_unit_test_framework$(release_suffix_st).so.$(SOVERSION) \
@@ -445,7 +446,7 @@
 
 
 	# package libboost-thread$(SOVERSION)
-	dh_install -plibboost-thread$(SOVERSION) --autodest \
+	dh_install -plibboost-thread$(SOVERSION)$(DEBIAN_SUFFIX) --autodest \
 	   debian/tmp/usr/lib/libboost_thread$(release_suffix).so.$(SOVERSION)
 	dh_install -plibboost-dbg --autodest \
 	   debian/tmp/usr/lib/libboost_thread$(debug_suffix).so.$(SOVERSION)
@@ -492,7 +493,7 @@
 
 	@if [ "$(DH_OPTIONS)" = "-a" ]; then \
 		for name in date-time filesystem graph iostreams program-options python regex signals test thread; do \
-			lib=libboost-$${name}$(SOVERSION); \
+			lib=libboost-$${name}$(SOVERSION)$(DEBIAN_SUFFIX); \
 			shlib="$${lib} (>= 1.33.0-1)"; \
 			echo DH_OPTIONS=-p$${lib} dh_makeshlibs -V"$${shlib}"; \
 			DH_OPTIONS=-p$${lib} dh_makeshlibs -V"$${shlib}"; \




More information about the pkg-boost-commits mailing list