[Pkg-mono-svn-commits] rev 3690 - in mono/trunk/debian: . patches

Mirco Bauer meebey at alioth.debian.org
Tue Aug 5 20:39:05 UTC 2008 

Author: meebey
Date: 2008-08-05 20:39:05 +0000 (Tue, 05 Aug 2008)
New Revision: 3690

Added:
   mono/trunk/debian/libmono-nunit2.2-cil.install
   mono/trunk/debian/patches/fix-mono-nunit.pc.in.dpatch
Modified:
   mono/trunk/debian/
   mono/trunk/debian/changelog
   mono/trunk/debian/control
   mono/trunk/debian/copyright
   mono/trunk/debian/patches/00list
   mono/trunk/debian/rules
Log:
  * debian/control
    debian/rules
    debian/libmono-nunit2.2-cil.install:
    + Added libmono-nunit2.2-cil package needed by packages like monodevelop
      and mono-tools, the nunit 2.4 API (libnunit2.4-cil) changed too much to
      port these packages. (thus urgency set to medium)
  * debian/patches/fix-mono-nunit.pc.in.dpatch:
    + Remove stupid relative path from prefix variable.




Property changes on: mono/trunk/debian
___________________________________________________________________
Name: svn:ignore
   - files
*.substvars
*.exe
libmono-accessibility1.0-cil
libmono-accessibility2.0-cil
libmono-bytefx0.7.6.1-cil
libmono-bytefx0.7.6.2-cil
libmono-c5-0.5-cil
libmono-c5-1.0-cil
libmono-cairo1.0-cil
libmono-cairo2.0-cil
libmono-corlib1.0-cil
libmono-corlib2.0-cil
libmono-cscompmgd7.0-cil
libmono-cscompmgd8.0-cil
libmono-data-tds1.0-cil
libmono-data-tds2.0-cil
libmono-dev
libmono-firebirdsql-cil
libmono-firebirdsql1.7-cil
libmono-ldap1.0-cil
libmono-ldap2.0-cil
libmono-microsoft-build2.0-cil
libmono-microsoft7.0-cil
libmono-microsoft8.0-cil
libmono-npgsql1.0-cil
libmono-npgsql2.0-cil
libmono-oracle1.0-cil
libmono-oracle2.0-cil
libmono-peapi1.0-cil
libmono-peapi2.0-cil
libmono-relaxng1.0-cil
libmono-relaxng2.0-cil
libmono-security1.0-cil
libmono-security2.0-cil
libmono-sharpzip0.6-cil
libmono-sharpzip0.84-cil
libmono-sharpzip2.6-cil
libmono-sharpzip2.84-cil
libmono-sqlite1.0-cil
libmono-sqlite2.0-cil
libmono-system-data1.0-cil
libmono-system-data2.0-cil
libmono-system-ldap1.0-cil
libmono-system-ldap2.0-cil
libmono-system-messaging1.0-cil
libmono-system-messaging2.0-cil
libmono-system-runtime1.0-cil
libmono-system-runtime2.0-cil
libmono-system-web1.0-cil
libmono-system-web2.0-cil
libmono-system1.0-cil
libmono-system2.0-cil
libmono-winforms1.0-cil
libmono-winforms2.0-cil
libmono0
libmono0.postinst.debhelper
libmono0.postrm.debhelper
libmono1.0-cil
libmono2.0-cil
mono
mono-assemblies-base
mono-classlib-1.0
mono-classlib-2.0
mono-common
mono-devel
mono-gac
mono-gmcs
mono-jay
mono-jit
mono-mbas
mono-mcs
mono-mjs
mono-runtime
mono-utils
patched
tmp

   + files
