[Pkg-mono-svn-commits] [SCM] mono branch, master, updated. debian/2.4.2.3+dfsg-2-1-g007cc63

[Jo Shields]

The following commit has been merged in the master branch:
commit 007cc63ab76397deb4482ae6889e62a1e47b9a87
Author: Jo Shields <directhex at apebox.org>
Date:   Tue Oct 13 16:44:01 2009 +0100

     * Add missing Conflicts/Replaces on monodoc-base from pre-Squeeze due
        to monodoc.dll.mdb conflict

diff --git a/debian/changelog b/debian/changelog
index e30fb78..d32c30d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mono (2.4.2.3+dfsg-3) UNRELEASED; urgency=low
+
+  * Add missing Conflicts/Replaces on monodoc-base from pre-Squeeze due
+    to monodoc.dll.mdb conflict
+
+ -- Jo Shields <directhex at apebox.org>  Tue, 13 Oct 2009 16:43:04 +0100
+
 mono (2.4.2.3+dfsg-2) unstable; urgency=medium
 
   * debian/control:
diff --git a/debian/control b/debian/control
index 012da21..fc2d999 100644
--- a/debian/control
+++ b/debian/control
@@ -1338,7 +1338,9 @@ Replaces: libmono1.0-cil (<< 1.2.4-1),
  mono-mcs (<< 1.2.4-1),
  mono-mjs (<< 1.2.4-1),
  mono-gmcs (<< 1.2.4-1),
- mono-gac (<< 1.2.4-1)
+ mono-gac (<< 1.2.4-1),
+ monodoc-base (<< 2.0)
+Conflicts: monodoc-base (<< 2.0)
 Description: Mono debugging symbols
  This package contains the debugging symbols of various libmono-* and mono-*
  packages.

-- 
mono