[Pkg-mono-svn-commits] rev 2950 - in non-group/nunit/trunk/debian: . patches

[Jelmer Vernooij]

Author: ctrlsoft-guest
Date: 2007-02-21 22:43:21 +0100 (Wed, 21 Feb 2007)
New Revision: 2950

Removed:
   non-group/nunit/trunk/debian/patches/01_mono-2.0.dpatch
Modified:
   non-group/nunit/trunk/debian/changelog
   non-group/nunit/trunk/debian/control
   non-group/nunit/trunk/debian/patches/00list
Log:
- Remove no longer necessary patch for 2.0 build (now upstream)
- Handle new upstream release. 
- Fix build-depends on cli-common-dev



Modified: non-group/nunit/trunk/debian/changelog
===================================================================
--- non-group/nunit/trunk/debian/changelog	2007-02-21 08:56:57 UTC (rev 2949)
+++ non-group/nunit/trunk/debian/changelog	2007-02-21 21:43:21 UTC (rev 2950)
@@ -1,3 +1,9 @@
+nunit (2.2.9-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Jelmer Vernooij <jelmer at samba.org>  Wed, 21 Feb 2007 20:59:37 +0100
+
 nunit (2.2.8-2) unstable; urgency=low
 
   * Build mono-2.0 binaries.

Modified: non-group/nunit/trunk/debian/control
===================================================================
--- non-group/nunit/trunk/debian/control	2007-02-21 08:56:57 UTC (rev 2949)
+++ non-group/nunit/trunk/debian/control	2007-02-21 21:43:21 UTC (rev 2950)
@@ -2,7 +2,7 @@
 Section: devel
 Priority: optional
 Maintainer: Jelmer Vernooij <jelmer at samba.org>
-Build-Depends: debhelper (>= 4.0.0), dpatch
+Build-Depends: debhelper (>= 4.0.0), dpatch, cli-common-dev (>= 0.4.4)
 Build-Depends-Indep: mono-mcs (>= 1.0) | c-sharp-compiler, c-sharp-2.0-compiler, cli-common-dev (>= 0.4.0), libmono-dev (>= 1.0), nant (>= 0.84), mono-gac (>= 1.1.6), libmono-winforms1.0-cil, libmono-winforms2.0-cil
 Standards-Version: 3.6.2.1
 

Modified: non-group/nunit/trunk/debian/patches/00list
===================================================================
--- non-group/nunit/trunk/debian/patches/00list	2007-02-21 08:56:57 UTC (rev 2949)
+++ non-group/nunit/trunk/debian/patches/00list	2007-02-21 21:43:21 UTC (rev 2950)
@@ -1,2 +1 @@
-01_mono-2.0.dpatch
 02_gui.dpatch

Deleted: non-group/nunit/trunk/debian/patches/01_mono-2.0.dpatch
===================================================================
--- non-group/nunit/trunk/debian/patches/01_mono-2.0.dpatch	2007-02-21 08:56:57 UTC (rev 2949)
+++ non-group/nunit/trunk/debian/patches/01_mono-2.0.dpatch	2007-02-21 21:43:21 UTC (rev 2950)
@@ -1,64 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_mono-2.0.dpatch by Jelmer Vernooij <jelmer at samba.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix dir seperator for POSIX
-
- at DPATCH@
-
-diff -ur orig/src/nunit.build nunit-2.2.8/src/nunit.build
---- orig/src/nunit.build	2006-02-11 14:22:42.000000000 +0100
-+++ nunit-2.2.8/src/nunit.build	2006-06-20 12:57:23.000000000 +0200
-@@ -24,6 +24,7 @@
-         net-1.1   Microsoft .NET version 1.1
-         net-2.0   Microsoft .NET version 2.0
-         mono-1.0  Mono version 1.0 (or installed version)
-+		mono-2.0  Mono for .NET Framework 2.0
-     
-         Debug and release versions of each of these may be built
- 
-diff -ur orig/src/nunit.build.include nunit-2.2.8/src/nunit.build.include
---- orig/src/nunit.build.include	2006-04-21 16:29:58.000000000 +0200
-+++ nunit-2.2.8/src/nunit.build.include	2006-06-20 12:58:14.000000000 +0200
-@@ -39,6 +39,10 @@
-     <call target="set-mono-1.0-runtime-config"/>
-   </target>
- 
-+  <target name="mono-2.0" description="Set runtime to Mono">
-+    <call target="set-mono-2.0-runtime-config"/>
-+  </target>
-+
-   <!-- Init global settings -->
-   <target name="init-global-settings">
- 
-@@ -72,7 +76,7 @@
-     <!-- Frameworks supported by this build script. The first
-          installed framework found is the default for builds. --> 
-     <property name="supported.frameworks" 
--      value="net-1.1,net-1.0,net-2.0,mono-1.0"/>
-+      value="net-1.1,net-1.0,net-2.0,mono-1.0,mono-2.0"/>
-   
-     <!-- Visual Studio locations -->
-     <if test="${platform::is-win32()}">
-@@ -239,6 +243,21 @@
-     <property name="msi.runtime.suffix" value="-mono"/>
-   </target>
- 
-+  <target name="set-mono-2.0-runtime-config">
-+    <fail unless="${framework::sdk-exists( 'mono-2.0' )}"
-+      message="The Mono 2.0 SDK is not configured or not installed"/>
-+
-+    <property name="runtime.platform" value="mono"/>
-+    <property name="runtime.version" value="2.0"/>
-+    <property name="runtime.config" value="mono-2.0"/>
-+    <property name="build.mono" value="true"/>
-+    <property name="build.win32" value="false"/>
-+    <property name="nant.settings.currentframework" 
-+      value="mono-2.0"/>
-+    <property name="zip.runtime.suffix" value="-mono"/>
-+    <property name="msi.runtime.suffix" value="-mono"/>
-+  </target>
-+
-   <!-- Set up the build directory -->
-   <target name="set-build-dir"
-     depends="set-build-config,set-runtime-config">