[Pkg-mono-svn-commits] rev 2517 - in non-group/nunit/trunk/debian:
. patches
Jelmer Vernooij
ctrlsoft-guest at costa.debian.org
Sun Apr 30 00:36:45 UTC 2006
Author: ctrlsoft-guest
Date: 2006-04-30 00:36:44 +0000 (Sun, 30 Apr 2006)
New Revision: 2517
Removed:
non-group/nunit/trunk/debian/patches/01_dir_seperator.dpatch
non-group/nunit/trunk/debian/patches/02_sign_nunit_util.dpatch
non-group/nunit/trunk/debian/patches/03_version_update.dpatch
Modified:
non-group/nunit/trunk/debian/patches/00list
non-group/nunit/trunk/debian/rules
Log:
Repackage against /actual/ 2.2.8, not 2.2.0 as I accidently did.
Modified: non-group/nunit/trunk/debian/patches/00list
===================================================================
--- non-group/nunit/trunk/debian/patches/00list 2006-04-29 23:31:44 UTC (rev 2516)
+++ non-group/nunit/trunk/debian/patches/00list 2006-04-30 00:36:44 UTC (rev 2517)
@@ -1,3 +0,0 @@
-01_dir_seperator.dpatch
-02_sign_nunit_util.dpatch
-03_version_update.dpatch
Deleted: non-group/nunit/trunk/debian/patches/01_dir_seperator.dpatch
===================================================================
--- non-group/nunit/trunk/debian/patches/01_dir_seperator.dpatch 2006-04-29 23:31:44 UTC (rev 2516)
+++ non-group/nunit/trunk/debian/patches/01_dir_seperator.dpatch 2006-04-30 00:36:44 UTC (rev 2517)
@@ -1,121 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_dir_seperator.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@
-
-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 @@
- -->
-
- <!-- 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>
Deleted: non-group/nunit/trunk/debian/patches/02_sign_nunit_util.dpatch
===================================================================
--- non-group/nunit/trunk/debian/patches/02_sign_nunit_util.dpatch 2006-04-29 23:31:44 UTC (rev 2516)
+++ non-group/nunit/trunk/debian/patches/02_sign_nunit_util.dpatch 2006-04-30 00:36:44 UTC (rev 2517)
@@ -1,32 +0,0 @@
-#! /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>
Deleted: non-group/nunit/trunk/debian/patches/03_version_update.dpatch
===================================================================
--- non-group/nunit/trunk/debian/patches/03_version_update.dpatch 2006-04-29 23:31:44 UTC (rev 2516)
+++ non-group/nunit/trunk/debian/patches/03_version_update.dpatch 2006-04-30 00:36:44 UTC (rev 2517)
@@ -1,200 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_version_update.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 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 19:32:58.000000000 +0200
-@@ -28,7 +28,7 @@
- // You can specify all the values or you can default the Revision and Build Numbers
- // by using the '*' as shown below:
-
--[assembly: AssemblyVersion("2.2.0.0")]
-+[assembly: AssemblyVersion("2.2.8.0")]
-
- //
- // In order to sign your assembly you must specify a key to use. Refer to the
-diff -ur nunit-2.2.8/extensions/AssemblyInfo.cs nunit-2.2.8-new/extensions/AssemblyInfo.cs
---- nunit-2.2.8/extensions/AssemblyInfo.cs 2004-08-06 18:35:12.000000000 +0200
-+++ nunit-2.2.8-new/extensions/AssemblyInfo.cs 2006-04-28 19:33:16.000000000 +0200
-@@ -26,7 +26,7 @@
- // You can specify all the values or you can default the Revision and Build Numbers
- // by using the '*' as shown below:
-
--[assembly: AssemblyVersion("2.2.0.0")]
-+[assembly: AssemblyVersion("2.2.8.0")]
-
- //
- // In order to sign your assembly you must specify a key to use. Refer to the
-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 19:33:18.000000000 +0200
-@@ -28,7 +28,7 @@
- // You can specify all the values or you can default the Revision and Build Numbers
- // by using the '*' as shown below:
-
--[assembly: AssemblyVersion("2.2.0.0")]
-+[assembly: AssemblyVersion("2.2.8.0")]
-
- //
- // In order to sign your assembly you must specify a key to use. Refer to the
-diff -ur nunit-2.2.8/nunit-console/AssemblyInfo.cs nunit-2.2.8-new/nunit-console/AssemblyInfo.cs
---- nunit-2.2.8/nunit-console/AssemblyInfo.cs 2004-08-06 18:35:12.000000000 +0200
-+++ nunit-2.2.8-new/nunit-console/AssemblyInfo.cs 2006-04-28 19:33:23.000000000 +0200
-@@ -55,7 +55,7 @@
- // You can specify all the values or you can default the Revision and Build Numbers
- // by using the '*' as shown below:
-
--[assembly: AssemblyVersion("2.2.0.0")]
-+[assembly: AssemblyVersion("2.2.8.0")]
-
- //
- // In order to sign your assembly you must specify a key to use. Refer to the
-diff -ur nunit-2.2.8/nunit-gui/AssemblyInfo.cs nunit-2.2.8-new/nunit-gui/AssemblyInfo.cs
---- nunit-2.2.8/nunit-gui/AssemblyInfo.cs 2004-08-06 18:35:12.000000000 +0200
-+++ nunit-2.2.8-new/nunit-gui/AssemblyInfo.cs 2006-04-28 19:33:28.000000000 +0200
-@@ -55,7 +55,7 @@
- // You can specify all the values or you can default the Revision and Build Numbers
- // by using the '*' as shown below:
-
--[assembly: AssemblyVersion("2.2.0.0")]
-+[assembly: AssemblyVersion("2.2.8.0")]
-
- //
- // In order to sign your assembly you must specify a key to use. Refer to the
-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 19:31:54.000000000 +0200
-@@ -64,7 +64,7 @@
- </if>
-
- <!-- Set up version for packaging (override as needed) -->
-- <property name="package.version" value="2.2.0"/>
-+ <property name="package.version" value="2.2.8"/>
- <!-- Root of the package file name -->
- <property name="package.name" value="${nant.project.name}-${package.version}"/>
- <!-- Package directory - will effect top level directory name in zips -->
-diff -ur nunit-2.2.8/samples/csharp/AssemblyInfo.cs nunit-2.2.8-new/samples/csharp/AssemblyInfo.cs
---- nunit-2.2.8/samples/csharp/AssemblyInfo.cs 2004-08-06 18:31:46.000000000 +0200
-+++ nunit-2.2.8-new/samples/csharp/AssemblyInfo.cs 2006-04-28 19:33:32.000000000 +0200
-@@ -26,7 +26,7 @@
- // You can specify all the values or you can default the Revision and Build Numbers
- // by using the '*' as shown below:
-
--[assembly: AssemblyVersion("2.2.0.0")]
-+[assembly: AssemblyVersion("2.2.8.0")]
-
- //
- // In order to sign your assembly you must specify a key to use. Refer to the
-diff -ur nunit-2.2.8/samples/money/AssemblyInfo.cs nunit-2.2.8-new/samples/money/AssemblyInfo.cs
---- nunit-2.2.8/samples/money/AssemblyInfo.cs 2004-08-06 18:35:12.000000000 +0200
-+++ nunit-2.2.8-new/samples/money/AssemblyInfo.cs 2006-04-28 19:33:36.000000000 +0200
-@@ -26,7 +26,7 @@
- // You can specify all the values or you can default the Revision and Build Numbers
- // by using the '*' as shown below:
-
--[assembly: AssemblyVersion("2.2.0.0")]
-+[assembly: AssemblyVersion("2.2.8.0")]
-
- //
- // In order to sign your assembly you must specify a key to use. Refer to the
-diff -ur nunit-2.2.8/samples/money-port/AssemblyInfo.cs nunit-2.2.8-new/samples/money-port/AssemblyInfo.cs
---- nunit-2.2.8/samples/money-port/AssemblyInfo.cs 2004-08-06 18:35:12.000000000 +0200
-+++ nunit-2.2.8-new/samples/money-port/AssemblyInfo.cs 2006-04-28 19:33:34.000000000 +0200
-@@ -26,7 +26,7 @@
- // You can specify all the values or you can default the Revision and Build Numbers
- // by using the '*' as shown below:
-
--[assembly: AssemblyVersion("2.2.0.0")]
-+[assembly: AssemblyVersion("2.2.8.0")]
-
- //
- // In order to sign your assembly you must specify a key to use. Refer to the
-diff -ur nunit-2.2.8/tests/AssemblyInfo.cs nunit-2.2.8-new/tests/AssemblyInfo.cs
---- nunit-2.2.8/tests/AssemblyInfo.cs 2004-08-06 18:35:12.000000000 +0200
-+++ nunit-2.2.8-new/tests/AssemblyInfo.cs 2006-04-28 19:33:39.000000000 +0200
-@@ -26,7 +26,7 @@
- // You can specify all the values or you can default the Revision and Build Numbers
- // by using the '*' as shown below:
-
--[assembly: AssemblyVersion("2.2.0.0")]
-+[assembly: AssemblyVersion("2.2.8.0")]
-
- //
- // In order to sign your assembly you must specify a key to use. Refer to the
-diff -ur nunit-2.2.8/tests/mock-assembly/AssemblyInfo.cs nunit-2.2.8-new/tests/mock-assembly/AssemblyInfo.cs
---- nunit-2.2.8/tests/mock-assembly/AssemblyInfo.cs 2004-08-06 18:32:22.000000000 +0200
-+++ nunit-2.2.8-new/tests/mock-assembly/AssemblyInfo.cs 2006-04-28 19:33:41.000000000 +0200
-@@ -26,7 +26,7 @@
- // You can specify all the values or you can default the Revision and Build Numbers
- // by using the '*' as shown below:
-
--[assembly: AssemblyVersion("2.2.0.0")]
-+[assembly: AssemblyVersion("2.2.8.0")]
-
- //
- // In order to sign your assembly you must specify a key to use. Refer to the
-diff -ur nunit-2.2.8/tests/nonamespace-assembly/AssemblyInfo.cs nunit-2.2.8-new/tests/nonamespace-assembly/AssemblyInfo.cs
---- nunit-2.2.8/tests/nonamespace-assembly/AssemblyInfo.cs 2004-08-06 18:35:12.000000000 +0200
-+++ nunit-2.2.8-new/tests/nonamespace-assembly/AssemblyInfo.cs 2006-04-28 19:33:44.000000000 +0200
-@@ -26,7 +26,7 @@
- // You can specify all the values or you can default the Revision and Build Numbers
- // by using the '*' as shown below:
-
--[assembly: AssemblyVersion("2.2.0.0")]
-+[assembly: AssemblyVersion("2.2.8.0")]
-
- //
- // In order to sign your assembly you must specify a key to use. Refer to the
-diff -ur nunit-2.2.8/tests/notestfixtures-assembly/AssemblyInfo.cs nunit-2.2.8-new/tests/notestfixtures-assembly/AssemblyInfo.cs
---- nunit-2.2.8/tests/notestfixtures-assembly/AssemblyInfo.cs 2004-08-06 18:35:12.000000000 +0200
-+++ nunit-2.2.8-new/tests/notestfixtures-assembly/AssemblyInfo.cs 2006-04-28 19:33:46.000000000 +0200
-@@ -26,7 +26,7 @@
- // You can specify all the values or you can default the Revision and Build Numbers
- // by using the '*' as shown below:
-
--[assembly: AssemblyVersion("2.2.0.0")]
-+[assembly: AssemblyVersion("2.2.8.0")]
-
- //
- // In order to sign your assembly you must specify a key to use. Refer to the
-diff -ur nunit-2.2.8/tests/timing-tests/AssemblyInfo.cs nunit-2.2.8-new/tests/timing-tests/AssemblyInfo.cs
---- nunit-2.2.8/tests/timing-tests/AssemblyInfo.cs 2004-08-06 18:35:12.000000000 +0200
-+++ nunit-2.2.8-new/tests/timing-tests/AssemblyInfo.cs 2006-04-28 19:33:48.000000000 +0200
-@@ -26,7 +26,7 @@
- // You can specify all the values or you can default the Revision and Build Numbers
- // by using the '*' as shown below:
-
--[assembly: AssemblyVersion("2.2.0.0")]
-+[assembly: AssemblyVersion("2.2.8.0")]
-
- //
- // In order to sign your assembly you must specify a key to use. Refer to the
-diff -ur nunit-2.2.8/uikit/AssemblyInfo.cs nunit-2.2.8-new/uikit/AssemblyInfo.cs
---- nunit-2.2.8/uikit/AssemblyInfo.cs 2004-08-06 18:35:12.000000000 +0200
-+++ nunit-2.2.8-new/uikit/AssemblyInfo.cs 2006-04-28 19:33:52.000000000 +0200
-@@ -55,7 +55,7 @@
- // You can specify all the values or you can default the Revision and Build Numbers
- // by using the '*' as shown below:
-
--[assembly: AssemblyVersion("2.2.0.0")]
-+[assembly: AssemblyVersion("2.2.8.0")]
-
- //
- // In order to sign your assembly you must specify a key to use. Refer to the
-diff -ur nunit-2.2.8/util/AssemblyInfo.cs nunit-2.2.8-new/util/AssemblyInfo.cs
---- nunit-2.2.8/util/AssemblyInfo.cs 2004-08-06 18:35:12.000000000 +0200
-+++ nunit-2.2.8-new/util/AssemblyInfo.cs 2006-04-28 19:33:57.000000000 +0200
-@@ -55,7 +55,7 @@
- // You can specify all the values or you can default the Revision and Build Numbers
- // by using the '*' as shown below:
-
--[assembly: AssemblyVersion("2.2.0.0")]
-+[assembly: AssemblyVersion("2.2.8.0")]
-
- //
- // In order to sign your assembly you must specify a key to use. Refer to the
Modified: non-group/nunit/trunk/debian/rules
===================================================================
--- non-group/nunit/trunk/debian/rules 2006-04-29 23:31:44 UTC (rev 2516)
+++ non-group/nunit/trunk/debian/rules 2006-04-30 00:36:44 UTC (rev 2517)
@@ -2,7 +2,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-BUILDDIR = build/mono-1.0/release/bin
+BUILDDIR = src/build/mono/1.0/release
export MONO_SHARED_DIR=$(CURDIR)
NANT = nant
@@ -12,14 +12,14 @@
build: patch build-stamp
build-stamp:
dh_testdir
- $(NANT) /f:nunit.build mono-1.0 release build
+ $(NANT) /f:src/nunit.build mono-1.0 release build
touch build-stamp
clean: unpatch
dh_testdir
dh_testroot
rm -rf build
- -$(NANT) /f:nunit.build mono-1.0 clean-all
+ -$(NANT) /f:src/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.extensions.dll \
+ $(BUILDDIR)/nunit.core.extensions.dll \
$(BUILDDIR)/nunit.framework.dll \
$(BUILDDIR)/nunit.mocks.dll \
$(BUILDDIR)/nunit.util.dll \
More information about the Pkg-mono-svn-commits
mailing list