[Pkg-mono-svn-commits] [SCM] mono branch, master, updated. debian/2.4.3+dfsg-1-5-ga5eac69

[Mirco Bauer]

The following commit has been merged in the master branch:
commit a5eac69398345a2c12c0084c8560bfdc80970496
Author: Mirco Bauer <meebey at meebey.net>
Date:   Sat Jan 9 14:10:44 2010 +0100

      * debian/control:
        + Added libnunit-cil-dev to Depends of libmono-cil-dev as that one
          contains the symlink to the nunit.pc file which is no longer present in
          libnunit2.4-cil but libnunit-cil-dev.
        + Dropped purpose less libmono-nunit2.4-cil package as libmono-cil-dev
          does the job now.
        + Added conflicts libmono-nunit2.4-cil to libmono-cil-dev for cleaning up.

diff --git a/debian/changelog b/debian/changelog
index 8978307..d4e5ab7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,15 @@ mono (2.4.3+dfsg-2) UNRELEASED; urgency=low
   [ Mirco Bauer ]
   * debian/watch:
     + We are only watching the 2.4 series for now (until squeeze is released)
-
- -- Mirco Bauer <meebey at debian.org>  Wed, 06 Jan 2010 19:41:56 +0100
+  * debian/control:
+    + Added libnunit-cil-dev to Depends of libmono-cil-dev as that one
+      contains the symlink to the nunit.pc file which is no longer present in
+      libnunit2.4-cil but libnunit-cil-dev.
+    + Dropped purpose less libmono-nunit2.4-cil package as libmono-cil-dev
+      does the job now.
+    + Added conflicts libmono-nunit2.4-cil to libmono-cil-dev for cleaning up.
+
+ -- Mirco Bauer <meebey at debian.org>  Sat, 09 Jan 2010 14:07:57 +0100
 
 mono (2.4.3+dfsg-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index b06aae1..4ed3912 100644
--- a/debian/control
+++ b/debian/control
@@ -182,6 +182,7 @@ Replaces: libmono-nunit2.4-cil (<< 2.4.3),
           libmono-wcf3.0-cil (<< 2.4.3),
           libmono2.0-cil (<< 2.4.3),
           mono-devel (<< 2.4.3)
+Conflicts: libmono-nunit2.4-cil
 Recommends: libmono-firebirdsql1.7-cil (= ${source:Version})
 Depends: libmono1.0-cil (= ${source:Version}),
          libmono2.0-cil (= ${source:Version}),
@@ -196,7 +197,6 @@ Depends: libmono1.0-cil (= ${source:Version}),
          libmono-c5-1.0-cil (= ${source:Version}),
          libmono-cecil-private-cil (= ${source:Version}),
          libmono-webbrowser0.5-cil (= ${source:Version}),
-         libmono-nunit2.4-cil (= ${source:Version}),
          libmono-management2.0-cil (= ${source:Version}),
          libmono-messaging2.0-cil (= ${source:Version}),
          libmono-simd2.0-cil (= ${source:Version}),
@@ -251,7 +251,8 @@ Depends: libmono1.0-cil (= ${source:Version}),
          libmono-peapi1.0-cil (= ${source:Version}),
          libmono-peapi2.0-cil (= ${source:Version}),
          libmono-relaxng1.0-cil (= ${source:Version}),
-         libmono-relaxng2.0-cil (= ${source:Version})
+         libmono-relaxng2.0-cil (= ${source:Version}),
+         libnunit-cil-dev (>= 2.4)
 Description: Mono Base Class Libraries - Development files
  This package contains development headers for the Mono Base Class Libraries (BCL).
  .
@@ -445,22 +446,6 @@ Description: Mono Web Browser library
  This package contains the implementation of the WebControl class based on the
  Mozilla engine using libgluezilla.
 
-Package: libmono-nunit2.4-cil
-Architecture: all
-Conflicts: libnunit2.2-cil, libmono-nunit2.2-cil
-Replaces: libmono-nunit2.2-cil
-Depends: ${cli:Depends}, libnunit2.4-cil
-Description: Mono Unit test framework for CLI
- Mono is a platform for running and developing applications based on the
- ECMA/ISO Standards. Mono is an open source effort led by Novell.
- Mono provides a complete CLR (Common Language Runtime) including compiler and
- runtime, which can produce and execute CIL (Common Intermediate Language)
- bytecode (aka assemblies), and a class library.
- .
- This package contains NUnit which is a unit testing framework. It serves the
- same purpose as JUnit does in the Java world. It supports test categories,
- testing for exceptions and writing test results in plain text or XML.
-
 Package: libmono-management2.0-cil
 Architecture: all
 Depends: ${cli:Depends}

-- 
mono