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

smr at alioth.debian.org smr at alioth.debian.org
Sun May 4 16:08:26 UTC 2008


Author: smr
Date: 2008-05-04 16:08:24 +0000 (Sun, 04 May 2008)
New Revision: 14216

Modified:
   boost/trunk/debian/changelog
   boost/trunk/debian/control
   boost/trunk/debian/rules
Log:
Interim checkin.  Packaged with Boost version 1.35 in source and *all* package names.  Still many lintian issues to deal with.

Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog	2008-04-30 06:01:26 UTC (rev 14215)
+++ boost/trunk/debian/changelog	2008-05-04 16:08:24 UTC (rev 14216)
@@ -1,16 +1,21 @@
-boost (1.35.0-1) UNRELEASED; urgency=low
+boost1.35 (1.35.0-1) UNRELEASED; urgency=low
 
   * New upstream version.  Closes: #473752.
     debian/documentation-files: 
     debian/patches: Adjust to new version.
   
+  * debian/control: Substitute 1.34.1 --> 1.35.0 on all library package
+    names.  Change source to boost1.35 so that packages will coexist in
+    archive with 1.34.1 versions.  Add version string to all packages
+    including -dev and -doc.  Add conflicts with previous packages.  Add
+    packages libboost-system1.35.0 and libboost-system1.35-dev.
+
   * debian/patches/library-naming.patch: New.  Remove toolset and boost
     version from library names.
-  
   * debian/rtupdate: Remove logic for links with toolset name.
 
   * debian/rules: Adjust SOVERSION, SHLIBS_VERSION, and boost_version to
-    new version.  
+    new version.  Remove DEBIAN_SUFFIX.
     Add system to boost_libs.  
     Adjust link functions:
       - Create compatibility links with toolset and boost version, rather
@@ -21,9 +26,6 @@
     Don't need to copy more/css_0 to -doc package.  
     Add rules for new system library
 
-  * debian/control: Substitute 1.34.1 --> 1.35.0 on all library package
-    names.  Add packages libboost-system1.35.0 and libboost-system-dev.
-
   * debian/control:
   * debian/rules: Don't build with g++-4.2 explicitly.  Closes: #463288.
   
@@ -32,7 +34,7 @@
     Abstract continuation lines by a single space.  The latter means
     "display verbatim", which is not desired.
   
- -- Steve M. Robbins <smr at debian.org>  Sat, 19 Apr 2008 01:41:37 -0500
+ -- Steve M. Robbins <smr at debian.org>  Sun, 04 May 2008 11:06:39 -0500
 
 boost (1.34.1-11) unstable; urgency=low
 

Modified: boost/trunk/debian/control
===================================================================
--- boost/trunk/debian/control	2008-04-30 06:01:26 UTC (rev 14215)
+++ boost/trunk/debian/control	2008-05-04 16:08:24 UTC (rev 14216)
@@ -1,4 +1,4 @@
-Source: boost
+Source: boost1.35
 Homepage: http://www.boost.org/
 Section: libs
 Priority: optional
@@ -8,11 +8,12 @@
 XS-Python-Version: 2.4, 2.5
 Standards-Version: 3.7.3
 
-Package: bcp
+Package: bcp1.35
 Homepage: http://www.boost.org/tools/bcp/bcp.html
 Architecture: any
 Section: libdevel
-Depends: ${shlibs:Depends}, libboost-dev, libboost-date-time-dev, libboost-filesystem-dev, libboost-graph-dev, libboost-iostreams-dev, libboost-program-options-dev, libboost-python-dev, libboost-regex-dev, libboost-serialization-dev, libboost-signals-dev, libboost-test-dev, libboost-thread-dev, libboost-wave-dev
+Depends: ${shlibs:Depends}, libboost1.35-dev, libboost-date-time1.35-dev, libboost-filesystem1.35-dev, libboost-graph1.35-dev, libboost-iostreams1.35-dev, libboost-program-options1.35-dev, libboost-python1.35-dev, libboost-regex1.35-dev, libboost-serialization1.35-dev, libboost-signals1.35-dev, libboost-test1.35-dev, libboost-thread1.35-dev, libboost-wave1.35-dev
+Conflicts: bcp
 Description: tool for extracting subsets of Boost C++ Libraries
  Part of the Boost C++ Libraries collection.
  .
@@ -24,23 +25,25 @@
  bcp can also report on which parts of Boost your code is dependent on,
  and what licences are used by those dependencies.
 
-Package: libboost-dbg
+Package: libboost1.35-dbg
 Architecture: any
 Section: libdevel
 Priority: extra
 Depends: ${shlibs:Depends}
-Suggests: libboost-dev
+Conflicts: libboost-dbg
+Suggests: libboost1.35-dev (= ${binary:Version})
 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.
 
-Package: libboost-dev
+Package: libboost1.35-dev
 Architecture: any
 Section: libdevel
 Depends: libstdc++-dev, libboost-serialization-dev
