[pkg-db-commits] [SCM] Berkeley DB Debian packaging branch, debian-sid, updated. debian/5.1.25-10-49-g80f981c

[Ondřej Surý]

The following commit has been merged in the debian-sid branch:
commit 0865e1dc03d60499c7324f6890eb2d5ed186a4aa
Author: Ondřej Surý <ondrej at sury.org>
Date:   Sat Jan 21 14:28:36 2012 +0100

    Fix conflicts with db5.1 and db5.2 (Closes: #656725, #656726, #656727)

diff --git a/debian/control b/debian/control
index 58aede0..6ae60fb 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Priority: extra
 Depends: libdb5.3 (= ${binary:Version}),
 	 ${misc:Depends}
 Suggests: db5.3-doc
-Conflicts: libdb4.6-dev, libdb4.7-dev, libdb4.8-dev, libdb5.1-dev
+Conflicts: libdb4.6-dev, libdb4.7-dev, libdb4.8-dev, libdb5.1-dev, libdb5.2-dev
 Description: Berkeley v5.3 Database Libraries [development]
  This is the development package which contains headers and static
  libraries for the Berkeley v5.3 database library.
@@ -99,7 +99,7 @@ Priority: extra
 Depends: libdb5.3++ (= ${binary:Version}),
 	 libdb5.3-dev (= ${binary:Version}),
 	 ${misc:Depends}
-Conflicts: libdb4.6++-dev, libdb4.7++-dev, libdb4.8++-dev, libdb5.1++-dev
+Conflicts: libdb4.6++-dev, libdb4.7++-dev, libdb4.8++-dev, libdb5.1++-dev, libdb5.2++-dev
 Description: Berkeley v5.3 Database Libraries for C++ [development]
  This is the development package which contains headers and static
  libraries for the Berkeley v5.3 database library.  This is only for
@@ -111,7 +111,7 @@ Section: interpreters
 Priority: extra
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Conflicts: libdb4.6-tcl, libdb4.7-tcl, libdb4.8-tcl, libdb5.1-tcl
+Conflicts: libdb4.6-tcl, libdb4.7-tcl, libdb4.8-tcl, libdb5.1-tcl, libdb5.2-tcl
 Depends: ${tcl:Depends},
 	 ${shlibs:Depends},
 	 ${misc:Depends}
@@ -137,6 +137,7 @@ Priority: optional
 Depends: ${shlibs:Depends},
 	 ${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
+Conflicts: libdb5.1-java, libdb5.2-java
 Recommends: libdb5.3-java-gcj
 Multi-Arch: same
 Description: Berkeley v5.3 Database Libraries for Java
@@ -163,7 +164,7 @@ Priority: optional
 Depends: libdb5.3-java (= ${binary:Version}),
 	 ${shlibs:Depends},
 	 ${misc:Depends}
-Conflicts: libdb4.6-java-dev, libdb4.7-java-dev, libdb4.8-java-dev, libdb5.1-java-dev
+Conflicts: libdb4.6-java-dev, libdb4.7-java-dev, libdb4.8-java-dev, libdb5.1-java-dev, libdb5.2-java-dev
 Description: Berkeley v5.3 Database Libraries for Java [development]
  This package provides the Java interface for the Berkeley v5.3 database
  library.
@@ -174,6 +175,7 @@ Section: libdevel
 Priority: extra
 Depends: libdb5.3-sql (= ${binary:Version}),
 	 ${misc:Depends}
+Conflicts: libdb5.1-sql-dev, libdb5.2-sql-dev
 Suggests: db5.3-doc
 Description: Berkeley v5.3 Database Libraries [SQL development]
  This is the development package which contains headers and static
@@ -196,6 +198,7 @@ Section: libdevel
 Priority: extra
 Depends: libdb5.3-stl (= ${binary:Version}),
 	 ${misc:Depends}
+Conflicts: libdb5.1-stl-dev, libdb5.2-stl-dev
 Suggests: db5.3-doc
 Description: Berkeley v5.3 Database Libraries [STL development]
  This is the development package which contains headers and static

-- 
Berkeley DB Debian packaging