[Pkg-mono-svn-commits] rev 3522 - mono/trunk/debian

[Sebastian Dröge]

Author: slomo
Date: 2007-12-17 07:55:07 +0000 (Mon, 17 Dec 2007)
New Revision: 3522

Removed:
   mono/trunk/debian/mono-1.0-service.install
   mono/trunk/debian/mono-2.0-service.install
Modified:
   mono/trunk/debian/changelog
   mono/trunk/debian/control
   mono/trunk/debian/rules
Log:
* debian/rules:
  + Don't ship Mono.Mozilla in libmono2.0-cil.
* debian/control,
  debian/mono-1.0-service.install,
  debian/mono-2.0-service.install:
  + Make the old mono-[12].0-service packages transitional packages
    and ship the binaries in mono-[12].0-tools-dev.

Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog	2007-12-16 22:42:55 UTC (rev 3521)
+++ mono/trunk/debian/changelog	2007-12-17 07:55:07 UTC (rev 3522)
@@ -1,5 +1,6 @@
 mono (1.2.6-1~pre1) UNRELEASED; urgency=low
 
+  [ Mirco Bauer ]
   * New upstream release.
     + Invoking GetFields on emitted type doesn't crash anymore, as seen with
       nemerle. (Closes: #452585)
@@ -30,8 +31,17 @@
   * debian/shlibs.local:
     + Updated
 
- -- Mirco Bauer <meebey at debian.org>  Sun, 16 Dec 2007 15:44:33 +0100
+  [ Sebastian Dröge ]
+  * debian/rules:
+    + Don't ship Mono.Mozilla in libmono2.0-cil.
+  * debian/control,
+    debian/mono-1.0-service.install,
+    debian/mono-2.0-service.install:
+    + Make the old mono-[12].0-service packages transitional packages
+      and ship the binaries in mono-[12].0-tools-dev.
 
+ -- Sebastian Dröge <slomo at debian.org>  Mon, 17 Dec 2007 08:53:37 +0100
+
 mono (1.2.5.1-2) unstable; urgency=high
 
   * Mirco 'meebey' Bauer:

Modified: mono/trunk/debian/control
===================================================================
--- mono/trunk/debian/control	2007-12-16 22:42:55 UTC (rev 3521)
+++ mono/trunk/debian/control	2007-12-17 07:55:07 UTC (rev 3522)
@@ -1098,7 +1098,7 @@
 Section: devel
 Architecture: all
 Depends: ${cli:Depends}
-Replaces: mono-mcs (<< 1.2.6-1)
+Replaces: mono-mcs (<< 1.2.6-1), mono-1.0-service (<< 1.2.6-1)
 Description: Mono development tools 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.
@@ -1112,7 +1112,7 @@
 Section: devel
 Architecture: all
 Depends: ${cli:Depends}
-Replaces: mono-gmcs (<< 1.2.6-1)
+Replaces: mono-gmcs (<< 1.2.6-1), mono-2.0-service (<< 1.2.6-1)
 Description: Mono development tools 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.
@@ -1125,7 +1125,7 @@
 Package: mono-1.0-service
 Section: devel
 Architecture: all
-Depends: ${cli:Depends}
+Depends: ${cli:Depends}, mono-1.0-tools-dev
 Replaces: mono-mcs (<< 1.2.6-1)
 Description: Mono service manager for CLI 1.0
  Mono is a platform for running and developing applications based on the
@@ -1141,7 +1141,7 @@
 Section: devel
 Architecture: all
 Depends: ${cli:Depends}
-Replaces: mono-gmcs (<< 1.2.6-1)
+Replaces: mono-gmcs (<< 1.2.6-1), mono-2.0-tools-dev
 Description: Mono server 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.

Deleted: mono/trunk/debian/mono-1.0-service.install
===================================================================
--- mono/trunk/debian/mono-1.0-service.install	2007-12-16 22:42:55 UTC (rev 3521)
+++ mono/trunk/debian/mono-1.0-service.install	2007-12-17 07:55:07 UTC (rev 3522)
@@ -1,2 +0,0 @@
-debian/tmp/usr/bin/mono-service
-debian/tmp/usr/lib/mono/1.0/mono-service.exe*

Deleted: mono/trunk/debian/mono-2.0-service.install
===================================================================
--- mono/trunk/debian/mono-2.0-service.install	2007-12-16 22:42:55 UTC (rev 3521)
+++ mono/trunk/debian/mono-2.0-service.install	2007-12-17 07:55:07 UTC (rev 3522)
@@ -1,2 +0,0 @@
-debian/tmp/usr/bin/mono-service2
-debian/tmp/usr/lib/mono/2.0/mono-service.exe*

Modified: mono/trunk/debian/rules
===================================================================
--- mono/trunk/debian/rules	2007-12-16 22:42:55 UTC (rev 3521)
+++ mono/trunk/debian/rules	2007-12-17 07:55:07 UTC (rev 3522)
@@ -272,6 +272,12 @@
 	rm debian/libmono-system1.0-cil/usr/lib/mono/1.0/System.Messaging.dll
 	rm debian/libmono-system2.0-cil/usr/lib/mono/2.0/System.Messaging.dll
 
+	# delete Mono.Mozilla from libmono1.0/2.0-cil
+ 	rm -r debian/libmono1.0-cil/usr/lib/mono/gac/Mono.Mozilla/
+	rm -r debian/libmono2.0-cil/usr/lib/mono/gac/Mono.Mozilla/
+	rm debian/libmono1.0-cil/usr/lib/mono/1.0/Mono.Mozilla.dll
+	rm debian/libmono2.0-cil/usr/lib/mono/2.0/Mono.Mozilla.dll
+
 	dh_link -i
 	dh_installchangelogs -i
 	dh_installdocs -i