-Recommends: libboost-doc, libboost-date-time-dev, libboost-filesystem-dev, libboost-graph-dev, libboost-iostreams-dev, libboost-program-options-dev, libboost-python-dev, libboost-regex-dev, libboost-signals-dev, libboost-test-dev, libboost-thread-dev, libboost-wave-dev
+Recommends: libboost1.35-doc, libboost-date-time1.35-dev, libboost-filesystem1.35-dev, libboost-graph1.35-dev, libboost-iostreams1.35-dev, libboost-program-options1.35-dev, libboost-python1.35-dev, libboost-regex1.35-dev, libboost-signals1.35-dev, libboost-test1.35-dev, libboost-thread1.35-dev, libboost-wave1.35-dev
+Conflicts: libboost-dev
 Description: Boost C++ Libraries development files
  The Boost web site provides free, peer-reviewed, portable C++ source
  libraries. The emphasis is on libraries which work well with the C++
@@ -53,12 +56,11 @@
  For the following subprojects separate packages exist: 
  date-time, filesystem, graph, python, regex, signals, test, and thread.
 
-Package: libboost-doc
+Package: libboost1.35-doc
 Homepage: http://www.boost.org/libs/
 Architecture: all
 Section: doc
-Replaces: libboost-dev (<< 1.27.0-4)
-Suggests: libboost-dev (>= ${source:Version})
+Suggests: libboost1.35-dev (>= ${source:Version})
 Description: Boost.org libraries documentation
  The Boost web site provides free, peer-reviewed, portable C++ source
  libraries. The emphasis is on libraries which work well with the C++
@@ -68,8 +70,8 @@
  already been proposed for inclusion in the C++ Standards Committee's
  upcoming C++ Standard Library Technical Report.
  .
- This is documentation for the libboost-dev package in HTML format.
- Some pages point to header files provided in libboost-dev package,
+ This is documentation for the libboost1.35-dev package in HTML format.
+ Some pages point to header files provided in libboost1.35-dev package,
  so it is suggested to install the latter as well.
 
 Package: libboost-date-time1.35.0
@@ -83,12 +85,12 @@
  These libraries are intended to make programming with dates and times
  almost as simple and natural as programming with strings and integers.
 
-Package: libboost-date-time-dev
+Package: libboost-date-time1.35-dev
 Homepage: http://www.boost.org/libs/date_time/
 Architecture: any
 Section: libdevel
-Depends: libboost-dev (= ${binary:Version}), libboost-date-time1.35.0 (= ${binary:Version})
-Replaces: libboost-dev (<< 1.34.1-1)
+Depends: libboost1.35-dev (= ${binary:Version}), libboost-date-time1.35.0 (= ${binary:Version})
+Conflicts: libboost-date-time-dev
 Description: set of date-time libraries based on generic programming concepts
  Part of the Boost C++ Libraries collection.
  .
@@ -107,12 +109,12 @@
  manipulate paths, files, and directories.  The goal is to
  facilitate portable script-like operations from within C++ programs.
 
-Package: libboost-filesystem-dev
+Package: libboost-filesystem1.35-dev
 Homepage: http://boost.org/libs/filesystem/
 Architecture: any
 Section: libdevel
-Depends: libboost-dev (= ${binary:Version}), libboost-filesystem1.35.0 (= ${binary:Version})
-Replaces: libboost-dev (<< 1.34.0-4)
+Depends: libboost1.35-dev (= ${binary:Version}), libboost-filesystem1.35.0 (= ${binary:Version})
+Conflicts: libboost-filesystem-dev
 Description: filesystem operations (portable paths, iteration over directories, etc) in C++
  Part of the Boost C++ Libraries collection.
  .
@@ -135,12 +137,13 @@
  standardized generic interface for traversing graphs is of utmost
  importance to encourage reuse of graph algorithms and data structures.
 
-Package: libboost-graph-dev
+Package: libboost-graph1.35-dev
 Homepage: http://www.boost.org/libs/graph/
 Architecture: any
 Section: libdevel
-Depends: libboost-dev (= ${binary:Version})
+Depends: libboost1.35-dev (= ${binary:Version})
 Recommends: libboost-graph1.35.0 (= ${binary:Version})
+Conflicts: libboost-graph-dev
 Description: generic graph components and algorithms in C++
  Part of the Boost C++ Libraries collection.
  .
@@ -162,12 +165,12 @@
  which turn models of these concepts into C++ standard library streams
  and stream buffers.
 
-Package: libboost-iostreams-dev
+Package: libboost-iostreams1.35-dev
 Homepage: http://www.boost.org/libs/iostreams/
 Architecture: any
 Section: libdevel
-Depends: libboost-dev (= ${binary:Version}), libboost-iostreams1.35.0 (= ${binary:Version})
-Replaces: libboost-dev (<< 1.33.0-2)
+Depends: libboost1.35-dev (= ${binary:Version}), libboost-iostreams1.35.0 (= ${binary:Version})
+Conflicts: libboost-iostreams-dev
 Description: Boost.Iostreams Library development files
  Part of the Boost C++ Libraries collection.
  .
@@ -187,11 +190,12 @@
  (name, value) pairs from the user, via conventional methods such as
  command line and config file.
 
-Package: libboost-program-options-dev
+Package: libboost-program-options1.35-dev
 Homepage: http://www.boost.org/libs/program_options/
 Architecture: any
 Section: libdevel
-Depends: libboost-dev (= ${binary:Version}), libboost-program-options1.35.0 (= ${binary:Version})
+Depends: libboost1.35-dev (= ${binary:Version}), libboost-program-options1.35.0 (= ${binary:Version})
+Conflicts: libboost-program-options-dev
 Description: program options library for C++
  Part of the Boost C++ Libraries collection.
  .
