[Pkg-mono-svn-commits] [SCM] mono branch, master, updated. debian/2.4+dfsg-2-8-g49634c6

[Mirco Bauer]

The following commit has been merged in the master branch:
commit 2e06f2134c89c95c8861834037e1248c7d7765b6
Author: Mirco Bauer <meebey at meebey.net>
Date:   Wed Jun 10 22:03:24 2009 +0200

        + Added conflicts mono-{1,2}.0-runtime to mono-runtime to ensure
          aptitude is proposing a happy upgrade path.

diff --git a/debian/changelog b/debian/changelog
index 8d26a0b..b5d8e3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ mono (2.4+dfsg-3) unstable; urgency=low
     + Change Section of prj2make-sharp to devel to match archive overrides.
     + Added replaces libmono-cairo1.0-cil to libmono-cairo2.0-cil, as the
       pkg-config file was moved from that. (Closes: #531006)
+    + Added conflicts mono-{1,2}.0-runtime to mono-runtime to ensure
+      aptitude is proposing a happy upgrade path.
   * debian/libmono-wcf3.0-cil.install:
     + Added missing System.IdentityModel development symlink.
       (Closes: #531496)
diff --git a/debian/control b/debian/control
index e9c9747..c57377e 100644
--- a/debian/control
+++ b/debian/control
@@ -27,7 +27,10 @@ Package: mono-runtime
 Provides: cli-runtime, cli-virtual-machine
 Architecture: i386 lpia kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
 Replaces: mono-common (<< 2.4), mono-jit (<< 2.4), libmono0 (<< 2.4)
-Conflicts: mono-common (<< 2.4), mono-jit (<< 2.4)
+Conflicts: mono-common (<< 2.4),
+           mono-jit (<< 2.4),
+           mono-1.0-runtime (<< 2.4),
+           mono-2.0-runtime (<< 2.4)
 Suggests: xdg-utils | libgnome2-0 | konqueror
 Recommends: binfmt-support (>= 1.1.2)
 Depends: ${shlibs:Depends},

-- 
mono