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

[Mirco Bauer]

Author: meebey
Date: 2007-12-20 22:01:04 +0000 (Thu, 20 Dec 2007)
New Revision: 3529

Modified:
   mono/trunk/debian/changelog
   mono/trunk/debian/copyright
   mono/trunk/debian/dh_clideps
   mono/trunk/debian/libmono-system-web2.0-cil.install
   mono/trunk/debian/mono-1.0-devel.install
Log:
- mono 1.2.6+dfsg



Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog	2007-12-20 21:59:04 UTC (rev 3528)
+++ mono/trunk/debian/changelog	2007-12-20 22:01:04 UTC (rev 3529)
@@ -1,6 +1,10 @@
-mono (1.2.6-1~pre2) UNRELEASED; urgency=low
+mono (1.2.6+dfsg-1~pre1) UNRELEASED; urgency=low
 
-  * New upstream release.
+  * DFSG version of Mono 1.2.6
+    + Deleted mcs/class/System.Web.Extensions/System.Web.Script.Serialization/
+      JSON/* as those source files are licensed under Creative Commons
+      Attribution 2.5 which is not DFSG-free.
+  * New upstream release
     + Invoking GetFields on emitted type doesn't crash anymore, as seen with
       nemerle. (Closes: #452585)
   * debian/rules:
@@ -31,8 +35,8 @@
     + libmono-corlib{1,2}.0-cil recommends libmono-i18n{1,2}.0-cil now.
     + Removed mono and mono-devel meta packages, as they are not useful for
       anyone.
-  * debian/libmono-system2.0-cil.install:
-    + Added System.Web.Extensions.dll and System.Web.Extensions.Design.dll
+  * debian/dh_clideps:
+    + Synced from cli-common 0.5.3, needed for CLI 2.1 support.
   * debian/patches/00list:
     + Disabled armel_fix_configure_fpu_check.dpatch
       (FPU check is fixed upstream)

Modified: mono/trunk/debian/copyright
===================================================================
--- mono/trunk/debian/copyright	2007-12-20 21:59:04 UTC (rev 3528)
+++ mono/trunk/debian/copyright	2007-12-20 22:01:04 UTC (rev 3529)
@@ -29,18 +29,8 @@
 
 Copyright:
 
-WRITE ME!
-
 -------------------------------------------------------------------------------
 
-mcs/class/System.Web.Extensions/System.Web.Script.Serialization/JSON/*
-
-Creative Commons?!?
-
-CLEARIFY ME!
-
--------------------------------------------------------------------------------
-
 mcs/mcs/*
 
 The C# Compiler is released under the terms of the GNU GPL.
@@ -158,6 +148,15 @@
 
 -------------------------------------------------------------------------------
 
+mcs/class/System.Web.Extensions/System.Web.Script.Serialization/JSON/*
+
+Creative Commons Attribution 2.5 License
+
+As that license is not conform with the DFSG, those source files were deleted
+from the tarball.
+
+-------------------------------------------------------------------------------
+
 debian/detector/*
 
 The source package contains an additional tool called binfmt-detector-cli.

Modified: mono/trunk/debian/dh_clideps
===================================================================
--- mono/trunk/debian/dh_clideps	2007-12-20 21:59:04 UTC (rev 3528)
+++ mono/trunk/debian/dh_clideps	2007-12-20 22:01:04 UTC (rev 3529)
@@ -221,6 +221,7 @@
   my $found_exe = 0;
   $needs_net_1_0 = 0;
   $needs_net_2_0 = 0;
+  $needs_net_2_1 = 0;
   
   # for idempotency
   delsubstvar($package, "cli:Depends");
@@ -255,7 +256,9 @@
   my $vm_ref = "";
   if (!defined($dh{R_FLAG}) && $found_exe) {
     if ($clr eq "mono") {
-      if ($needs_net_2_0) {
+      if ($needs_net_2_1) {
+        $vm_ref = "mono-runtime (>= 1.2.6), ";
+      } elsif ($needs_net_2_0) {
         $vm_ref = "mono-runtime (>= 1.1.8.1), ";
       } elsif ($needs_net_1_0) {
         $vm_ref = "mono-runtime (>= 1.0), ";
@@ -268,7 +271,7 @@
   }
     
   if (-f "$tmp/usr/share/cli-common/packages.d/$package.installcligac") {
-    $vm_ref .= "cli-common (>= 0.4.0), ";
+    $vm_ref .= "cli-common (>= 0.5.1), ";
   }
     
     #$deps .= join(", ", "",
@@ -481,6 +484,8 @@
           $needs_net_2_0 = 1;
         } elsif ($ver eq "2.0.0.0") {
           $needs_net_2_0 = 1;
+        } elsif ($ver eq "2.1.0.0") {
+          $needs_net_2_1 = 1;
         } else {
           warning("Warning: Unknown mscorlib version: $ver!");
         }

Modified: mono/trunk/debian/libmono-system-web2.0-cil.install
===================================================================
--- mono/trunk/debian/libmono-system-web2.0-cil.install	2007-12-20 21:59:04 UTC (rev 3528)
+++ mono/trunk/debian/libmono-system-web2.0-cil.install	2007-12-20 22:01:04 UTC (rev 3529)
@@ -1,8 +1,4 @@
 debian/tmp/usr/lib/mono/gac/System.Web/2.0.0.0__*/
-debian/tmp/usr/lib/mono/gac/System.Web.Extensions/1.0.61025.0__*/
-debian/tmp/usr/lib/mono/gac/System.Web.Extensions.Design/1.0.61025.0__*/
 debian/tmp/usr/lib/mono/gac/System.Web.Services/2.0.0.0__*/
 debian/tmp/usr/lib/mono/2.0/System.Web.dll
-debian/tmp/usr/lib/mono/2.0/System.Web.Extensions.dll
-debian/tmp/usr/lib/mono/2.0/System.Web.Extensions.Design.dll
 debian/tmp/usr/lib/mono/2.0/System.Web.Services.dll

Modified: mono/trunk/debian/mono-1.0-devel.install
===================================================================
--- mono/trunk/debian/mono-1.0-devel.install	2007-12-20 21:59:04 UTC (rev 3528)
+++ mono/trunk/debian/mono-1.0-devel.install	2007-12-20 22:01:04 UTC (rev 3529)
@@ -14,7 +14,6 @@
 debian/tmp/usr/bin/mkbundle
 debian/tmp/usr/bin/mono-api-diff
 debian/tmp/usr/bin/mono-api-info
-debian/tmp/usr/bin/mono-service
 debian/tmp/usr/bin/mono-shlib-cop
 debian/tmp/usr/bin/mono-xmltool
 debian/tmp/usr/bin/monop