@@ -218,12 +222,12 @@
  in Python, Member function Overloading, Automatic wrapping of
  numeric operators among others.
 
-Package: libboost-python-dev
+Package: libboost-python1.35-dev
 Homepage: http://www.boost.org/libs/python/
 Architecture: any
 Section: libdevel
-Depends: libboost-dev (= ${binary:Version}), libboost-python1.35.0 (= ${binary:Version}), python-dev
-Replaces: libboost-dev (<< 1.31.0-3)
+Depends: libboost1.35-dev (= ${binary:Version}), libboost-python1.35.0 (= ${binary:Version}), python-dev
+Conflicts: libboost-python-dev
 Description: Boost.Python Library development files
  Part of the Boost C++ Libraries collection.
  .
@@ -261,11 +265,12 @@
  manner analogous to either sed or perl), something that traditional C
  libraries can not do.
 
-Package: libboost-regex-dev
+Package: libboost-regex1.35-dev
 Homepage: http://www.boost.org/libs/regex/
 Architecture: any
 Section: libdevel
-Depends: libboost-dev (= ${binary:Version}), libboost-regex1.35.0 (= ${binary:Version}), libicu-dev
+Depends: libboost1.35-dev (= ${binary:Version}), libboost-regex1.35.0 (= ${binary:Version}), libicu-dev
+Conflicts: libboost-regex-dev
 Description: regular expression library for C++
  Part of the Boost C++ Libraries collection.
  .
@@ -299,12 +304,12 @@
  C++ data structures to a sequence of bytes.
  archive: to refer to a specific rendering of this stream of bytes.
 
-Package: libboost-serialization-dev
+Package: libboost-serialization1.35-dev
 Homepage: http://www.boost.org/libs/serialization/
 Architecture: any
 Section: libdevel
-Depends: libboost-dev (= ${binary:Version}), libboost-serialization1.35.0 (= ${binary:Version})
-Replaces: libboost-dev (<< 1.32.0-5)
+Depends: libboost1.35-dev (= ${binary:Version}), libboost-serialization1.35.0 (= ${binary:Version})
+Conflicts: libboost-serialization-dev
 Description: serialization library for C++
  This is a partial list of provided functionalities:
  .
@@ -333,11 +338,12 @@
  targets or subscribers), which are called when the signal is
  "emitted."
 
-Package: libboost-signals-dev
+Package: libboost-signals1.35-dev
 Homepage: http://www.boost.org/libs/signals/
 Architecture: any
 Section: libdevel
-Depends: libboost-dev (= ${binary:Version}), libboost-signals1.35.0 (= ${binary:Version})
+Depends: libboost1.35-dev (= ${binary:Version}), libboost-signals1.35.0 (= ${binary:Version})
+Conflicts: libboost-signals-dev
 Description: managed signals and slots library for C++
  Part of the Boost C++ Libraries collection.
  .
@@ -363,11 +369,11 @@
  user-defined sources, each error_code and error_condition has an
  associated error_category.
 
-Package: libboost-system-dev
+Package: libboost-system1.35-dev
 Homepage: http://www.boost.org/libs/system/
 Architecture: any
 Section: libdevel
-Depends: libboost-dev (= ${binary:Version}), libboost-system1.35.0 (= ${binary:Version})
+Depends: libboost1.35-dev (= ${binary:Version}), libboost-system1.35.0 (= ${binary:Version})
 Description: Operating system (e.g. diagnostics support) library
  Part of the Boost C++ Libraries collection.
  .
@@ -392,12 +398,12 @@
   * Facilities to monitor program execution and produce error reports.
   * Unit test framework to simplify writing test cases.
 
-Package: libboost-test-dev
+Package: libboost-test1.35-dev
 Homepage: http://www.boost.org/libs/test/
 Architecture: any
 Section: libdevel
-Depends: libboost-dev (= ${binary:Version}), libboost-test1.35.0 (= ${binary:Version})
-Replaces: libboost-dev (<< 1.30.0-1)
+Depends: libboost1.35-dev (= ${binary:Version}), libboost-test1.35.0 (= ${binary:Version})
+Conflicts: libboost-test-dev
 Description: components for writing and executing test suites
  Part of the Boost C++ Libraries collection.  The library contains
  several components.
@@ -419,12 +425,12 @@
  own machine state including program instruction counter and
  registers.
 
-Package: libboost-thread-dev
+Package: libboost-thread1.35-dev
 Homepage: http://www.boost.org/libs/thread/
 Architecture: any
 Section: libdevel
-Depends: libboost-dev (= ${binary:Version}), libboost-thread1.35.0 (= ${binary:Version})
-Replaces: libboost-dev (<< 1.30.0-1)
+Depends: libboost1.35-dev (= ${binary:Version}), libboost-thread1.35.0 (= ${binary:Version})
+Conflicts: libboost-thread-dev
 Description: portable C++ multi-threading
  Part of the Boost C++ Libraries collection.
  .
@@ -446,12 +452,12 @@
  packed behind a simple to use interface, which integrates well with
  the well known idioms of the Standard Template Library (STL).
 
-Package: libboost-wave-dev
+Package: libboost-wave1.35-dev
 Homepage: http://www.boost.org/libs/wave/
 Architecture: any
 Section: libdevel
