[Pkg-cli-libs-commits] [SCM] db4o branch, master, updated. upstream/7.4.120.14002+dfsg-42-gb3ca466

[Jo Shields]

The following commit has been merged in the master branch:
commit b3ca466004c73f9dc6fbe2416fac1fa53b5cb8ff
Author: Jo Shields <directhex at apebox.org>
Date:   Thu Jan 28 19:41:00 2010 +0000

    unversion conflicts/replaces - versions are superfluous here as lib name has changed

diff --git a/debian/changelog b/debian/changelog
index 624175f..78817f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ db4o (7.4.121.14026+dfsg-1) UNRELEASED; urgency=low
 
   [ Jo Shields ]
   * debian/libdb4o7.4-cil.install*,
+    debian/rules,
     debian/db4o.pc:
     + CLI Policy 0.7 install location
 
diff --git a/debian/control b/debian/control
index 73cb7f1..f7157f7 100644
--- a/debian/control
+++ b/debian/control
@@ -17,8 +17,8 @@ Vcs-Git: git://git.debian.org/git/pkg-cli-libs/packages/db4o.git
 
 Package: libdb4o7.4-cil
 Architecture: all
-Replaces: libdb4o6.1-cil (<< 6.1.604), libdb4o6.0-cil (<< 7.4.121.14026)
-Conflicts: libdb4o6.1-cil (<< 6.1.604), libdb4o6.0-cil (<< 7.4.121.14026)
+Replaces: libdb4o6.1-cil, libdb4o6.0-cil
+Conflicts: libdb4o6.1-cil, libdb4o6.0-cil
 Suggests: libdb4o-doc, monodoc-db4o-manual
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}
 Description: native OODBMS for CLI

-- 
db4o