[Pkg-mono-svn-commits] [SCM] mono branch, master-experimental, updated. debian/2.6.3-1-16-g64f4eb9

[Jo Shields]

The following commit has been merged in the master-experimental branch:
commit 64f4eb9bf4a5d4392cda4adb06a5be2ea1e56c9c
Author: Jo Shields <directhex at apebox.org>
Date:   Tue Jun 22 10:47:47 2010 +0100

    move mono-service GAC entries to mono-service packages

diff --git a/debian/changelog b/debian/changelog
index 011cd19..9a5ba96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,11 @@ mono (2.6.3-2) UNRELEASED; urgency=low
       when called using bash rather than dash (Closes: #580665)
   * debian/control:
     + Add a Replaces: on libmono-dev << 2.4.3 (Closes: #582614)
+  * debian/control,
+    debian/libmono{1,0}.0-cil.install,
+    debian/mono-{1,2}.0-service.install:
+    + Move mono-service executables' GAC entries to mono-service packages
+      where they belong (Closes: #586192)
 
  -- Jo Shields <directhex at apebox.org>  Tue, 22 Jun 2010 08:53:51 +0100
 
diff --git a/debian/control b/debian/control
index 6deea03..0177e09 100644
--- a/debian/control
+++ b/debian/control
@@ -1549,7 +1549,8 @@ Description: Mono development tools for CLI 2.0
 Package: mono-1.0-service
 Architecture: all
 Depends: ${misc:Depends}, ${cli:Depends}
-Replaces: mono-mcs (<< 1.2.6-1)
+Replaces: mono-mcs (<< 1.2.6-1),
+          libmono1.0-cil (<< 2.4.4~svn151842-3~)
 Description: Mono service manager for CLI 1.0
  Mono is a platform for running and developing applications based on the
  ECMA/ISO Standards. Mono is an open source effort led by Novell.
@@ -1563,7 +1564,8 @@ Description: Mono service manager for CLI 1.0
 Package: mono-2.0-service
 Architecture: all
 Depends: ${misc:Depends}, ${cli:Depends}
-Replaces: mono-gmcs (<< 1.2.6-1)
+Replaces: mono-gmcs (<< 1.2.6-1),
+          libmono2.0-cil (<< 2.4.4~svn151842-3~)
 Description: Mono service manager for CLI 2.0
  Mono is a platform for running and developing applications based on the
  ECMA/ISO Standards. Mono is an open source effort led by Novell.
diff --git a/debian/libmono1.0-cil.install b/debian/libmono1.0-cil.install
index 14383d5..cc702dc 100644
--- a/debian/libmono1.0-cil.install
+++ b/debian/libmono1.0-cil.install
@@ -4,4 +4,3 @@ debian/tmp/usr/lib/mono/1.0/OpenSystem.C.dll
 debian/tmp/usr/lib/mono/gac/Mono.CompilerServices.SymbolWriter/1.0.5000.0__*/
 debian/tmp/usr/lib/mono/gac/Mono.Http/1.0.5000.0__*/
 debian/tmp/usr/lib/mono/gac/OpenSystem.C/1.0.5000.0__*/
-debian/tmp/usr/lib/mono/gac/mono-service/1.0.5000.0__*/
diff --git a/debian/libmono2.0-cil.install b/debian/libmono2.0-cil.install
index 5fa517c..5fc033b 100644
--- a/debian/libmono2.0-cil.install
+++ b/debian/libmono2.0-cil.install
@@ -6,4 +6,3 @@ debian/tmp/usr/lib/mono/gac/Mono.CompilerServices.SymbolWriter/2.0.0.0__*/
 debian/tmp/usr/lib/mono/gac/Mono.Http/2.0.0.0__*/
 debian/tmp/usr/lib/mono/gac/Mono.Web/2.0.0.0__*/
 debian/tmp/usr/lib/mono/gac/OpenSystem.C/2.0.0.0__*/
-debian/tmp/usr/lib/mono/gac/mono-service/2.0.0.0__*/
diff --git a/debian/mono-1.0-service.install b/debian/mono-1.0-service.install
index e7f6c21..1b0b467 100644
--- a/debian/mono-1.0-service.install
+++ b/debian/mono-1.0-service.install
@@ -1,2 +1,4 @@
 debian/tmp/usr/bin/mono-service
 debian/tmp/usr/lib/mono/1.0/mono-service.exe*
+debian/tmp/usr/lib/mono/gac/mono-service/1.0.5000.0__*/
+
diff --git a/debian/mono-2.0-service.install b/debian/mono-2.0-service.install
index 5b40bc2..5b8b942 100644
--- a/debian/mono-2.0-service.install
+++ b/debian/mono-2.0-service.install
@@ -1,2 +1,3 @@
 debian/tmp/usr/bin/mono-service2
 debian/tmp/usr/lib/mono/2.0/mono-service.exe*
+debian/tmp/usr/lib/mono/gac/mono-service/2.0.0.0__*/

-- 
mono