-Depends: libboost-dev (= ${binary:Version}), libboost-wave1.35.0 (= ${binary:Version}), libboost-filesystem-dev (= ${binary:Version})
-Replaces: libboost-dev (<< 1.33.0-2)
+Depends: libboost1.35-dev (= ${binary:Version}), libboost-wave1.35.0 (= ${binary:Version}), libboost-filesystem1.35-dev (= ${binary:Version})
+Conflicts: libboost-wave-dev
 Description: C99/C++ preprocessor library
  Part of the Boost C++ Libraries collection.
  .
@@ -460,14 +466,15 @@
  packed behind a simple to use interface, which integrates well with
  the well known idioms of the Standard Template Library (STL).
 
-Package: pyste
+Package: pyste1.35
 Homepage: http://www.boost.org/libs/python/pyste/
 Architecture: all
 Section: python
 Provides: ${python:Provides}
 Depends: ${python:Depends}, python-celementtree | python-elementtree, gccxml
 XB-Python-Version: ${python:Versions}
-Suggests: libboost-doc
+Suggests: libboost1.35-doc
+Conflicts: pyste
 Description: Boost.Python code generator
  Part of the Boost C++ Libraries collection.
  .

Modified: boost/trunk/debian/rules
===================================================================
--- boost/trunk/debian/rules	2008-04-30 06:01:26 UTC (rev 14215)
+++ boost/trunk/debian/rules	2008-05-04 16:08:24 UTC (rev 14216)
@@ -12,10 +12,9 @@
 
 DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
-# Boost does not guarantee any ABI, it uses the full version in SONAME
+PKGVERSION = 1.35
 SOVERSION = 1.35.0
 SHLIBS_VERSION = (>= 1.35.0-1)
-DEBIAN_SUFFIX =
 
 # tags for library name decoration
 boost_version = 1_35
@@ -57,8 +56,8 @@
 
 # Input: component, variant
 # Return: package name for shared library or development
-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_pkg_lib = libboost$(if $(findstring -d,$(2)),$(PKGVERSION)-dbg,-$(1)$(SOVERSION))
+mk_pkg_dev = libboost$(if $(findstring -d,$(2)),$(PKGVERSION)-dbg,-$(1)$(PKGVERSION)-dev)
 
 # Helpers to generate debhelper input filenames.
 # Input: component, variant
@@ -76,10 +75,6 @@
 mk_ln2_files = $(shell echo $(call mk_base_name,$(2),$(3),$(4)).so $(call mk_full_name,$(2),$(3),$(4)).so >> $(call mk_deb_dev,$(1),$(3)).links)
 mk_ln3_files = $(shell echo $(call mk_base_name,$(2),$(3),$(4)).a $(call mk_full_name,$(2),$(3),$(4)).a >> $(call mk_deb_dev,$(1),$(3)).links)
 
-# Link shared lib with suffix2 to suffix1
-# Input: component, library, variant, suffix1, suffix2
-mk_ln_suffices = $(shell echo $(call mk_base_name,$(2),$(3),$(4)).so.$(SOVERSION) $(call mk_base_name,$(2),$(3),$(5)).so.$(SOVERSION) >> $(call mk_deb_lib,$(1),$(3)).links)
-
 # Function that updates debhelper files for a given library variant
 # Input: component, library, variant, suffix
 # Output: none
@@ -87,7 +82,9 @@
 
 # helpers to make and install lintian override files
 mk_override_files = echo $(call mk_pkg_lib,$(1)): package-name-doesnt-match-sonames >> $(call mk_ove_lib,$(1));
-ins_lintian_overrides = install -m644 debian/$(1).lintian-overrides debian/$(1)/usr/share/lintian/overrides/$(1);
+ins_lintian_overrides = install -m644 debian/$(1).lintian-overrides debian/$(2)/usr/share/lintian/overrides/$(2);
+cp_debhelper = for s in doc-base examples postinst prerm README.Debian; do \
+	if test -f debian/$(1).$$s; then cp -f debian/$(1).$$s debian/$(2).$$s; fi; done
 
 # Function that updates debhelper files for all library variants shipped.
 mk_debhelper_files = \
@@ -110,16 +107,16 @@
 PYTHON_CONFIG1 = "using python : 2.4 : /usr ;"
 PYTHON_CONFIG2 = "using python : 2.5 : /usr ;"
 
-exampledir = debian/libboost-doc/usr/share/doc/libboost-doc/examples
-htmldir = debian/libboost-doc/usr/share/doc/libboost-doc/HTML
-pyste_prefix = $(CURDIR)/debian/pyste/usr
+exampledir = debian/libboost$(PKGVERSION)-doc/usr/share/doc/libboost$(PKGVERSION)-doc/examples
+htmldir = debian/libboost$(PKGVERSION)-doc/usr/share/doc/libboost$(PKGVERSION)-doc/HTML
+pyste_prefix = $(CURDIR)/debian/pyste$(PKGVERSION)/usr
 bjam = $(CURDIR)/tools/jam/src/bjam
 
 JAM = $(bjam) $(JOBS) -d2 --user-config=$(CURDIR)/user-config.jam -sHAVE_ICU=1
 jam_variants = variant=release,debug threading=single,multi link=shared,static
 
 $(bjam):
