[Pkg-mono-svn-commits] rev 2492 - in non-group/nunit/trunk/debian:
. patches
Jelmer Vernooij
ctrlsoft-guest at costa.debian.org
Fri Apr 28 16:52:49 UTC 2006
Author: ctrlsoft-guest
Date: 2006-04-28 16:52:48 +0000 (Fri, 28 Apr 2006)
New Revision: 2492
Added:
non-group/nunit/trunk/debian/patches/02_sign_nunit_util.dpatch
Modified:
non-group/nunit/trunk/debian/control
non-group/nunit/trunk/debian/patches/00list
non-group/nunit/trunk/debian/patches/01_dir_seperator.dpatch
non-group/nunit/trunk/debian/rules
Log:
Update patches for 2.2.8
Modified: non-group/nunit/trunk/debian/control
===================================================================
--- non-group/nunit/trunk/debian/control 2006-04-28 16:27:39 UTC (rev 2491)
+++ non-group/nunit/trunk/debian/control 2006-04-28 16:52:48 UTC (rev 2492)
@@ -2,7 +2,8 @@
Section: devel
Priority: optional
Maintainer: Jelmer Vernooij <jelmer at samba.org>
-Build-Depends-Indep: debhelper (>= 4.0.0), mono-mcs (>= 1.0) | c-sharp-compiler, cli-common (>= 0.2.0), libmono-dev (>= 1.0), nant (>= 0.84), mono-gac (>= 1.1.6), dpatch
+Build-Depends: debhelper (>= 4.0.0), dpatch
+Build-Depends-Indep: mono-mcs (>= 1.0) | c-sharp-compiler, cli-common (>= 0.4.0), libmono-dev (>= 1.0), nant (>= 0.84), mono-gac (>= 1.1.6)
Standards-Version: 3.6.2.1
Package: nunit-console
Modified: non-group/nunit/trunk/debian/patches/00list
===================================================================
--- non-group/nunit/trunk/debian/patches/00list 2006-04-28 16:27:39 UTC (rev 2491)
+++ non-group/nunit/trunk/debian/patches/00list 2006-04-28 16:52:48 UTC (rev 2492)
@@ -1 +1,2 @@
01_dir_seperator.dpatch
+02_sign_nunit_util.dpatch
Modified: non-group/nunit/trunk/debian/patches/01_dir_seperator.dpatch
===================================================================
--- non-group/nunit/trunk/debian/patches/01_dir_seperator.dpatch 2006-04-28 16:27:39 UTC (rev 2491)
+++ non-group/nunit/trunk/debian/patches/01_dir_seperator.dpatch 2006-04-28 16:52:48 UTC (rev 2492)
@@ -6,15 +6,116 @@
@DPATCH@
-diff -ur nunit-2.2.6/src/ClientUtilities/util/nunit.util.build nunit-2.2.6-new/src/ClientUtilities/util/nunit.util.build
---- nunit-2.2.6/src/ClientUtilities/util/nunit.util.build 2005-12-09 08:08:12.000000000 +1300
-+++ nunit-2.2.6-new/src/ClientUtilities/util/nunit.util.build 2006-01-24 12:39:00.000000000 +1300
-@@ -1,7 +1,7 @@
- <?xml version="1.0"?>
- <project name="NUnit.Util" default="build">
+diff -ur nunit-2.2.8/core/AssemblyInfo.cs nunit-2.2.8-new/core/AssemblyInfo.cs
+--- nunit-2.2.8/core/AssemblyInfo.cs 2004-08-06 18:35:12.000000000 +0200
++++ nunit-2.2.8-new/core/AssemblyInfo.cs 2006-04-28 18:43:52.000000000 +0200
+@@ -58,6 +58,6 @@
+ #if !StronglyNamedAssembly
+ [assembly: AssemblyDelaySign(false)]
+ #else
+-[assembly: AssemblyKeyFile("..\\..\\..\\nunit.key")]
++[assembly: AssemblyKeyFile("../../../nunit.key")]
+ [assembly: AssemblyKeyName("")]
+ #endif
+diff -ur nunit-2.2.8/framework/AssemblyInfo.cs nunit-2.2.8-new/framework/AssemblyInfo.cs
+--- nunit-2.2.8/framework/AssemblyInfo.cs 2004-08-06 18:35:12.000000000 +0200
++++ nunit-2.2.8-new/framework/AssemblyInfo.cs 2006-04-28 18:43:19.000000000 +0200
+@@ -58,6 +58,6 @@
+ #if !StronglyNamedAssembly
+ [assembly: AssemblyDelaySign(false)]
+ #else
+-[assembly: AssemblyKeyFile("..\\..\\..\\nunit.key")]
++[assembly: AssemblyKeyFile("../../../nunit.key")]
+ [assembly: AssemblyKeyName("")]
+ #endif
+diff -ur nunit-2.2.8/nunit.build nunit-2.2.8-new/nunit.build
+--- nunit-2.2.8/nunit.build 2004-08-08 13:38:30.000000000 +0200
++++ nunit-2.2.8-new/nunit.build 2006-04-28 18:42:39.000000000 +0200
+@@ -42,8 +42,8 @@
+ -->
-- <include buildfile="..\..\nunit.project.include"/>
-+ <include buildfile="../../nunit.project.include"/>
-
- <property name="current.build.output" value="nunit.util"/>
+ <!-- Global settings and defaults -->
+- <property name="project.build.dir" value="${nant.project.basedir}\build"/>
+- <property name="project.package.dir" value="${nant.project.basedir}\package"/>
++ <property name="project.build.dir" value="${nant.project.basedir}/build"/>
++ <property name="project.package.dir" value="${nant.project.basedir}/package"/>
+ <!-- List supported frameworks and flag which ones are available -->
+ <property name="frameworks" value="net-1.0,net-1.1,mono-1.0"/>
+@@ -240,19 +240,19 @@
+ <copy file="nunit.key" todir="${project.build.dir}"/>
+
+ <!-- Build everything except the samples -->
+- <nant buildfile="framework\nunit.framework.build" target="build"/>
+- <nant buildfile="core\nunit.core.build" target="build"/>
+- <nant buildfile="extensions\nunit.extensions.build" target="build"/>
+- <nant buildfile="util\nunit.util.build" target="build"/>
+- <nant buildfile="nunit-console\nunit-console.build" target="build"/>
+- <nant buildfile="mocks\nunit.mocks.build" target="build"/>
++ <nant buildfile="framework/nunit.framework.build" target="build"/>
++ <nant buildfile="core/nunit.core.build" target="build"/>
++ <nant buildfile="extensions/nunit.extensions.build" target="build"/>
++ <nant buildfile="util/nunit.util.build" target="build"/>
++ <nant buildfile="nunit-console/nunit-console.build" target="build"/>
++ <nant buildfile="mocks/nunit.mocks.build" target="build"/>
+
+ <!-- Build Win32-only projects -->
+ <if test="${build.win32}">
+- <nant buildfile="uikit\nunit.uikit.build" target="build"/>
+- <nant buildfile="nunit-gui\nunit-gui.build" target="build"/>
++ <nant buildfile="uikit/nunit.uikit.build" target="build"/>
++ <nant buildfile="nunit-gui/nunit-gui.build" target="build"/>
+ <!-- Tests need uikit, so build them last -->
+- <nant buildfile="tests\tests.build" target="build"/>
++ <nant buildfile="tests/tests.build" target="build"/>
+ </if>
+
+ <!-- Tests are not compiling under mono, so they are temporarily moved above -->
+@@ -261,7 +261,7 @@
+
+ <!-- Build sample programs -->
+ <target name="samples" depends="build" description="Build sample programs">
+- <nant buildfile="samples\samples.build" target="build"/>
++ <nant buildfile="samples/samples.build" target="build"/>
+ </target>
+
+ <target name="build-msi" depends="set-build-dir,set-package-config"
+@@ -471,21 +471,21 @@
+ </copy>
+
+ <!-- Copy individual projects -->
+- <nant buildfile="framework\nunit.framework.build" target="copy"/>
+- <nant buildfile="core\nunit.core.build" target="copy"/>
+- <nant buildfile="extensions\nunit.extensions.build" target="copy"/>
+- <nant buildfile="util\nunit.util.build" target="copy"/>
+- <nant buildfile="nunit-console\nunit-console.build" target="copy"/>
+- <nant buildfile="mocks\nunit.mocks.build" target="copy"/>
+- <nant buildfile="samples\samples.build" target="copy-all"/>
++ <nant buildfile="framework/nunit.framework.build" target="copy"/>
++ <nant buildfile="core/nunit.core.build" target="copy"/>
++ <nant buildfile="extensions/nunit.extensions.build" target="copy"/>
++ <nant buildfile="util/nunit.util.build" target="copy"/>
++ <nant buildfile="nunit-console/nunit-console.build" target="copy"/>
++ <nant buildfile="mocks/nunit.mocks.build" target="copy"/>
++ <nant buildfile="samples/samples.build" target="copy-all"/>
+
+ <!-- Copy win32-only projects -->
+ <if test="${build.win32}">
+- <nant buildfile="uikit\nunit.uikit.build" target="copy"/>
+- <nant buildfile="nunit-gui\nunit-gui.build" target="copy"/>
++ <nant buildfile="uikit/nunit.uikit.build" target="copy"/>
++ <nant buildfile="nunit-gui/nunit-gui.build" target="copy"/>
+ </if>
+
+- <nant buildfile="tests\tests.build" target="copy-all"/>
++ <nant buildfile="tests/tests.build" target="copy-all"/>
+ </target>
+
+ <!-- Register core and framework in the gac -->
+@@ -620,4 +620,4 @@
+ <echo> VS 2003: ${vs.2003.path}</echo>
+ </target>
+
+-</project>
+\ No newline at end of file
++</project>
Added: non-group/nunit/trunk/debian/patches/02_sign_nunit_util.dpatch
===================================================================
--- non-group/nunit/trunk/debian/patches/02_sign_nunit_util.dpatch 2006-04-28 16:27:39 UTC (rev 2491)
+++ non-group/nunit/trunk/debian/patches/02_sign_nunit_util.dpatch 2006-04-28 16:52:48 UTC (rev 2492)
@@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_sign_nunit_util.dpatch by <jelmer at samba.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix dir seperator for POSIX
+
+ at DPATCH@
+
+--- nunit2.2-2.2.0/util/AssemblyInfo.cs 2004-08-06 18:35:12.000000000 +0200
++++ nunit2.2-2.2.0-new/util/AssemblyInfo.cs 2006-04-26 00:34:28.000000000 +0200
+@@ -82,6 +82,9 @@
+ // (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
+ // documentation for more information on this.
+ //
++#if !StronglyNamedAssembly
+ [assembly: AssemblyDelaySign(false)]
+-[assembly: AssemblyKeyFile("")]
++#else
++[assembly: AssemblyKeyFile("../../../nunit.key")]
+ [assembly: AssemblyKeyName("")]
++#endif
+--- nunit2.2-2.2.0/util/nunit.util.build 2004-07-19 15:23:06.000000000 +0200
++++ nunit2.2-2.2.0-new/util/nunit.util.build 2006-04-26 00:34:50.000000000 +0200
+@@ -12,7 +12,7 @@
+
+ <target name="build" depends="copy">
+ <csc target="library" output="${bin.dir}/nunit.util.dll"
+- debug="${build.debug}" define="${build.defines.csc}">
++ debug="${build.debug}" define="${build.defines.csc},StronglyNamedAssembly">
+ <sources basedir="${src.dir}/util">
+ <include name="**/*.cs"/>
+ </sources>
Property changes on: non-group/nunit/trunk/debian/patches/02_sign_nunit_util.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: non-group/nunit/trunk/debian/rules
===================================================================
--- non-group/nunit/trunk/debian/rules 2006-04-28 16:27:39 UTC (rev 2491)
+++ non-group/nunit/trunk/debian/rules 2006-04-28 16:52:48 UTC (rev 2492)
@@ -2,7 +2,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-BUILDDIR = src/build/mono/1.0/release
+BUILDDIR = build/mono-1.0/release/bin
export MONO_SHARED_DIR=$(CURDIR)
NANT = nant
@@ -12,14 +12,14 @@
build: patch build-stamp
build-stamp:
dh_testdir
- $(NANT) /f:src/nunit.build mono-1.0 release build
+ $(NANT) /f:nunit.build mono-1.0 release build
touch build-stamp
clean: unpatch
dh_testdir
dh_testroot
rm -rf build
- -$(NANT) /f:src/nunit.build mono-1.0 clean-all
+ -$(NANT) /f:nunit.build mono-1.0 clean-all
rm -f build-stamp
rm -rf .wapi
dh_clean
@@ -34,7 +34,7 @@
gacutil -root debian/libnunit2.2.6-cil/usr/lib -i $(BUILDDIR)/nunit.util.dll
dh_install -p nunit-console $(BUILDDIR)/nunit-console*.dll $(BUILDDIR)/nunit-console.exe* /usr/lib/nunit/
dh_install -p libnunit2.2.6-cil $(BUILDDIR)/nunit.core.dll \
- $(BUILDDIR)/nunit.core.extensions.dll \
+ $(BUILDDIR)/nunit.extensions.dll \
$(BUILDDIR)/nunit.framework.dll \
$(BUILDDIR)/nunit.mocks.dll \
$(BUILDDIR)/nunit.util.dll \
More information about the Pkg-mono-svn-commits
mailing list