*.substvars
*.log
*.exe
libmono-accessibility1.0-cil
libmono-accessibility2.0-cil
libmono-bytefx0.7.6.1-cil
libmono-bytefx0.7.6.2-cil
libmono-c5-0.5-cil
libmono-c5-1.0-cil
libmono-cairo1.0-cil
libmono-cairo2.0-cil
libmono-corlib1.0-cil
libmono-corlib2.0-cil
libmono-cscompmgd7.0-cil
libmono-cscompmgd8.0-cil
libmono-data-tds1.0-cil
libmono-data-tds2.0-cil
libmono-db2-1.0-cil
libmono-dev
libmono-firebirdsql-cil
libmono-firebirdsql1.7-cil
libmono-i18n1.0-cil
libmono-i18n2.0-cil
libmono-ldap1.0-cil
libmono-ldap2.0-cil
libmono-microsoft-build2.0-cil
libmono-microsoft7.0-cil
libmono-microsoft8.0-cil
libmono-mozilla0.2-cil
libmono-npgsql1.0-cil
libmono-npgsql2.0-cil
libmono-nunit2.2-cil
libmono-oracle1.0-cil
libmono-oracle2.0-cil
libmono-peapi1.0-cil
libmono-peapi2.0-cil
libmono-relaxng1.0-cil
libmono-relaxng2.0-cil
libmono-security1.0-cil
libmono-security2.0-cil
libmono-sharpzip0.6-cil
libmono-sharpzip0.84-cil
libmono-sharpzip2.6-cil
libmono-sharpzip2.84-cil
libmono-sqlite1.0-cil
libmono-sqlite2.0-cil
libmono-system-data1.0-cil
libmono-system-data2.0-cil
libmono-system-ldap1.0-cil
libmono-system-ldap2.0-cil
libmono-system-messaging1.0-cil
libmono-system-messaging2.0-cil
libmono-system-runtime1.0-cil
libmono-system-runtime2.0-cil
libmono-system-web1.0-cil
libmono-system-web2.0-cil
libmono-system1.0-cil
libmono-system2.0-cil
libmono-system2.1-cil
libmono-winforms1.0-cil
libmono-winforms2.0-cil
libmono0
libmono0.postinst.debhelper
libmono0.postrm.debhelper
libmono0-dbg
libmono1.0-cil
libmono2.0-cil
libmono-corlib2.1-cil
mono-1.0-service
mono-2.0-service
mono-1.0-devel
mono-2.0-devel
mono
mono-dbg
mono-assemblies-base
mono-classlib-1.0
mono-classlib-2.0
mono-common
mono-devel
mono-gac
mono-gmcs
mono-jay
mono-jit
mono-jit-dbg
mono-mbas
mono-mcs
mono-mjs
mono-runtime
mono-smcs
mono-utils
mono-xbuild
patched
prj2make-sharp
tmp


Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog	2008-07-16 16:59:07 UTC (rev 3689)
+++ mono/trunk/debian/changelog	2008-08-05 20:39:05 UTC (rev 3690)
@@ -1,5 +1,13 @@
-mono (1.9.1+dfsg-3~pre1) unstable; urgency=low
+mono (1.9.1+dfsg-3~pre2) unstable; urgency=medium
 
+  * debian/control
+    debian/rules
+    debian/libmono-nunit2.2-cil.install:
+    + Added libmono-nunit2.2-cil package needed by packages like monodevelop
+      and mono-tools, the nunit 2.4 API (libnunit2.4-cil) changed too much to
+      port these packages. (thus urgency set to medium)
+  * debian/patches/fix-mono-nunit.pc.in.dpatch:
+    + Remove stupid relative path from prefix variable.
   * debian/shlibs.local:
     + Updated for the Mono 1.9 release.
   * debian/rules:
@@ -17,31 +25,21 @@
       useless and makes backports and Ubuntu integration easier.
     + Added Conflicts on mono-classlib-{1,2}.0 (<< 1.1.13.6) and
       mono-classlib-{1,2}.0-dbg to ensure they are removed on all systems and
-      the transition is finished long time ago.
+      the transition was finished long time ago.
   * debian/patches/fix_Dictionary_preventing_GC_r102114.dpatch:
     Clear empty slots in keySlots and valueSlots. Otherwise the garbage
     collector cannot reclaim the referenced key/value.
     (patch taken from upstream SVN revision 102114)
   * debian/patches/fix_TdsConnectionPool_svn.dpatch:
-    Remove unnecessary locks and code refactoring.
-    Update according to the new return type of
-    TdsConnectionPool.GetConnectionPool().
-    Added member to keep track of pool status.
-    Do not call tds.Reset () as it is already done in the connection pool.
-    Honor timeout and throw appropriate exception when connections are not
-    available.
-    When pooled connection cannot be reset, remove it from pool and allow slot
-    to be re-used for a newly established.
-    When pool is full, and no connection becomes available before the connect
-    timeout has elapsed, then throw an InvalidOperationException.
+    + Don't leak connections in the pool, would cause an infinitely timeout.
     (patch taken from upstream SVN revisions 105424, 105432, 105433, 105719,
      106448 and 107325)
   * debian/libmono-system1.0-cil.clideps-override
     debian/libmono-system2.0-cil.clideps-override:
-    + libcupsys2 package was renamed to libcups2, moves the dependeny on
-      libcups2 to suggests.
+    + libcupsys2 package was renamed to libcups2, moving the dependeny on
+      libcups2 to suggests (as it was before).
 
- -- Mirco Bauer <meebey at debian.org>  Wed, 18 Jun 2008 01:05:00 +0200
+ -- Mirco Bauer <meebey at debian.org>  Tue, 05 Aug 2008 21:46:48 +0200
 
 mono (1.9.1+dfsg-2) unstable; urgency=medium
 

Modified: mono/trunk/debian/control
===================================================================
--- mono/trunk/debian/control	2008-07-16 16:59:07 UTC (rev 3689)
+++ mono/trunk/debian/control	2008-08-05 20:39:05 UTC (rev 3690)
@@ -187,6 +187,23 @@
  This package contains the implementation of the WebControl class based on the
  Mozilla engine using libgluezilla.
 
+Package: libmono-nunit2.2-cil
+Section: libs
+Architecture: all
+Provides: libnunit2.2-cil
+Conflicts: libnunit2.2-cil
+Depends: ${cli:Depends}
+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-corlib1.0-cil
 Section: libs
 Architecture: all