-	cd tools/jam/src && sh build.sh cc && mv bin.*/bjam .
+	cd tools/jam/src && CFLAGS=-fno-strict-aliasing sh build.sh cc && mv bin.*/bjam .
 
 build: build-stamp
 build-stamp: $(QUILT_STAMPFN) $(bjam)
@@ -142,13 +139,13 @@
 	touch build-stamp
 
 clean-debhelper:
-	rm -rf debian/libboost-*$(SOVERSION)$(DEBIAN_SUFFIX).lintian-overrides
-	rm -rf debian/libboost-*$(SOVERSION)$(DEBIAN_SUFFIX).install
-	rm -rf debian/libboost-*-dev.install
-	rm -rf debian/libboost-*-dev.links
+	rm -rf debian/libboost-*$(SOVERSION).lintian-overrides
+	rm -rf debian/libboost-*$(SOVERSION).install
+	rm -rf debian/libboost-*$(PKGVERSION)-dev.install
+	rm -rf debian/libboost-*$(PKGVERSION)-dev.links
 	rm -rf debian/libboost-*$(SOVERSION).links
-	rm -rf debian/libboost-dbg.install
-	rm -rf debian/libboost-dbg.links
+	rm -rf debian/libboost$(PKGVERSION)-dbg.install
+	rm -rf debian/libboost$(PKGVERSION)-dbg.links
 
 clean: unpatch clean-debhelper
 	dh_testdir
@@ -174,9 +171,14 @@
 	dh_testroot
 	dh_clean -k
 
+	@$(call cp_debhelper,libboost-dbg,libboost$(PKGVERSION)-dbg)
+	@$(call cp_debhelper,libboost-dev,libboost$(PKGVERSION)-dev)
+	@$(call cp_debhelper,libboost-doc,libboost$(PKGVERSION)-doc)
+	@$(call cp_debhelper,libboost-python-dev,libboost-python$(PKGVERSION)-dev)
+
 	$(JAM) --prefix=$(CURDIR)/debian/tmp/usr $(jam_variants) install
-	install --mode=755 -D debian/rtupdate debian/tmp/usr/share/python/runtime.d/libboost-python-dev.rtupdate
-	install --mode=755 -D debian/rtupdate debian/tmp/usr/share/python/runtime.d/libboost-dbg.rtupdate
+	install --mode=755 -D debian/rtupdate debian/tmp/usr/share/python/runtime.d/libboost-python$(PKGVERSION)-dev.rtupdate
+	install --mode=755 -D debian/rtupdate debian/tmp/usr/share/python/runtime.d/libboost$(PKGVERSION)-dbg.rtupdate
 
 	# Remove undecorated Boost.Python libraries and install decorated ones
 	rm debian/tmp/usr/lib/lib*python*
@@ -194,27 +196,27 @@
 	# package pyste
 	cd libs/python/pyste/install && python setup.py install --no-compile --prefix=$(pyste_prefix) --install-lib=$(pyste_prefix)/share/python-support/pyste
 	mv $(pyste_prefix)/bin/pyste.py $(pyste_prefix)/bin/pyste
-	dh_installman -ppyste debian/pyste.1
+	dh_installman -ppyste$(PKGVERSION) debian/pyste.1
 
 	# package bcp
-	dh_installdirs -pbcp usr/bin
-	dh_install -pbcp dist/bin/bcp usr/bin
-	dh_installman -pbcp debian/bcp.1
+	dh_installdirs -pbcp$(PKGVERSION) usr/bin
+	dh_install -pbcp$(PKGVERSION) dist/bin/bcp usr/bin
+	dh_installman -pbcp$(PKGVERSION) debian/bcp.1
 
 	# package libboost-dbg
-	dh_install -plibboost-dbg
-	dh_install -plibboost-dbg --autodest \
-	   debian/tmp/usr/share/python/runtime.d/libboost-dbg.rtupdate
-	dh_link -plibboost-dbg \
+	dh_install -plibboost$(PKGVERSION)-dbg
+	dh_install -plibboost$(PKGVERSION)-dbg --autodest \
+	   debian/tmp/usr/share/python/runtime.d/libboost$(PKGVERSION)-dbg.rtupdate
+	dh_link -plibboost$(PKGVERSION)-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
-	$(call ins_lintian_overrides,libboost-dbg)
+	$(call ins_lintian_overrides,libboost-dbg,libboost$(PKGVERSION)-dbg)
 
-	# package libboost-dev
-	dh_install -plibboost-dev \
+	# package libboost$(PKGVERSION)-dev
+	dh_install -plibboost$(PKGVERSION)-dev \
 	   debian/tmp/usr/include/boost-$(boost_version)/boost \
 	   usr/include
-	$(call ins_lintian_overrides,libboost-dev)
+	$(call ins_lintian_overrides,libboost-dev,libboost$(PKGVERSION)-dev)
 
 	# package libboost-doc
 	rm -rf $(htmldir)
@@ -222,136 +224,136 @@
 	cat debian/documentation-files | xargs cp --parents --target-directory=$(htmldir)
 	find doc libs -name doc | xargs -n1 cp --archive --target-directory=$(htmldir)
 	rm -rf $(htmldir)/boost
-	dh_link -plibboost-doc \
+	dh_link -plibboost$(PKGVERSION)-doc \
 	   usr/include/boost \
