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

[Steven Michael Robbins]

Author: smr
Date: 2010-01-04 02:44:25 +0000 (Mon, 04 Jan 2010)
New Revision: 14553

Modified:
   boost/trunk/debian/changelog
   boost/trunk/debian/control
   boost/trunk/debian/rules
Log:
Update package conflicts; add link for libboost-doc; update bug closures in changelog.

Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog	2010-01-04 01:33:12 UTC (rev 14552)
+++ boost/trunk/debian/changelog	2010-01-04 02:44:25 UTC (rev 14553)
@@ -1,7 +1,7 @@
 boost1.41 (1.41.0-1) unstable; urgency=low
 
-  * New upstream.
-
+  * New upstream.  Closes: #563108.
+  
   * patches/boost-build-pythonid.patch:
   * rules: Switch --pythonid to --xpythonid;
     c.f. https://svn.boost.org/trac/boost/ticket/3814
@@ -10,8 +10,15 @@
     - Switch to source format "3.0 (quilt)".
     - Remove hard-coding of python versions.
 
- -- Steve M. Robbins <smr at debian.org>  Sun, 03 Jan 2010 17:23:55 -0600
+  * rules: Provide a constant reference to latest documentation.  
+    Closes: #548270.
+  
+  * control: Package libboost-mpi-python1.41 conflicts with
+    libboost-mpi-python1.40, since both provide
+    /usr/lib/pyshared/python2.5/boost/mpi.so.
 
+ -- Steve M. Robbins <smr at debian.org>  Sun, 03 Jan 2010 20:27:34 -0600
+
 boost1.40 (1.40.0-4) unstable; urgency=low
 
   * rtupdate: Don't die if link target doesn't exist.  Update of

Modified: boost/trunk/debian/control
===================================================================
--- boost/trunk/debian/control	2010-01-04 01:33:12 UTC (rev 14552)
+++ boost/trunk/debian/control	2010-01-04 02:44:25 UTC (rev 14553)
@@ -225,6 +225,7 @@
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends}, libboost1.41-dev (= ${binary:Version}), libboost-serialization1.41-dev (= ${binary:Version}), libboost-test1.41-dev (= ${binary:Version})
+Conflicts: libboost-graph-parallel1.40-dev
 Recommends: libboost-graph-parallel1.41.0 (= ${binary:Version})
 Description: generic graph components and algorithms in C++
  This package forms part of the Boost C++ Libraries collection.
@@ -285,6 +286,7 @@
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends}, libboost1.41-dev (= ${binary:Version}), libboost-math1.41.0 (= ${binary:Version})
+Conflicts: libboost-math1.40-dev
 Description: Boost.Math Library development files
  This package forms part of the Boost C++ Libraries collection.
  .
@@ -334,6 +336,7 @@
 Architecture: any
 Section: python
 Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}
+Conflicts: libboost-mpi-python1.40.0
 Description: C++ interface to the Message Passing Interface (MPI), Python Bindings
  This package forms part of the Boost C++ Libraries collection.
  .
@@ -350,6 +353,7 @@
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends}, libboost-mpi1.41-dev (= ${binary:Version}), libboost-mpi-python1.41.0 (= ${binary:Version})
+Conflicts: libboost-mpi-python1.40-dev
 Description: C++ interface to the Message Passing Interface (MPI), Python Bindings
  This package forms part of the Boost C++ Libraries collection.
  .

Modified: boost/trunk/debian/rules
===================================================================
--- boost/trunk/debian/rules	2010-01-04 01:33:12 UTC (rev 14552)
+++ boost/trunk/debian/rules	2010-01-04 02:44:25 UTC (rev 14553)
@@ -263,6 +263,10 @@
 	dh_link -plibboost$(PKGVERSION)-doc \
 	   usr/include/boost \
 	   usr/share/doc/libboost$(PKGVERSION)-doc/HTML/boost
+	# provide a constant symlink to the latest documents
+	dh_link -plibboost$(PKGVERSION)-doc \
+	   usr/share/doc/libboost$(PKGVERSION)-doc/HTML
+	   usr/share/doc/libboost-doc/HTML
 
 	mkdir -p $(exampledir)
 	cat debian/example-files | xargs cp -a --parents --target-directory=$(exampledir)