Modified: mono/trunk/debian/copyright
===================================================================
--- mono/trunk/debian/copyright	2008-07-16 16:59:07 UTC (rev 3689)
+++ mono/trunk/debian/copyright	2008-08-05 20:39:05 UTC (rev 3690)
@@ -157,6 +157,35 @@
 
 -------------------------------------------------------------------------------
 
+mcs/nunit20/*
+
+Copyright (C) 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov,
+                        Charlie Poole
+Copyright (C) 2000-2004 Philip A. Craig
+
+This software is provided 'as-is', without any express or implied warranty. In
+no event will the authors be held liable for any damages arising from the use
+of this software.
+
+Permission is granted to anyone to use this software for any purpose, including
+commercial applications, and to alter it and redistribute it freely, subject to
+the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim
+   that you wrote the original software. If you use this software in a product,
+   an acknowledgment (see the following) in the product documentation is
+   required.
+
+Portions Copyright (C) 2002-2004 James W. Newkirk, Michael C. Two,
+Alexei A. Vorontsov, Charlie Poole or Copyright (C) 2000-2004 Philip A. Craig
+
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source distribution.
+
+-------------------------------------------------------------------------------
+
 debian/detector/*
 
 The source package contains an additional tool called binfmt-detector-cli.

Added: mono/trunk/debian/libmono-nunit2.2-cil.install
===================================================================
--- mono/trunk/debian/libmono-nunit2.2-cil.install	                        (rev 0)
+++ mono/trunk/debian/libmono-nunit2.2-cil.install	2008-08-05 20:39:05 UTC (rev 3690)
@@ -0,0 +1,4 @@
+debian/tmp/usr/lib/mono/gac/nunit.*/2.2.*/
+debian/tmp/usr/lib/mono/1.0/nunit.*.dll
+debian/tmp/usr/lib/mono/2.0/nunit.*.dll
+debian/tmp/usr/lib/pkgconfig/mono-nunit.pc

Modified: mono/trunk/debian/patches/00list
===================================================================
--- mono/trunk/debian/patches/00list	2008-07-16 16:59:07 UTC (rev 3689)
+++ mono/trunk/debian/patches/00list	2008-08-05 20:39:05 UTC (rev 3690)
@@ -3,6 +3,7 @@
 firebird-fbclient
 fix-mono.pc.in
 fix-mono-cairo.pc.in
+fix-mono-nunit.pc.in
 fix_BigInteger_overflow_CVE-2007-5197
 fix_implicit_pointer_conversions
 method-signature-testing

Added: mono/trunk/debian/patches/fix-mono-nunit.pc.in.dpatch
===================================================================
--- mono/trunk/debian/patches/fix-mono-nunit.pc.in.dpatch	                        (rev 0)
+++ mono/trunk/debian/patches/fix-mono-nunit.pc.in.dpatch	2008-08-05 20:39:05 UTC (rev 3690)
@@ -0,0 +1,16 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-mono-nunit.pc.in.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad mono-1.9.1+dfsg~/scripts/mono-nunit.pc.in mono-1.9.1+dfsg/scripts/mono-nunit.pc.in
+--- mono-1.9.1+dfsg~/scripts/mono-nunit.pc.in	2007-11-08 23:07:03.000000000 +0100
++++ mono-1.9.1+dfsg/scripts/mono-nunit.pc.in	2008-08-05 22:31:51.000000000 +0200
+@@ -1,4 +1,4 @@
+-prefix=${pcfiledir}/../..
++prefix=@prefix@
+ exec_prefix=${prefix}
+ libdir=${exec_prefix}/lib
+ 


Property changes on: mono/trunk/debian/patches/fix-mono-nunit.pc.in.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: mono/trunk/debian/rules
===================================================================
--- mono/trunk/debian/rules	2008-07-16 16:59:07 UTC (rev 3689)
+++ mono/trunk/debian/rules	2008-08-05 20:39:05 UTC (rev 3690)
@@ -194,11 +194,12 @@
 	dh_testroot
 
 	# we do not want nunit, it's a forked version
-	rm -f debian/tmp/usr/lib/pkgconfig/mono-nunit.pc
-	rm -f debian/tmp/usr/lib/mono/1.0/nunit*
-	rm -f debian/tmp/usr/lib/mono/2.0/nunit*
-	rm -rf debian/tmp/usr/lib/mono/gac/nunit*
-	rm -f debian/tmp/usr/bin/nunit*
+	# nunit 2.4 API has changed too much, thus needing this nunit 2.2 now
+	#rm -f debian/tmp/usr/lib/pkgconfig/mono-nunit.pc
+	#rm -f debian/tmp/usr/lib/mono/1.0/nunit*
+	#rm -f debian/tmp/usr/lib/mono/2.0/nunit*
+	#rm -rf debian/tmp/usr/lib/mono/gac/nunit*
+	#rm -f debian/tmp/usr/bin/nunit*
 	# upstream forgot to remove this one
 	rm -f debian/tmp/usr/bin/mbas
 	# don't want docs of bundled libgc

More information about the Pkg-mono-svn-commits mailing list