-	   usr/share/doc/libboost-doc/HTML/boost
+	   usr/share/doc/libboost$(PKGVERSION)-doc/HTML/boost
 
 	mkdir -p $(exampledir)
 	cat debian/example-files | xargs cp -a --parents --target-directory=$(exampledir)
 	find $(exampledir) -type f | xargs chmod 644
-	$(call ins_lintian_overrides,libboost-doc)
+	$(call ins_lintian_overrides,libboost-doc,libboost$(PKGVERSION)-doc)
 
 
 	# package libboost-date-time$(SOVERSION)
-	dh_install -plibboost-date-time$(SOVERSION)$(DEBIAN_SUFFIX)
-	# package libboost-date-time-dev
-	dh_installdirs -plibboost-date-time-dev usr/include/boost
-	mv debian/libboost-dev/usr/include/boost/date_time* \
-	   debian/libboost-date-time-dev/usr/include/boost
-	dh_install -plibboost-date-time-dev
-	dh_link -plibboost-date-time-dev
+	dh_install -plibboost-date-time$(SOVERSION)
+	# package libboost-date-time$(PKGVERSION)-dev
+	dh_installdirs -plibboost-date-time$(PKGVERSION)-dev usr/include/boost
+	mv debian/libboost$(PKGVERSION)-dev/usr/include/boost/date_time* \
+	   debian/libboost-date-time$(PKGVERSION)-dev/usr/include/boost
+	dh_install -plibboost-date-time$(PKGVERSION)-dev
+	dh_link -plibboost-date-time$(PKGVERSION)-dev
 
 	# package libboost-filesystem$(SOVERSION)
-	dh_install -plibboost-filesystem$(SOVERSION)$(DEBIAN_SUFFIX)
-	# package libboost-filesystem-dev
-	dh_installdirs -plibboost-filesystem-dev usr/include/boost
-	mv debian/libboost-dev/usr/include/boost/filesystem* \
-	   debian/libboost-filesystem-dev/usr/include/boost
-	dh_install -plibboost-filesystem-dev
-	dh_link -plibboost-filesystem-dev
+	dh_install -plibboost-filesystem$(SOVERSION)
+	# package libboost-filesystem$(PKGVERSION)-dev
+	dh_installdirs -plibboost-filesystem$(PKGVERSION)-dev usr/include/boost
+	mv debian/libboost$(PKGVERSION)-dev/usr/include/boost/filesystem* \
+	   debian/libboost-filesystem$(PKGVERSION)-dev/usr/include/boost
+	dh_install -plibboost-filesystem$(PKGVERSION)-dev
+	dh_link -plibboost-filesystem$(PKGVERSION)-dev
 
 	# package libboost-graph$(SOVERSION)
-	dh_install -plibboost-graph$(SOVERSION)$(DEBIAN_SUFFIX)
-	# package libboost-graph-dev
-	dh_installdirs -plibboost-graph-dev usr/include/boost
-	mv debian/libboost-dev/usr/include/boost/graph \
-	   debian/libboost-graph-dev/usr/include/boost
-	dh_install -plibboost-graph-dev
-	dh_link -plibboost-graph-dev
+	dh_install -plibboost-graph$(SOVERSION)
+	# package libboost-graph$(PKGVERSION)-dev
+	dh_installdirs -plibboost-graph$(PKGVERSION)-dev usr/include/boost
+	mv debian/libboost$(PKGVERSION)-dev/usr/include/boost/graph \
+	   debian/libboost-graph$(PKGVERSION)-dev/usr/include/boost
+	dh_install -plibboost-graph$(PKGVERSION)-dev
+	dh_link -plibboost-graph$(PKGVERSION)-dev
 
 	# package libboost-iostreams$(SOVERSION)
-	dh_install -plibboost-iostreams$(SOVERSION)$(DEBIAN_SUFFIX)
-	# package libboost-iostreams-dev
-	dh_installdirs -plibboost-iostreams-dev usr/include/boost
-	mv debian/libboost-dev/usr/include/boost/iostreams* \
-	   debian/libboost-iostreams-dev/usr/include/boost
-	dh_install -plibboost-iostreams-dev
-	dh_link -plibboost-iostreams-dev
+	dh_install -plibboost-iostreams$(SOVERSION)
+	# package libboost-iostreams$(PKGVERSION)-dev
+	dh_installdirs -plibboost-iostreams$(PKGVERSION)-dev usr/include/boost
+	mv debian/libboost$(PKGVERSION)-dev/usr/include/boost/iostreams* \
+	   debian/libboost-iostreams$(PKGVERSION)-dev/usr/include/boost
+	dh_install -plibboost-iostreams$(PKGVERSION)-dev
+	dh_link -plibboost-iostreams$(PKGVERSION)-dev
 
 	# package libboost-program-options$(SOVERSION)
-	dh_install -plibboost-program-options$(SOVERSION)$(DEBIAN_SUFFIX)
-	# package libboost-program-options-dev
-	dh_installdirs -plibboost-program-options-dev usr/include/boost
-	mv debian/libboost-dev/usr/include/boost/program_options* \
-	   debian/libboost-program-options-dev/usr/include/boost
-	dh_install -plibboost-program-options-dev
-	dh_link -plibboost-program-options-dev
+	dh_install -plibboost-program-options$(SOVERSION)
+	# package libboost-program-options$(PKGVERSION)-dev
+	dh_installdirs -plibboost-program-options$(PKGVERSION)-dev usr/include/boost
+	mv debian/libboost$(PKGVERSION)-dev/usr/include/boost/program_options* \
+	   debian/libboost-program-options$(PKGVERSION)-dev/usr/include/boost
+	dh_install -plibboost-program-options$(PKGVERSION)-dev
+	dh_link -plibboost-program-options$(PKGVERSION)-dev
 
 	# package libboost-python$(SOVERSION)
