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

[Steven Michael Robbins]

Author: smr
Date: 2009-11-14 21:23:17 +0000 (Sat, 14 Nov 2009)
New Revision: 14530

Modified:
   boost/trunk/debian/control
Log:
Update conflicts line for libboost1.40-dev since it now contains header files formerly found in libboost-date-time1.40-dev, etc.

Modified: boost/trunk/debian/control
===================================================================
--- boost/trunk/debian/control	2009-11-14 20:12:54 UTC (rev 14529)
+++ boost/trunk/debian/control	2009-11-14 21:23:17 UTC (rev 14530)
@@ -28,7 +28,31 @@
 Section: libdevel
 Depends: ${misc:Depends}, ${shlibs:Depends}, libstdc++6-4.4-dev | libstdc++-dev
 Suggests: libboost1.40-doc, libboost-date-time1.40-dev, libboost-filesystem1.40-dev, libboost-graph-parallel1.40-dev, libboost-graph1.40-dev, libboost-iostreams1.40-dev, libboost-math1.40-dev, libboost-mpi1.40-dev, libboost-program-options1.40-dev, libboost-python1.40-dev, libboost-regex1.40-dev, libboost-serialization1.40-dev, libboost-signals1.40-dev, libboost-system1.40-dev, libboost-test1.40-dev, libboost-thread1.40-dev, libboost-wave1.40-dev, xsltproc, doxygen, docbook-xml (>= 4.2), docbook-xsl (>= 1.73.2), default-jdk (>= 1.4), fop (>= 0.94)
-Conflicts: libboost-dev (<< 1.35.0), bcp, libboost1.35-dev, libboost1.36-dev, libboost1.37-dev, libboost1.38-dev, libboost1.39-dev
+Conflicts: bcp,
+ libboost-dev (<< 1.35.0), 
+ libboost1.35-dev,
+ libboost1.36-dev,
+ libboost1.37-dev,
+ libboost1.38-dev,
+ libboost1.39-dev,
+ libboost1.40-dev (<= 1.40.0-2),
+ libboost-date-time1.40-dev (<= 1.40.0-2), 
+ libboost-filesystem1.40-dev (<= 1.40.0-2), 
+ libboost-graph1.40-dev (<= 1.40.0-2), 
+ libboost-graph-parallel1.40-dev (<= 1.40.0-2), 
+ libboost-iostreams1.40-dev (<= 1.40.0-2), 
+ libboost-math1.40-dev (<= 1.40.0-2), 
+ libboost-mpi1.40-dev (<= 1.40.0-2), 
+ libboost-mpi-python1.40-dev (<= 1.40.0-2), 
+ libboost-program-options1.40-dev (<= 1.40.0-2), 
+ libboost-python1.40-dev (<= 1.40.0-2), 
+ libboost-regex1.40-dev (<= 1.40.0-2), 
+ libboost-serialization1.40-dev (<= 1.40.0-2), 
+ libboost-signals1.40-dev (<= 1.40.0-2), 
+ libboost-system1.40-dev (<= 1.40.0-2), 
+ libboost-test1.40-dev (<= 1.40.0-2), 
+ libboost-thread1.40-dev (<= 1.40.0-2), 
+ libboost-wave1.40-dev (<= 1.40.0-2)
 Replaces: bcp
 Provides: bcp
 Description: Boost C++ Libraries development files