-	dh_install -plibboost-python$(SOVERSION)$(DEBIAN_SUFFIX)
-	# package libboost-python-dev
-	dh_installdirs -plibboost-python-dev usr/include/boost
-	mv debian/libboost-dev/usr/include/boost/python* \
-	   debian/libboost-python-dev/usr/include/boost
-	dh_install -plibboost-python-dev --autodest \
-	   debian/tmp/usr/share/python/runtime.d/libboost-python-dev.rtupdate
-	dh_link -plibboost-python-dev
-	$(call ins_lintian_overrides,libboost-python-dev)
+	dh_install -plibboost-python$(SOVERSION)
+	# package libboost-python$(PKGVERSION)-dev
+	dh_installdirs -plibboost-python$(PKGVERSION)-dev usr/include/boost
+	mv debian/libboost$(PKGVERSION)-dev/usr/include/boost/python* \
+	   debian/libboost-python$(PKGVERSION)-dev/usr/include/boost
+	dh_install -plibboost-python$(PKGVERSION)-dev --autodest \
+	   debian/tmp/usr/share/python/runtime.d/libboost-python$(PKGVERSION)-dev.rtupdate
+	dh_link -plibboost-python$(PKGVERSION)-dev
+	$(call ins_lintian_overrides,libboost-python-dev,libboost-python$(PKGVERSION)-dev)
 
 	# package libboost-regex$(SOVERSION)
-	dh_install -plibboost-regex$(SOVERSION)$(DEBIAN_SUFFIX)
-	# package libboost-regex-dev
-	dh_installdirs -plibboost-regex-dev usr/include/boost
-	mv debian/libboost-dev/usr/include/boost/*regex* \
-	   debian/libboost-regex-dev/usr/include/boost
-	dh_install -plibboost-regex-dev
-	dh_link -plibboost-regex-dev
+	dh_install -plibboost-regex$(SOVERSION)
+	# package libboost-regex$(PKGVERSION)-dev
+	dh_installdirs -plibboost-regex$(PKGVERSION)-dev usr/include/boost
+	mv debian/libboost$(PKGVERSION)-dev/usr/include/boost/*regex* \
+	   debian/libboost-regex$(PKGVERSION)-dev/usr/include/boost
+	dh_install -plibboost-regex$(PKGVERSION)-dev
+	dh_link -plibboost-regex$(PKGVERSION)-dev
 
 	# package libboost-serialization$(SOVERSION)
-	dh_install -plibboost-serialization$(SOVERSION)$(DEBIAN_SUFFIX)
-	# package libboost-serialization-dev
-	dh_installdirs -plibboost-serialization-dev usr/include/boost
-	mv debian/libboost-dev/usr/include/boost/*serialization* \
-	   debian/libboost-serialization-dev/usr/include/boost
-	dh_install -plibboost-serialization-dev
-	dh_link -plibboost-serialization-dev
+	dh_install -plibboost-serialization$(SOVERSION)
+	# package libboost-serialization$(PKGVERSION)-dev
+	dh_installdirs -plibboost-serialization$(PKGVERSION)-dev usr/include/boost
+	mv debian/libboost$(PKGVERSION)-dev/usr/include/boost/*serialization* \
+	   debian/libboost-serialization$(PKGVERSION)-dev/usr/include/boost
+	dh_install -plibboost-serialization$(PKGVERSION)-dev
+	dh_link -plibboost-serialization$(PKGVERSION)-dev
 
 	# package libboost-signals$(SOVERSION)
-	dh_install -plibboost-signals$(SOVERSION)$(DEBIAN_SUFFIX)
-	# package libboost-signals-dev
-	dh_installdirs -plibboost-signals-dev usr/include/boost
-	mv debian/libboost-dev/usr/include/boost/*signal* \
-	   debian/libboost-signals-dev/usr/include/boost
-	dh_install -plibboost-signals-dev
-	dh_link -plibboost-signals-dev
+	dh_install -plibboost-signals$(SOVERSION)
+	# package libboost-signals$(PKGVERSION)-dev
+	dh_installdirs -plibboost-signals$(PKGVERSION)-dev usr/include/boost
+	mv debian/libboost$(PKGVERSION)-dev/usr/include/boost/*signal* \
+	   debian/libboost-signals$(PKGVERSION)-dev/usr/include/boost
+	dh_install -plibboost-signals$(PKGVERSION)-dev
+	dh_link -plibboost-signals$(PKGVERSION)-dev
 
 	# package libboost-system$(SOVERSION)
-	dh_install -plibboost-system$(SOVERSION)$(DEBIAN_SUFFIX)
-	# package libboost-system-dev
-	dh_installdirs -plibboost-system-dev usr/include/boost
-	mv debian/libboost-dev/usr/include/boost/system \
-	   debian/libboost-system-dev/usr/include/boost
-	dh_install -plibboost-system-dev
-	dh_link -plibboost-system-dev
+	dh_install -plibboost-system$(SOVERSION)
+	# package libboost-system$(PKGVERSION)-dev
+	dh_installdirs -plibboost-system$(PKGVERSION)-dev usr/include/boost
+	mv debian/libboost$(PKGVERSION)-dev/usr/include/boost/system \
+	   debian/libboost-system$(PKGVERSION)-dev/usr/include/boost
+	dh_install -plibboost-system$(PKGVERSION)-dev
+	dh_link -plibboost-system$(PKGVERSION)-dev
 
 	# package libboost-test$(SOVERSION)
-	dh_install -plibboost-test$(SOVERSION)$(DEBIAN_SUFFIX)
-	# package libboost-test-dev
-	dh_installdirs -plibboost-test-dev usr/include/boost
-	mv debian/libboost-dev/usr/include/boost/test \
-	   debian/libboost-test-dev/usr/include/boost
-	dh_install -plibboost-test-dev
-	dh_link -plibboost-test-dev
+	dh_install -plibboost-test$(SOVERSION)
+	# package libboost-test$(PKGVERSION)-dev
+	dh_installdirs -plibboost-test$(PKGVERSION)-dev usr/include/boost
+	mv debian/libboost$(PKGVERSION)-dev/usr/include/boost/test \
+	   debian/libboost-test$(PKGVERSION)-dev/usr/include/boost
+	dh_install -plibboost-test$(PKGVERSION)-dev
+	dh_link -plibboost-test$(PKGVERSION)-dev
 
 	# package libboost-thread$(SOVERSION)
-	dh_install -plibboost-thread$(SOVERSION)$(DEBIAN_SUFFIX)
-	# package libboost-thread-dev
-	dh_installdirs -plibboost-thread-dev usr/include/boost
-	mv debian/libboost-dev/usr/include/boost/thread* \
-	   debian/libboost-thread-dev/usr/include/boost
-	dh_install -plibboost-thread-dev
-	dh_link -plibboost-thread-dev \
+	dh_install -plibboost-thread$(SOVERSION)
+	# package libboost-thread$(PKGVERSION)-dev
+	dh_installdirs -plibboost-thread$(PKGVERSION)-dev usr/include/boost
+	mv debian/libboost$(PKGVERSION)-dev/usr/include/boost/thread* \
+	   debian/libboost-thread$(PKGVERSION)-dev/usr/include/boost
+	dh_install -plibboost-thread$(PKGVERSION)-dev
+	dh_link -plibboost-thread$(PKGVERSION)-dev \
 	   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 -plibboost-wave$(SOVERSION)$(DEBIAN_SUFFIX)
-	# package libboost-wave-dev
-	dh_installdirs -plibboost-wave-dev usr/include/boost
-	mv debian/libboost-dev/usr/include/boost/wave* \
-	   debian/libboost-wave-dev/usr/include/boost
-	dh_install -plibboost-wave-dev
-	dh_link -plibboost-wave-dev
+	dh_install -plibboost-wave$(SOVERSION)
+	# package libboost-wave$(PKGVERSION)-dev
+	dh_installdirs -plibboost-wave$(PKGVERSION)-dev usr/include/boost
+	mv debian/libboost$(PKGVERSION)-dev/usr/include/boost/wave* \
+	   debian/libboost-wave$(PKGVERSION)-dev/usr/include/boost
+	dh_install -plibboost-wave$(PKGVERSION)-dev
+	dh_link -plibboost-wave$(PKGVERSION)-dev
 
 # This single target is used to build all the packages, all at once, or
 # one at a time. So keep in mind: any options passed to commands here will
@@ -366,15 +368,15 @@
 	dh_installchangelogs
 	dh_strip -Nlibboost-dbg
 	dh_link
-	dh_compress -Xlibboost-doc/HTML
+	dh_compress -Xlibboost$(PKGVERSION)-doc/HTML
 	dh_pysupport
 	dh_fixperms
 
 	@if [ "$(DH_OPTIONS)" = "-a" ]; then \
-		echo DH_OPTIONS=-plibboost-dbg dh_makeshlibs -V"libboost-dbg $(SHLIBS_VERSION)"; \
-		DH_OPTIONS=-plibboost-dbg dh_makeshlibs -V"libboost-dbg $(SHLIBS_VERSION)"; \
+		echo DH_OPTIONS=-plibboost$(PKGVERSION)-dbg dh_makeshlibs -V"libboost$(PKGVERSION)-dbg $(SHLIBS_VERSION)"; \
+		DH_OPTIONS=-plibboost$(PKGVERSION)-dbg dh_makeshlibs -V"libboost$(PKGVERSION)-dbg $(SHLIBS_VERSION)"; \
 		for name in $(boost_libs); do \
-			lib=libboost-$${name}$(SOVERSION)$(DEBIAN_SUFFIX); \
+			lib=libboost-$${name}$(SOVERSION); \
 			echo DH_OPTIONS=-p$${lib} dh_makeshlibs -V"$${lib} $(SHLIBS_VERSION)"; \
 			DH_OPTIONS=-p$${lib} dh_makeshlibs -V"$${lib} $(SHLIBS_VERSION)"; \
 		done; \




More information about the pkg-boost-commits mailing list