--- nant-0.85.dfsg1.orig/debian/compat +++ nant-0.85.dfsg1/debian/compat @@ -0,0 +1 @@ +7 --- nant-0.85.dfsg1.orig/debian/copyright +++ nant-0.85.dfsg1/debian/copyright @@ -0,0 +1,34 @@ +This package was debianized by John Goerzen on +Thu, 26 Aug 2004 10:27:38 -0500. + +It was downloaded from http://nant.sf.net/ + +Copyright (C) 2003-2006 Gerry Shaw + +License: +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +In addition, as a special exception, Gerry Shaw gives permission to link the +code of this program with the Microsoft .NET library (or with modified versions +of Microsoft .NET library that use the same license as the Microsoft .NET +library), and distribute linked combinations including the two. You must obey +the GNU General Public License in all respects for all of the code used other +than the Microsoft .NET library. If you modify this file, you may extend this +exception to your version of the file, but you are not obligated to do so. If +you do not wish to do so, delete this exception statement from your version. + +Debian users can find the GNU General Public License in +/usr/share/common-licenses/GPL. + --- nant-0.85.dfsg1.orig/debian/changelog +++ nant-0.85.dfsg1/debian/changelog @@ -0,0 +1,389 @@ +nant (0.85.dfsg1-8) unstable; urgency=low + + * debian/patches/006-nant-dont-build-ndoc-support.dpatch, + debian/control: + + Remove support for ndoc task - we don't use it, and it pulls + in undesirable dependencies. This also breaks a nasty circular + build-dep on libndoc1.3-cil, which is built by nant + + -- Jo Shields Mon, 15 Jun 2009 20:12:47 +0100 + +nant (0.85.dfsg1-7) unstable; urgency=low + + * Upload to unstable. + + -- Mirco Bauer Thu, 26 Feb 2009 00:23:47 +0100 + +nant (0.85.dfsg1-6) experimental; urgency=low + + * debian/control: + + removed 1.0 Build-Dependencies + + using mono-devel instead of mono-gmcs in runtime Depends + + debhelper dependency bumped to >= 7 + + added ${misc:Depends} to nant + * debian/patches/: + + 000-fix_build_system.dpatch added + * debian/rules: + + Rewritten and switched to dh7-style + * debian/compat bumped to 7 + * debian/watch updated to version 3 + + -- David Paleino Wed, 03 Dec 2008 17:46:17 +0100 + +nant (0.85.dfsg1-5) unstable; urgency=low + + [ David Paleino ] + * debian/control: + + Removed Dave Beckett from Uploaders. + + [ Mirco Bauer ] + * debian/control: + + Enhanced package description. + + Added Vcs-Browser field. + + Bumped cli-common-dev build-dep to >= 0.5.4 as we are using + dh_clistrip and dh_clifixperms from it. + * debian/rules: + + Removed -m paramater to dh_clideps call, as it doesn't know such + parameter. + + Added dh_clistrip and dh_clifixperms calls. + + Removed find call to fix file permissions, as dh_clifixperms takes now + care of this. + + Removed dh_shlibdeps call as this package doesn't contain native + binaries or libraries. + + Delete examples/StyleTask/SimpleExtensionObject/SimpleExtension.dll + before the build to force nant to rebuild it (as the file is shipped in + the tarball). + * debian/patches/005-nant-ExternalProgramBase-race.dpatch: + + New patch to prevent Mono detection failure due to a race on SMP + machines. Based on upstream fix for bug 1733671 (Closes: #483073) + (thanks goes to Y Giridhar Appaji Nag for + investigation and providing the dpatch) + + -- Mirco Bauer Thu, 16 Oct 2008 22:50:40 +0200 + +nant (0.85.dfsg1-4) unstable; urgency=low + + * Use right NDoc directory. (Closes: #492300) + + -- Jelmer Vernooij Fri, 25 Jul 2008 04:29:19 +0200 + +nant (0.85.dfsg1-3) unstable; urgency=low + + * Fix build dependency on renamed libndoc1.3-cil. (Closes: #490322) + + -- Jelmer Vernooij Tue, 22 Jul 2008 23:34:19 +0200 + +nant (0.85.dfsg1-2) unstable; urgency=low + + * Build against version 2.4 of nunit. + * Bump standards version to 3.8.0. + * Cope with dfsg mangling in watch file. + + -- Jelmer Vernooij Sat, 14 Jun 2008 16:59:38 +0200 + +nant (0.85.dfsg1-1) unstable; urgency=low + + * Remove binaries without source. (Closes: #374634) + + -- Jelmer Vernooij Mon, 26 May 2008 23:12:50 +0200 + +nant (0.85-3) unstable; urgency=low + + * Changed maintainer to Debian CLI Applications Team. (Closes: #477064) + * Add myself as uploader. + * Use newer nunit (libnunit2.2.6-cil) + * Add patch to work around obsolete + System.Reflection.Assembly.LoadWithPartialName(). (Closes: #475213) + + -- Jelmer Vernooij Mon, 26 May 2008 21:15:12 +0200 + +nant (0.85-2) unstable; urgency=low + + * Depend on mono-gmcs (Closes: #408395) + * Added patch 001-nant-task-cs-InitializeElement.dpatch + to get around Mono compiler turning a former warning into an error. + Again. (Closes: #422838) + + -- Dave Beckett Sun, 24 Jun 2007 12:15:53 -0700 + +nant (0.85-1) unstable; urgency=low + + * New upstream release + * It only took 2 years 11 months to go from 0.84 to 0.85 + * Build depend indep on cli-common-dev (>= 0.4.4) + + -- Dave Beckett Sun, 15 Oct 2006 00:25:05 -0700 + +nant (0.84+0.85-rc4-1) unstable; urgency=low + + * New upstream release + * Acknowledge NMU (Closes: #372588) + * Standards-Version 3.7.2 + * Update to latest CLI policy package split. Build-Depends-Indep: on + cli-common-dev, libmono-winforms1.0-cil, libmono-winforms2.0-cil and + mono-gmcs to get 1.0 and 2.0 packages + * Removed patches no longer needed: + - 01-AssemblyInfoTask.cs.patch + - 02-ScriptTask.cs.patch + - 03-XmlResultFormatter.cs.patch + - 04-SourceControl.patch + - 05-ExceptionTest.cs + + -- Dave Beckett Mon, 12 Jun 2006 23:30:36 -0700 + +nant (0.84+0.85-rc3-10.1) unstable; urgency=low + + * Non-maintainer upload. + * Add a build-dep on libmono-winforms1.0-cil to fix FTBFS, thanks Daniel + Schepler. (Closes: #370163) + [debian/control] + + -- Loic Minier Sat, 10 Jun 2006 14:37:38 +0200 + +nant (0.84+0.85-rc3-10) unstable; urgency=low + + * Remove call to dh_makeclilibs since nant has no public GAC installed + libraries (Closes: 361976) + + -- Dave Beckett Tue, 11 Apr 2006 09:09:30 -0700 + +nant (0.84+0.85-rc3-9) unstable; urgency=low + + * Update debian/watch again to use http://qa.debian.org/watch/sf.php to + try to follow sourceforge updates. + * Depend on cli-common (>= 0.2.0) + + -- Dave Beckett Sat, 4 Feb 2006 23:03:29 -0800 + +nant (0.84+0.85-rc3-8) unstable; urgency=low + + * Depend on libmono-dev to get mono.pc at runtime. + + -- Dave Beckett Mon, 20 Jun 2005 10:10:51 +0100 + +nant (0.84+0.85-rc3-7) unstable; urgency=low + + * Removed obsolete Build-Depend: on mono-jit and mono-utils + * Fixed debian/watch file + * Added patches from CVS HEAD to build with mono 1.1.8 packages: + - 01-AssemblyInfoTask.cs.patch + - 02-ScriptTask.cs.patch + - 03-XmlResultFormatter.cs.patch + - 04-SourceControl.patch + - 05-ExceptionTest.cs + + -- Dave Beckett Sat, 18 Jun 2005 14:49:10 +0100 + +nant (0.84+0.85-rc3-6) unstable; urgency=low + + * Upload to unstable now that mono is in unstable + * Added debian/watch file + + -- Dave Beckett Thu, 16 Jun 2005 11:52:30 +0100 + +nant (0.84+0.85-rc3-5) experimental; urgency=low + + * Tiny nant.1 fix + * Checked pending bugs that were fixed with new upstream or packaging: + - Nant builds reliably inside pbuilder using the mono 1.1.x + experimental debs (Closes: #300416). + - The mono resgen.exe is now correctly invoked by the + task (Closes: #283740) + + -- Dave Beckett Fri, 20 May 2005 19:02:36 +0100 + +nant (0.84+0.85-rc3-4) experimental; urgency=low + + * Make /usr/bin/nant exec cli and NAnt.exe rather than use old cli-wrapper + * Wrote a manual page for nant + + -- Dave Beckett Mon, 16 May 2005 12:31:10 +0100 + +nant (0.84+0.85-rc3-3) experimental; urgency=low + + * Remove debian/resgen and update debian/dirs to new mono conventions + * Depend on mono 1.1.6 + + -- Dave Beckett Mon, 16 May 2005 11:22:25 +0100 + +nant (0.84+0.85-rc3-2) experimental; urgency=low + + * Rebuild against mono 1.1 experimental + + -- Dave Beckett Mon, 16 May 2005 10:29:31 +0100 + +nant (0.84+0.85-rc3-1) unstable; urgency=low + + * New upstream version. + + -- Dave Beckett Wed, 20 Apr 2005 20:51:57 +0100 + +nant (0.84+0.85-rc1-2) unstable; urgency=low + + * New Maintainer (Closes: 305458) + + -- Dave Beckett Wed, 20 Apr 2005 16:00:37 +0100 + +nant (0.84+0.85-rc1-1) unstable; urgency=low + + * New upstream version. + + -- John Goerzen Mon, 13 Dec 2004 09:08:02 -0600 + +nant (0.84+0.85-20040825-2) unstable; urgency=low + + * Added dependencies on pkg-config and related packages. + + -- John Goerzen Thu, 26 Aug 2004 13:54:55 -0500 + +nant (0.84+0.85-20040825-1) unstable; urgency=low + + * Initial Release. Closes: #268207. + + -- John Goerzen Thu, 26 Aug 2004 10:27:38 -0500 + +nant (0.85-2) unstable; urgency=low + + * Depend on mono-gmcs (Closes: #408395) + * Added patch 001-nant-task-cs-InitializeElement.dpatch + to get around Mono compiler turning a former warning into an error. + Again. (Closes: #422838) + + -- Dave Beckett Sun, 24 Jun 2007 12:15:53 -0700 + +nant (0.85-1) unstable; urgency=low + + * New upstream release + * It only took 2 years 11 months to go from 0.84 to 0.85 + * Build depend indep on cli-common-dev (>= 0.4.4) + + -- Dave Beckett Sun, 15 Oct 2006 00:25:05 -0700 + +nant (0.84+0.85-rc4-1) unstable; urgency=low + + * New upstream release + * Acknowledge NMU (Closes: #372588) + * Standards-Version 3.7.2 + * Update to latest CLI policy package split. Build-Depends-Indep: on + cli-common-dev, libmono-winforms1.0-cil, libmono-winforms2.0-cil and + mono-gmcs to get 1.0 and 2.0 packages + * Removed patches no longer needed: + - 01-AssemblyInfoTask.cs.patch + - 02-ScriptTask.cs.patch + - 03-XmlResultFormatter.cs.patch + - 04-SourceControl.patch + - 05-ExceptionTest.cs + + -- Dave Beckett Mon, 12 Jun 2006 23:30:36 -0700 + +nant (0.84+0.85-rc3-10.1) unstable; urgency=low + + * Non-maintainer upload. + * Add a build-dep on libmono-winforms1.0-cil to fix FTBFS, thanks Daniel + Schepler. (Closes: #370163) + [debian/control] + + -- Loic Minier Sat, 10 Jun 2006 14:37:38 +0200 + +nant (0.84+0.85-rc3-10) unstable; urgency=low + + * Remove call to dh_makeclilibs since nant has no public GAC installed + libraries (Closes: 361976) + + -- Dave Beckett Tue, 11 Apr 2006 09:09:30 -0700 + +nant (0.84+0.85-rc3-9) unstable; urgency=low + + * Update debian/watch again to use http://qa.debian.org/watch/sf.php to + try to follow sourceforge updates. + * Depend on cli-common (>= 0.2.0) + + -- Dave Beckett Sat, 4 Feb 2006 23:03:29 -0800 + +nant (0.84+0.85-rc3-8) unstable; urgency=low + + * Depend on libmono-dev to get mono.pc at runtime. + + -- Dave Beckett Mon, 20 Jun 2005 10:10:51 +0100 + +nant (0.84+0.85-rc3-7) unstable; urgency=low + + * Removed obsolete Build-Depend: on mono-jit and mono-utils + * Fixed debian/watch file + * Added patches from CVS HEAD to build with mono 1.1.8 packages: + - 01-AssemblyInfoTask.cs.patch + - 02-ScriptTask.cs.patch + - 03-XmlResultFormatter.cs.patch + - 04-SourceControl.patch + - 05-ExceptionTest.cs + + -- Dave Beckett Sat, 18 Jun 2005 14:49:10 +0100 + +nant (0.84+0.85-rc3-6) unstable; urgency=low + + * Upload to unstable now that mono is in unstable + * Added debian/watch file + + -- Dave Beckett Thu, 16 Jun 2005 11:52:30 +0100 + +nant (0.84+0.85-rc3-5) experimental; urgency=low + + * Tiny nant.1 fix + * Checked pending bugs that were fixed with new upstream or packaging: + - Nant builds reliably inside pbuilder using the mono 1.1.x + experimental debs (Closes: #300416). + - The mono resgen.exe is now correctly invoked by the + task (Closes: #283740) + + -- Dave Beckett Fri, 20 May 2005 19:02:36 +0100 + +nant (0.84+0.85-rc3-4) experimental; urgency=low + + * Make /usr/bin/nant exec cli and NAnt.exe rather than use old cli-wrapper + * Wrote a manual page for nant + + -- Dave Beckett Mon, 16 May 2005 12:31:10 +0100 + +nant (0.84+0.85-rc3-3) experimental; urgency=low + + * Remove debian/resgen and update debian/dirs to new mono conventions + * Depend on mono 1.1.6 + + -- Dave Beckett Mon, 16 May 2005 11:22:25 +0100 + +nant (0.84+0.85-rc3-2) experimental; urgency=low + + * Rebuild against mono 1.1 experimental + + -- Dave Beckett Mon, 16 May 2005 10:29:31 +0100 + +nant (0.84+0.85-rc3-1) unstable; urgency=low + + * New upstream version. + + -- Dave Beckett Wed, 20 Apr 2005 20:51:57 +0100 + +nant (0.84+0.85-rc1-2) unstable; urgency=low + + * New Maintainer (Closes: 305458) + + -- Dave Beckett Wed, 20 Apr 2005 16:00:37 +0100 + +nant (0.84+0.85-rc1-1) unstable; urgency=low + + * New upstream version. + + -- John Goerzen Mon, 13 Dec 2004 09:08:02 -0600 + +nant (0.84+0.85-20040825-2) unstable; urgency=low + + * Added dependencies on pkg-config and related packages. + + -- John Goerzen Thu, 26 Aug 2004 13:54:55 -0500 + +nant (0.84+0.85-20040825-1) unstable; urgency=low + + * Initial Release. Closes: #268207. + + -- John Goerzen Thu, 26 Aug 2004 10:27:38 -0500 + --- nant-0.85.dfsg1.orig/debian/manpages +++ nant-0.85.dfsg1/debian/manpages @@ -0,0 +1 @@ +debian/nant.1 --- nant-0.85.dfsg1.orig/debian/rules +++ nant-0.85.dfsg1/debian/rules @@ -0,0 +1,35 @@ +#!/usr/bin/make -f +export DH_VERBOSE=1 + +include /usr/share/dpatch/dpatch.make +include /usr/share/cli-common/cli.make + +MAKE_FLAGS = MONO=/usr/bin/cli MCS=/usr/bin/csc + +build: build-stamp +build-stamp: $(DPATCH_STAMPFN) + dh build --before dh_auto_build + $(MAKE) $(MAKE_FLAGS) + dh build --after dh_auto_build + touch $@ + +install: install-stamp +install-stamp: build + dh install --before dh_auto_install + $(MAKE) $(MAKE_FLAGS) prefix=/usr DESTDIR=$(CURDIR)/debian/tmp install + dh install --after dh_auto_install + rmdir --ignore-fail-on-non-empty --parents debian/nant + touch $@ + +clean: realclean unpatch +realclean: $(DPATCH_STAMPFN) + dh clean + +binary-arch: + +binary-indep: build + dh binary-indep + +binary: binary-arch binary-indep + +.PHONY: build clean binary-indep binary-arch binary install --- nant-0.85.dfsg1.orig/debian/dirs +++ nant-0.85.dfsg1/debian/dirs @@ -0,0 +1,3 @@ +usr/bin +usr/lib/NAnt +usr/share/doc/nant --- nant-0.85.dfsg1.orig/debian/nant.1 +++ nant-0.85.dfsg1/debian/nant.1 @@ -0,0 +1,83 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" +.\" +.TH nant 1 "2005-05-16" +.SH "NAME" +NAnt \- .NET build tool similar to Ant +.SH "SYNOPOSIS" +.B nant +.RB [OPTIONS] +..IR "" +.IR " ..." +.SH "DESCRIPTION" +.B NAnt +is a .Net build tool similar to Ant. The build environment +is configured using an XML file and extended using .Net classes +rather than executing separate shell-based commands. Each task is +run by an object that implements a particular Task interface. +.SH "COMMON OPTIONS" +The following are the most common options +.TP +.B \-t[argetframework]: +Specifies the framework to target +.TP +.B \-defaultframework: +Specifies the framework to target (Short format: /k) +.TP +.B \-buildfile: +Use given buildfile (Short format: /f) +.TP +.B \-D:= +Use value for given property +.IP +A file ending in .build will be used if no buildfile is specified. +.TP +.B @ +Insert command\-line settings from a text file. +.SH "OTHER OPTIONS" +.TP +.B \-debug[+|\-] +Displays debug information during build process +.TP +.B \-e[macs][+|\-] +Produce logging information without adornments +.TP +.B \-ext[ension]: +Load NAnt extensions from the specified assembly +.TP +.B \-find[+|\-] +Search parent directories for build file +.TP +.B \-h[elp][+|\-] +Prints a help message summarising the options. +.TP +.B \-indent: +Indentation level of build output +.TP +.B \-l[ogfile]: +Use value as name of log output file +.TP +.B \-listener: +Add an instance of class as a project listener +.TP +.B \-logger: +Use given type as logger +.TP +.B \-nologo[+|\-] +Suppresses display of the logo banner +.TP +.B \-projecthelp[+|\-] +Prints project help information +.TP +.B \-q[uiet][+|\-] +Displays only error or warning messages during build process +.TP +.B \-v[erbose][+|\-] +Displays more information during build process +.SH "SEE ALSO" +NAnt Project web site +.UR http://nant.sourceforge.net/ +http://nant.sourceforge.net/ +.UE +.LP +Man page by Dave Beckett, made available under the same terms as NAnt --- nant-0.85.dfsg1.orig/debian/control +++ nant-0.85.dfsg1/debian/control @@ -0,0 +1,35 @@ +Source: nant +Section: devel +Priority: optional +Maintainer: Debian CLI Applications Team +Uploaders: Jelmer Vernooij , + David Paleino +Build-Depends: debhelper (>= 7), dpatch +Build-Depends-Indep: mono-devel (>= 2.0.1), + pkg-config, + cli-common-dev (>= 0.5.7), + libnunit2.4-cil, + libmono-winforms2.0-cil, + liblog4net1.2-cil, + libmono-sharpzip2.84-cil, +Standards-Version: 3.8.0 +Homepage: http://nant.sourceforge.net/ +Vcs-Svn: svn://svn.debian.org/pkg-cli-apps/packages/nant/trunk +Vcs-Browser: http://svn.debian.org/wsvn/pkg-cli-apps/packages/nant/trunk/ +DM-Upload-Allowed: yes + +Package: nant +Architecture: all +Depends: ${cli:Depends}, ${misc:Depends}, + pkg-config, + mono-devel (>= 2.0.1) +Description: build tool similar to Ant + NAnt is different than Make. Instead of a model where it is extended with + shell-based commands, NAnt is extended using task classes. Instead of + writing shell commands, the configuration files are XML-based, calling + out a target tree where various tasks get executed. Each task is run + by an object that implements a particular Task interface. + . + NAnt supports different target frameworks: + - Microsoft .NET Framework version 1.0, 1.1 and 2.0 + - Mono 1.0 and 2.0 --- nant-0.85.dfsg1.orig/debian/docs +++ nant-0.85.dfsg1/debian/docs @@ -0,0 +1,2 @@ +README.txt +doc/* --- nant-0.85.dfsg1.orig/debian/watch +++ nant-0.85.dfsg1/debian/watch @@ -0,0 +1,3 @@ +version=3 +opts=dversionmangle=s/\.dfsg\d+$// \ + http://sf.net/nant/nant-([.0-9]+?)-src.tar.gz --- nant-0.85.dfsg1.orig/debian/examples +++ nant-0.85.dfsg1/debian/examples @@ -0,0 +1 @@ +examples/* --- nant-0.85.dfsg1.orig/debian/patches/005-nant-ExternalProgramBase-race.dpatch +++ nant-0.85.dfsg1/debian/patches/005-nant-ExternalProgramBase-race.dpatch @@ -0,0 +1,33 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 005-nant-ExternalProgramBase-race.dpatch by Y Giridhar Appaji Nag +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fixes threading issue in ExternalProgramBase causing a race in SMP env +## DP: ExternalProgramBase.cs CVS r1.71, upstream #1733671, Debian #483073 + +@DPATCH@ +diff -urNad nant-0.85.dfsg1~/src/NAnt.Core/Tasks/ExternalProgramBase.cs nant-0.85.dfsg1/src/NAnt.Core/Tasks/ExternalProgramBase.cs +--- nant-0.85.dfsg1~/src/NAnt.Core/Tasks/ExternalProgramBase.cs 2008-10-15 22:13:06.000000000 +0530 ++++ nant-0.85.dfsg1/src/NAnt.Core/Tasks/ExternalProgramBase.cs 2008-10-15 22:15:35.000000000 +0530 +@@ -452,7 +452,9 @@ + } + } + } +- OutputWriter.Flush(); ++ lock (_lockObject) { ++ OutputWriter.Flush(); ++ } + } + /// /// Reads from the stream until the external program is ended. /// + private void StreamReaderThread_Error() { +@@ -476,7 +478,9 @@ + } + } + } +- ErrorWriter.Flush(); ++ lock (_lockObject) { ++ ErrorWriter.Flush(); ++ } + } + + /// --- nant-0.85.dfsg1.orig/debian/patches/002-nant-load-partial-name.dpatch +++ nant-0.85.dfsg1/debian/patches/002-nant-load-partial-name.dpatch @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 002-nant-load-partial-name.dpatch by Jelmer Vernooij +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patch to avoid now obsolete function LoadWithPartialName() as +## DP: the nant build file treats all warnings as errors. + +@DPATCH@ +diff -ur nant-0.85/src/NAnt.DotNet/Tasks/ScriptTask.cs nant-0.85-fixed/src/NAnt.DotNet/Tasks/ScriptTask.cs +--- nant-0.85/src/NAnt.DotNet/Tasks/ScriptTask.cs 2006-09-13 18:31:26.000000000 +0200 ++++ nant-0.85-fixed/src/NAnt.DotNet/Tasks/ScriptTask.cs 2008-05-26 21:12:13.000000000 +0200 +@@ -516,7 +516,7 @@ + #region Private Static Methods + + private static CodeDomProvider CreateCodeDomProvider(string typeName, string assemblyName) { +- Assembly providerAssembly = Assembly.LoadWithPartialName(assemblyName); ++ Assembly providerAssembly = Assembly.Load(assemblyName); + if (providerAssembly == null) { + throw new ArgumentException(string.Format(CultureInfo.InvariantCulture, + ResourceUtils.GetString("NA2037"), assemblyName)); +Only in nant-0.85-fixed/src/NAnt.DotNet/Tasks: ScriptTask.cs~ --- nant-0.85.dfsg1.orig/debian/patches/006-nant-dont-build-ndoc-support.dpatch +++ nant-0.85.dfsg1/debian/patches/006-nant-dont-build-ndoc-support.dpatch @@ -0,0 +1,452 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 006-nant-dont-build-ndoc-support.dpatch by Jo Shields +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Remove the NDoc task from the nant build system, to remove Ndoc +## DP: dependencies + +@DPATCH@ +diff -urNad nant-0.85.dfsg1~/Makefile nant-0.85.dfsg1/Makefile +--- nant-0.85.dfsg1~/Makefile 2009-06-15 20:09:46.000000000 +0100 ++++ nant-0.85.dfsg1/Makefile 2009-06-15 20:10:40.000000000 +0100 +@@ -69,7 +69,7 @@ + bootstrap/NAnt.DotNetTasks.dll: + $(RESGEN) src/NAnt.DotNet/Resources/Strings.resx bootstrap/NAnt.DotNet.Resources.Strings.resources + $(MCS) -target:library -warn:0 -define:MONO -out:bootstrap/NAnt.DotNetTasks.dll \ +- -r:./bootstrap/NAnt.Core.dll -r:/usr/lib/ndoc-1.3/NDoc.Core.dll \ ++ -r:./bootstrap/NAnt.Core.dll \ + -recurse:src${DIRSEP}NAnt.DotNet${DIRSEP}*.cs -resource:bootstrap/NAnt.DotNet.Resources.Strings.resources \ + src${DIRSEP}CommonAssemblyInfo.cs + +diff -urNad nant-0.85.dfsg1~/src/NAnt.DotNet/NAnt.DotNet.build nant-0.85.dfsg1/src/NAnt.DotNet/NAnt.DotNet.build +--- nant-0.85.dfsg1~/src/NAnt.DotNet/NAnt.DotNet.build 2009-06-15 20:09:46.000000000 +0100 ++++ nant-0.85.dfsg1/src/NAnt.DotNet/NAnt.DotNet.build 2009-06-15 20:11:06.000000000 +0100 +@@ -20,8 +20,6 @@ + + + +- +- + + + +diff -urNad nant-0.85.dfsg1~/src/NAnt.DotNet/Tasks/NDocTask.cs nant-0.85.dfsg1/src/NAnt.DotNet/Tasks/NDocTask.cs +--- nant-0.85.dfsg1~/src/NAnt.DotNet/Tasks/NDocTask.cs 2009-06-15 20:09:46.000000000 +0100 ++++ nant-0.85.dfsg1/src/NAnt.DotNet/Tasks/NDocTask.cs 1970-01-01 01:00:00.000000000 +0100 +@@ -1,416 +0,0 @@ +-// NAnt - A .NET build tool +-// Copyright (C) 2001-2002 Gerry Shaw +-// +-// This program is free software; you can redistribute it and/or modify +-// it under the terms of the GNU General Public License as published by +-// the Free Software Foundation; either version 2 of the License, or +-// (at your option) any later version. +-// +-// This program is distributed in the hope that it will be useful, +-// but WITHOUT ANY WARRANTY; without even the implied warranty of +-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-// GNU General Public License for more details. +-// +-// You should have received a copy of the GNU General Public License +-// along with this program; if not, write to the Free Software +-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +-// +-// Gerry Shaw (gerry_shaw@yahoo.com) +-// Ian MacLean (ian_maclean@another.com) +-// Giuseppe Greco (giuseppe.greco@agamura.com) +- +-using System; +-using System.Collections; +-using System.Collections.Specialized; +-using System.Globalization; +-using System.IO; +-using System.Text; +-using System.Xml; +- +-using NDoc.Core; +- +-using NAnt.Core; +-using NAnt.Core.Attributes; +-using NAnt.Core.Types; +-using NAnt.Core.Util; +- +-using NAnt.DotNet.Types; +- +-namespace NAnt.DotNet.Tasks { +- /// +- /// Runs NDoc V1.3.1 to create documentation. +- /// +- /// +- /// +- /// See the NDoc home page for more +- /// information. +- /// +- /// +- /// By default, only the NDoc MSDN documenter ships as part of the NAnt +- /// distribution. To make another NDoc documenter from the NDoc V1.3.1 +- /// distribution available to the , copy the +- /// documenter assembly (and possible dependencies) to the "lib" +- /// directory corresponding with the CLR you're running NAnt on +- /// (eg. <nant root>/bin/lib/net/1.1). +- /// +- /// +- /// +- /// +- /// Document two assemblies using the MSDN documenter. The namespaces are +- /// documented in NamespaceSummary.xml. +- /// +- /// +- /// +- /// +- /// +- /// +- /// +- /// +- /// +- /// +- /// +- /// +- /// +- /// +- /// +- /// +- /// +- /// +- /// +- /// +- /// +- /// +- /// +- /// +- /// +- /// +- /// +- /// +- /// +- /// +- /// +- /// +- /// +- /// +- /// +- /// ]]> +- /// +- /// Content of NamespaceSummary.xml : +- /// +- /// +- /// +- /// The Foo.Bar namespace reinvents the wheel. +- /// +- /// +- /// The Foo.Bar.Tests namespace ensures that the Foo.Bar namespace reinvents the wheel correctly. +- /// +- /// +- /// ]]> +- /// +- /// +- [TaskName("ndoc")] +- public class NDocTask : Task { +- #region Private Instance Fields +- +- private XmlNodeList _docNodes; +- private AssemblyFileSet _assemblies = new AssemblyFileSet(); +- private FileSet _summaries = new FileSet(); +- private RawXml _documenters; +- private DirSet _referencePaths = new DirSet(); +- +- #endregion Private Instance Fields +- +- #region Public Instance Properties +- +- /// +- /// The set of assemblies to document. +- /// +- [BuildElement("assemblies", Required=true)] +- public AssemblyFileSet Assemblies { +- get { return _assemblies; } +- set { _assemblies = value; } +- } +- +- /// +- /// The set of namespace summary files. +- /// +- [BuildElement("summaries")] +- public FileSet Summaries { +- get { return _summaries; } +- set { _summaries = value; } +- } +- +- /// +- /// Specifies the formats in which the documentation should be generated. +- /// +- [BuildElement("documenters", Required=true)] +- public RawXml Documenters { +- get { return _documenters; } +- set { _documenters = value; } +- } +- +- /// +- /// Collection of additional directories to search for referenced +- /// assemblies. +- /// +- [BuildElement("referencepaths")] +- public DirSet ReferencePaths { +- get { return _referencePaths; } +- set { _referencePaths = value; } +- } +- +- #endregion Public Instance Properties +- +- #region Override implementation of Task +- +- /// +- /// Initializes the taks and verifies the parameters. +- /// +- /// containing the XML fragment used to define this task instance. +- protected override void InitializeTask(XmlNode taskNode) { +- // expand and store clone of the xml node +- _docNodes = Documenters.Xml.Clone().SelectNodes("nant:documenter", +- NamespaceManager); +- ExpandPropertiesInNodes(_docNodes); +- } +- +- /// +- /// Generates an NDoc project and builds the documentation. +- /// +- protected override void ExecuteTask() { +- // ensure base directory is set, even if fileset was not initialized +- // from XML +- if (Assemblies.BaseDirectory == null) { +- Assemblies.BaseDirectory = new DirectoryInfo(Project.BaseDirectory); +- } +- if (Summaries.BaseDirectory == null) { +- Summaries.BaseDirectory = new DirectoryInfo(Project.BaseDirectory); +- } +- if (ReferencePaths.BaseDirectory == null) { +- ReferencePaths.BaseDirectory = new DirectoryInfo(Project.BaseDirectory); +- } +- +- // Make sure there is at least one included assembly. This can't +- // be done in the InitializeTask() method because the files might +- // not have been built at startup time. +- if (Assemblies.FileNames.Count == 0) { +- throw new BuildException(ResourceUtils.GetString("NA2020"), Location); +- } +- +- // create NDoc Project +- NDoc.Core.Project project = null; +- +- try { +- project = new NDoc.Core.Project(); +- } catch (Exception ex) { +- throw new BuildException(ResourceUtils.GetString("NA2021"), Location, ex); +- } +- +- // set-up probe path, meaning list of directories where NDoc searches +- // for documenters +- // by default, NDoc scans the startup path of the app, so we do not +- // need to add this explicitly +- string privateBinPath = AppDomain.CurrentDomain.SetupInformation.PrivateBinPath; +- if (privateBinPath != null) { +- // have NDoc also probe for documenters in the privatebinpath +- foreach (string relativePath in privateBinPath.Split(Path.PathSeparator)) { +- project.AppendProbePath(Path.Combine( +- AppDomain.CurrentDomain.BaseDirectory, relativePath)); +- } +- } +- +- // check for valid documenters (any other validation can be done by NDoc itself at project load time) +- foreach (XmlNode node in _docNodes) { +- //skip non-nant namespace elements and special elements like comments, pis, text, etc. +- if (!(node.NodeType == XmlNodeType.Element) || !node.NamespaceURI.Equals(NamespaceManager.LookupNamespace("nant"))) { +- continue; +- } +- +- string documenterName = node.Attributes["name"].Value; +- CheckAndGetDocumenter(project, documenterName); +- } +- +- // write documenter project settings to temp file +- string projectFileName = Path.GetTempFileName(); +- Log(Level.Verbose, ResourceUtils.GetString("String_WritingProjectSettings"), projectFileName); +- +- XmlTextWriter writer = new XmlTextWriter(projectFileName, Encoding.UTF8); +- writer.Formatting = Formatting.Indented; +- writer.WriteStartDocument(); +- writer.WriteStartElement("project"); +- +- // write assemblies section +- writer.WriteStartElement("assemblies"); +- foreach (string assemblyPath in Assemblies.FileNames) { +- string docPath = Path.ChangeExtension(assemblyPath, ".xml"); +- writer.WriteStartElement("assembly"); +- writer.WriteAttributeString("location", assemblyPath); +- if (File.Exists(docPath)) { +- writer.WriteAttributeString("documentation", docPath); +- } +- writer.WriteEndElement(); +- } +- writer.WriteEndElement(); +- +- // write summaries section +- StringBuilder sb = new StringBuilder(); +- foreach (string summaryPath in Summaries.FileNames) { +- // write out the namespace summary nodes +- try { +- XmlTextReader tr = new XmlTextReader(summaryPath); +- tr.MoveToContent(); // skip XmlDeclaration and Processing Instructions +- sb.Append(tr.ReadOuterXml()); +- tr.Close(); +- } catch (IOException ex) { +- throw new BuildException(string.Format(CultureInfo.InvariantCulture, +- ResourceUtils.GetString("NA2022"), summaryPath), Location, ex); +- } +- } +- writer.WriteRaw(sb.ToString()); +- +- // write out the documenters section +- writer.WriteStartElement("documenters"); +- foreach (XmlNode node in _docNodes) { +- //skip non-nant namespace elements and special elements like comments, pis, text, etc. +- if (!(node.NodeType == XmlNodeType.Element) || !node.NamespaceURI.Equals(NamespaceManager.LookupNamespace("nant"))) { +- continue; +- } +- writer.WriteRaw(node.OuterXml); +- } +- writer.WriteEndElement(); +- +- // end project element +- writer.WriteEndElement(); +- writer.Close(); +- +- try { +- // read NDoc project file +- Log(Level.Verbose, ResourceUtils.GetString("String_NDocProjectFile"), +- Path.GetFullPath(projectFileName)); +- project.Read(projectFileName); +- +- // add additional directories to search for referenced assemblies +- if (ReferencePaths.DirectoryNames.Count > 0) { +- foreach (string directory in ReferencePaths.DirectoryNames) { +- project.ReferencePaths.Add(new ReferencePath(directory)); +- } +- } +- +- foreach (XmlNode node in _docNodes) { +- //skip non-nant namespace elements and special elements like comments, pis, text, etc. +- if (!(node.NodeType == XmlNodeType.Element) || !node.NamespaceURI.Equals(NamespaceManager.LookupNamespace("nant"))) { +- continue; +- } +- +- string documenterName = node.Attributes["name"].Value; +- IDocumenter documenter = CheckAndGetDocumenter(project, documenterName); +- +- // hook up events for feedback during the build +- documenter.DocBuildingStep += new DocBuildingEventHandler(OnDocBuildingStep); +- documenter.DocBuildingProgress += new DocBuildingEventHandler(OnDocBuildingProgress); +- +- // build documentation +- documenter.Build(project); +- } +- } catch (Exception ex) { +- throw new BuildException(ResourceUtils.GetString("NA2023"), Location, ex); +- } +- } +- +- #endregion Override implementation of Task +- +- #region Private Instance Methods +- +- /// +- /// Represents the method that will be called to update the overall +- /// percent complete value and the current step name. +- /// +- /// The source of the event. +- /// A that contains the event data. +- private void OnDocBuildingStep(object sender, ProgressArgs e) { +- Log(Level.Info, e.Status); +- } +- +- /// +- /// Represents the method that will be called to update the current +- /// step's precent complete value. +- /// +- /// The source of the event. +- /// A that contains the event data. +- private void OnDocBuildingProgress(object sender, ProgressArgs e) { +- Log(Level.Verbose, e.Progress + ResourceUtils.GetString("String_PercentageComplete")); +- } +- +- /// +- /// Returns the documenter for the given project. +- /// +- /// +- /// Documenter is not found. +- /// +- /// +- /// is . +- /// +- private IDocumenter CheckAndGetDocumenter(NDoc.Core.Project project, string documenterName){ +- IDocumenter documenter = null; +- +- if (project == null) { +- throw new ArgumentNullException("project"); +- } +- +- StringCollection documenters = new StringCollection(); +- foreach (IDocumenter d in project.Documenters) { +- documenters.Add(d.Name); +- +- // ignore case when comparing documenter names +- if (string.Compare(d.Name, documenterName, true, CultureInfo.InvariantCulture) == 0) { +- documenter = (IDocumenter) d; +- break; +- } +- } +- +- // throw an exception if the documenter could not be found. +- if (documenter == null) { +- if (documenters.Count == 0) { +- throw new BuildException(string.Format(CultureInfo.InvariantCulture, +- ResourceUtils.GetString("NA2024"), documenterName), Location); +- } else { +- throw new BuildException(string.Format(CultureInfo.InvariantCulture, +- ResourceUtils.GetString("NA2025"), documenterName, +- StringUtils.Join(", ", documenters)), Location); +- } +- } +- return documenter; +- } +- +- /// +- /// Performs macro expansion for the given nodes. +- /// +- /// for which expansion should be performed. +- private void ExpandPropertiesInNodes(XmlNodeList nodes) { +- foreach (XmlNode node in nodes) { +- // do not process comment nodes, or entities and other internal element types. +- if (node.NodeType == XmlNodeType.Element) { +- ExpandPropertiesInNodes(node.ChildNodes); +- foreach (XmlAttribute attr in node.Attributes) { +- // use "this" keyword as workaround for Mono bug #71992 +- attr.Value = this.Project.ExpandProperties(attr.Value, Location); +- } +- +- // convert output directory to full path relative to project base directory +- XmlNode outputDirProperty = (XmlNode) node.SelectSingleNode("property[@name='OutputDirectory']"); +- if (outputDirProperty != null) { +- XmlAttribute valueAttribute = (XmlAttribute) outputDirProperty.Attributes.GetNamedItem("value"); +- if (valueAttribute != null) { +- // use "this" keyword as workaround for Mono bug #71992 +- valueAttribute.Value = this.Project.GetFullPath(valueAttribute.Value); +- } +- } +- } +- } +- } +- +- #endregion Private Instance Methods +- } +-} --- nant-0.85.dfsg1.orig/debian/patches/000-fix_build_system.dpatch +++ nant-0.85.dfsg1/debian/patches/000-fix_build_system.dpatch @@ -0,0 +1,105 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 000-add_DESTDIR_support.dpatch by David Paleino +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: add support for DESTDIR makefile variable. + +@DPATCH@ +diff -urNad nant-0.85.dfsg1~/Makefile nant-0.85.dfsg1/Makefile +--- nant-0.85.dfsg1~/Makefile 2009-01-05 15:40:11.000000000 +0100 ++++ nant-0.85.dfsg1/Makefile 2009-01-05 15:40:13.000000000 +0100 +@@ -1,7 +1,8 @@ + #NAnt make file for *nix +-MONO=mono +-MCS=mcs ++MONO=cli ++MCS=csc + RESGEN=resgen ++DESTDIR= + + ifndef DIRSEP + ifeq ($(OS),Windows_NT) +@@ -18,13 +19,13 @@ + endif + endif + +-ifeq ($(MONO),mono) ++#ifeq ($(MONO),mono) + FRAMEWORK_DIR = mono + DEFINE = MONO +-else +-FRAMEWORK_DIR = net +-DEFINE= NET +-endif ++#else ++#FRAMEWORK_DIR = net ++#DEFINE= NET ++#endif + + + +@@ -40,7 +41,7 @@ + rm -fR build bootstrap + + install: bootstrap +- $(NANT) -f:NAnt.build install -D:install.prefix="$(prefix)" ++ $(NANT) -f:NAnt.build install -D:install.prefix="$(prefix)" -D:install.destdir="$(DESTDIR)" + + run-test: bootstrap + $(NANT) -f:NAnt.build test +diff -urNad nant-0.85.dfsg1~/NAnt.build nant-0.85.dfsg1/NAnt.build +--- nant-0.85.dfsg1~/NAnt.build 2009-01-05 15:40:11.000000000 +0100 ++++ nant-0.85.dfsg1/NAnt.build 2009-01-05 15:41:00.000000000 +0100 +@@ -774,36 +774,38 @@ + + + +- ++ + + + + + +- ++ + +- + ++ ++ ++ ++ ++ + +- +- +- +- +- +- +- ++ ++ ++ ++ ++ + +- ++ + +- ++ + + #!/bin/sh +- exec ${path::combine(prefix, 'bin')}/mono ${path::combine(install.copylocation, 'bin')}/NAnt.exe "$@" +- ++ exec ${path::combine(prefix, 'bin')}/cli ${install.libdir}/NAnt/NAnt.exe "$@" ++ + + + --- nant-0.85.dfsg1.orig/debian/patches/00list +++ nant-0.85.dfsg1/debian/patches/00list @@ -0,0 +1,7 @@ +000-fix_build_system.dpatch +001-nant-task-cs-InitializeElement.dpatch +002-nant-load-partial-name.dpatch +003-nant-use-system-dlls.dpatch +004-nant-nunit_2.4.dpatch +005-nant-ExternalProgramBase-race.dpatch +006-nant-dont-build-ndoc-support.dpatch --- nant-0.85.dfsg1.orig/debian/patches/003-nant-use-system-dlls.dpatch +++ nant-0.85.dfsg1/debian/patches/003-nant-use-system-dlls.dpatch @@ -0,0 +1,352 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 002-nant-use-system-dlls.dpatch by Jelmer Vernooij +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix build files to use system-provided libraries rather than +## DP: the libraries shipped inside nant's tarball. + +@DPATCH@ +diff -ur nant-0.85/Makefile nant-0.85dfsg1/Makefile +--- nant-0.85/Makefile 2005-12-11 09:47:54.000000000 +0100 ++++ nant-0.85dfsg1/Makefile 2008-05-26 23:48:23.000000000 +0200 +@@ -46,7 +46,7 @@ + $(NANT) -f:NAnt.build test + + bootstrap/NAnt.exe: +- $(MCS) -target:exe -define:${DEFINE} -out:bootstrap${DIRSEP}NAnt.exe -r:bootstrap${DIRSEP}log4net.dll \ ++ $(MCS) -target:exe -define:${DEFINE} -out:bootstrap${DIRSEP}NAnt.exe -pkg:log4net \ + -recurse:src${DIRSEP}NAnt.Console${DIRSEP}*.cs src${DIRSEP}CommonAssemblyInfo.cs + + +@@ -55,28 +55,26 @@ + + setup: + mkdir -p bootstrap +- cp -R lib/ bootstrap/lib + # Mono loads log4net before privatebinpath is set-up, so we need this in the same directory + # as NAnt.exe +- cp lib/log4net.dll bootstrap + cp src/NAnt.Console/App.config bootstrap/NAnt.exe.config + + bootstrap/NAnt.Core.dll: + $(RESGEN) src/NAnt.Core/Resources/Strings.resx bootstrap/NAnt.Core.Resources.Strings.resources + $(MCS) -target:library -warn:0 -define:${DEFINE} -out:bootstrap/NAnt.Core.dll -debug \ +- -resource:bootstrap/NAnt.Core.Resources.Strings.resources -r:lib${DIRSEP}log4net.dll \ ++ -resource:bootstrap/NAnt.Core.Resources.Strings.resources -pkg:log4net \ + -r:System.Web.dll -recurse:src${DIRSEP}NAnt.Core${DIRSEP}*.cs src${DIRSEP}CommonAssemblyInfo.cs + + bootstrap/NAnt.DotNetTasks.dll: + $(RESGEN) src/NAnt.DotNet/Resources/Strings.resx bootstrap/NAnt.DotNet.Resources.Strings.resources + $(MCS) -target:library -warn:0 -define:MONO -out:bootstrap/NAnt.DotNetTasks.dll \ +- -r:./bootstrap/NAnt.Core.dll -r:bootstrap/lib/${FRAMEWORK_DIR}/1.0/NDoc.Core.dll \ ++ -r:./bootstrap/NAnt.Core.dll -r:/usr/lib/ndoc-1.3/NDoc.Core.dll \ + -recurse:src${DIRSEP}NAnt.DotNet${DIRSEP}*.cs -resource:bootstrap/NAnt.DotNet.Resources.Strings.resources \ + src${DIRSEP}CommonAssemblyInfo.cs + + bootstrap/NAnt.CompressionTasks.dll: + $(MCS) -target:library -warn:0 -define:MONO -out:bootstrap/NAnt.CompressionTasks.dll \ +- -r:./bootstrap/NAnt.Core.dll -r:bootstrap/lib/ICSharpCode.SharpZipLib.dll \ ++ -r:./bootstrap/NAnt.Core.dll -r:ICSharpCode.SharpZipLib.dll \ + -recurse:src${DIRSEP}NAnt.Compression${DIRSEP}*.cs src${DIRSEP}CommonAssemblyInfo.cs + + bootstrap/NAnt.Win32Tasks.dll: +diff -ur nant-0.85/NAnt.build nant-0.85dfsg1/NAnt.build +--- nant-0.85/NAnt.build 2006-10-14 16:01:34.000000000 +0200 ++++ nant-0.85dfsg1/NAnt.build 2008-05-27 00:08:48.000000000 +0200 +@@ -38,7 +38,7 @@ + + + +- ++ + + + +@@ -48,7 +48,7 @@ + + + +- ++ + + + +diff -ur nant-0.85/src/NAnt.Compression/NAnt.Compression.build nant-0.85dfsg1/src/NAnt.Compression/NAnt.Compression.build +--- nant-0.85/src/NAnt.Compression/NAnt.Compression.build 2006-03-25 13:11:12.000000000 +0100 ++++ nant-0.85dfsg1/src/NAnt.Compression/NAnt.Compression.build 2008-05-26 23:59:07.000000000 +0200 +@@ -19,7 +19,7 @@ + + + +- ++ + + + +diff -ur nant-0.85/src/NAnt.Console/NAnt.Console.build nant-0.85dfsg1/src/NAnt.Console/NAnt.Console.build +--- nant-0.85/src/NAnt.Console/NAnt.Console.build 2005-02-20 13:29:50.000000000 +0100 ++++ nant-0.85dfsg1/src/NAnt.Console/NAnt.Console.build 2008-05-26 23:50:33.000000000 +0200 +@@ -27,9 +27,11 @@ + + + +- + + ++ ++ ++ + + + +diff -ur nant-0.85/src/NAnt.Core/NAnt.Core.build nant-0.85dfsg1/src/NAnt.Core/NAnt.Core.build +--- nant-0.85/src/NAnt.Core/NAnt.Core.build 2006-03-18 07:37:34.000000000 +0100 ++++ nant-0.85dfsg1/src/NAnt.Core/NAnt.Core.build 2008-05-26 23:48:23.000000000 +0200 +@@ -24,9 +24,11 @@ + + + +- + + ++ ++ ++ + + + +diff -ur nant-0.85/src/NAnt.DotNet/NAnt.DotNet.build nant-0.85dfsg1/src/NAnt.DotNet/NAnt.DotNet.build +--- nant-0.85/src/NAnt.DotNet/NAnt.DotNet.build 2006-03-18 07:37:34.000000000 +0100 ++++ nant-0.85dfsg1/src/NAnt.DotNet/NAnt.DotNet.build 2008-05-26 23:56:25.000000000 +0200 +@@ -20,8 +20,8 @@ + + + +- +- ++ ++ + + + +diff -ur nant-0.85/src/NAnt.NUnit/NAnt.NUnit.build nant-0.85dfsg1/src/NAnt.NUnit/NAnt.NUnit.build +--- nant-0.85/src/NAnt.NUnit/NAnt.NUnit.build 2005-02-20 13:29:50.000000000 +0100 ++++ nant-0.85dfsg1/src/NAnt.NUnit/NAnt.NUnit.build 2008-05-27 00:04:20.000000000 +0200 +@@ -16,32 +16,10 @@ + + + +- + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- ++ ++ ++ + + + +@@ -55,16 +33,16 @@ + + + +- +- ++ + + + + +- +- +- + ++ ++ ++ ++ + + + +diff -ur nant-0.85/src/NAnt.SourceControl/NAnt.SourceControl.build nant-0.85dfsg1/src/NAnt.SourceControl/NAnt.SourceControl.build +--- nant-0.85/src/NAnt.SourceControl/NAnt.SourceControl.build 2006-03-18 07:37:34.000000000 +0100 ++++ nant-0.85dfsg1/src/NAnt.SourceControl/NAnt.SourceControl.build 2008-05-27 00:05:32.000000000 +0200 +@@ -15,11 +15,13 @@ + + + +- + +- +- ++ ++ + ++ ++ ++ + + + +diff -ur nant-0.85/tests/NAnt.Compression/NAnt.Compression.build nant-0.85dfsg1/tests/NAnt.Compression/NAnt.Compression.build +--- nant-0.85/tests/NAnt.Compression/NAnt.Compression.build 2006-03-18 07:37:34.000000000 +0100 ++++ nant-0.85dfsg1/tests/NAnt.Compression/NAnt.Compression.build 2008-05-27 00:11:22.000000000 +0200 +@@ -20,12 +20,14 @@ + + + +- + + + +- + ++ ++ ++ ++ + + + +diff -ur nant-0.85/tests/NAnt.Console/NAnt.Console.build nant-0.85dfsg1/tests/NAnt.Console/NAnt.Console.build +--- nant-0.85/tests/NAnt.Console/NAnt.Console.build 2006-03-18 07:37:34.000000000 +0100 ++++ nant-0.85dfsg1/tests/NAnt.Console/NAnt.Console.build 2008-05-27 00:11:31.000000000 +0200 +@@ -20,11 +20,13 @@ + + + +- + + +- + ++ ++ ++ ++ + + + +diff -ur nant-0.85/tests/NAnt.Core/NAnt.Core.build nant-0.85dfsg1/tests/NAnt.Core/NAnt.Core.build +--- nant-0.85/tests/NAnt.Core/NAnt.Core.build 2006-03-18 07:37:34.000000000 +0100 ++++ nant-0.85dfsg1/tests/NAnt.Core/NAnt.Core.build 2008-05-27 00:10:47.000000000 +0200 +@@ -21,10 +21,12 @@ + + + +- + +- + ++ ++ ++ ++ + + + +diff -ur nant-0.85/tests/NAnt.DotNet/NAnt.DotNet.build nant-0.85dfsg1/tests/NAnt.DotNet/NAnt.DotNet.build +--- nant-0.85/tests/NAnt.DotNet/NAnt.DotNet.build 2006-05-31 20:16:26.000000000 +0200 ++++ nant-0.85dfsg1/tests/NAnt.DotNet/NAnt.DotNet.build 2008-05-27 00:12:01.000000000 +0200 +@@ -27,14 +27,16 @@ + + + +- +- ++ + + + + +- + ++ ++ ++ ++ + + + +diff -ur nant-0.85/tests/NAnt.MSNet/NAnt.MSNet.build nant-0.85dfsg1/tests/NAnt.MSNet/NAnt.MSNet.build +--- nant-0.85/tests/NAnt.MSNet/NAnt.MSNet.build 2006-09-03 08:56:22.000000000 +0200 ++++ nant-0.85dfsg1/tests/NAnt.MSNet/NAnt.MSNet.build 2008-05-27 00:12:17.000000000 +0200 +@@ -21,8 +21,10 @@ + + + +- + ++ ++ ++ + + + +diff -ur nant-0.85/tests/NAnt.VisualCpp/NAnt.VisualCpp.build nant-0.85dfsg1/tests/NAnt.VisualCpp/NAnt.VisualCpp.build +--- nant-0.85/tests/NAnt.VisualCpp/NAnt.VisualCpp.build 2006-09-03 08:57:06.000000000 +0200 ++++ nant-0.85dfsg1/tests/NAnt.VisualCpp/NAnt.VisualCpp.build 2008-05-27 00:14:39.000000000 +0200 +@@ -22,8 +22,10 @@ + + + +- + ++ ++ ++ + + + +diff -ur nant-0.85/tests/NAnt.VSNet/NAnt.VSNet.build nant-0.85dfsg1/tests/NAnt.VSNet/NAnt.VSNet.build +--- nant-0.85/tests/NAnt.VSNet/NAnt.VSNet.build 2006-09-03 08:57:52.000000000 +0200 ++++ nant-0.85dfsg1/tests/NAnt.VSNet/NAnt.VSNet.build 2008-05-27 00:16:01.000000000 +0200 +@@ -22,8 +22,10 @@ + + + +- + ++ ++ ++ + + + +diff -ur nant-0.85/tests/NAnt.Win32/NAnt.Win32.build nant-0.85dfsg1/tests/NAnt.Win32/NAnt.Win32.build +--- nant-0.85/tests/NAnt.Win32/NAnt.Win32.build 2006-09-03 08:59:20.000000000 +0200 ++++ nant-0.85dfsg1/tests/NAnt.Win32/NAnt.Win32.build 2008-05-27 00:13:32.000000000 +0200 +@@ -21,8 +21,10 @@ + + + +- + ++ ++ ++ + + + --- nant-0.85.dfsg1.orig/debian/patches/004-nant-nunit_2.4.dpatch +++ nant-0.85.dfsg1/debian/patches/004-nant-nunit_2.4.dpatch @@ -0,0 +1,119 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 06_nunit_2.4.dpatch by Jelmer Vernooij +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Update NUnit task to work with NUnit 2.4.7 + +@DPATCH@ +diff -ur nant-0.85/src/NAnt.NUnit/NUnit2/NUnit2Task.cs nant-0.85.dfsg1-newnunit/src/NAnt.NUnit/NUnit2/NUnit2Task.cs +--- nant-0.85/src/NAnt.NUnit/NUnit2/NUnit2Task.cs 2006-04-23 19:53:12.000000000 +0200 ++++ nant-0.85.dfsg1-newnunit/src/NAnt.NUnit/NUnit2/NUnit2Task.cs 2008-06-14 16:50:35.000000000 +0200 +@@ -31,6 +31,7 @@ + using System.Xml.XPath; + + using NUnit.Core; ++using NUnit.Core.Filters; + using TestCase = NUnit.Core.TestCase; + using TestOutput = NUnit.Core.TestOutput; + using NUnit.Framework; +@@ -185,16 +186,16 @@ + EventListener listener = new EventCollector(logWriter, logWriter); + + foreach (NUnit2Test testElement in Tests) { +- IFilter categoryFilter = null; ++ ITestFilter categoryFilter = null; + + // include or exclude specific categories + string categories = testElement.Categories.Includes.ToString(); + if (!StringUtils.IsNullOrEmpty(categories)) { +- categoryFilter = new CategoryFilter(categories.Split(','), false); ++ categoryFilter = new CategoryFilter(categories.Split(',')); + } else { + categories = testElement.Categories.Excludes.ToString(); + if (!StringUtils.IsNullOrEmpty(categories)) { +- categoryFilter = new CategoryFilter(categories.Split(','), true); ++ categoryFilter = new NotFilter(new CategoryFilter(categories.Split(','))); + } + } + +@@ -203,27 +204,22 @@ + + try { + TestRunner runner = domain.CreateRunner(new FileInfo(testAssembly), testElement.AppConfigFile); ++ TestPackage package = new TestPackage(testAssembly); + +- Test test = null; +- if (testElement.TestName != null) { +- test = runner.Load(testAssembly, testElement.TestName); +- } else { +- test = runner.Load(testAssembly); +- } +- +- if (test == null) { ++ bool test = runner.Load(package); ++ if (!test) { + Log(Level.Warning, "Assembly \"{0}\" contains no tests.", + testAssembly); + continue; + } + +- // set category filter +- if (categoryFilter != null) { +- runner.Filter = categoryFilter; +- } +- ++ TestResult result; + // run test +- TestResult result = runner.Run(listener); ++ if (categoryFilter != null) { ++ result = runner.Run(listener, categoryFilter); ++ } else { ++ result = runner.Run(listener); ++ } + + // flush test output to log + logWriter.Flush(); +@@ -371,7 +367,7 @@ + + #endregion Private Instance Methods + +- private class EventCollector : LongLivingMarshalByRefObject, EventListener { ++ private class EventCollector : MarshalByRefObject, EventListener { + private TextWriter outWriter; + private TextWriter errorWriter; + private string currentTestName; +@@ -382,10 +378,10 @@ + this.currentTestName = string.Empty; + } + +- public void RunStarted(Test[] tests) { ++ public void RunStarted(string name, int testcount) { + } + +- public void RunFinished(TestResult[] results) { ++ public void RunFinished(TestResult result) { + } + + public void RunFinished(Exception exception) { +@@ -395,11 +391,11 @@ + currentTestName = string.Empty; + } + +- public void TestStarted(TestCase testCase) { +- currentTestName = testCase.FullName; ++ public void TestStarted(TestName testName) { ++ currentTestName = testName.FullName; + } + +- public void SuiteStarted(TestSuite suite) { ++ public void SuiteStarted(TestName testName) { + } + + public void SuiteFinished(TestSuiteResult suiteResult) { +@@ -423,4 +419,4 @@ + } + } + } +-} +\ Kein Zeilenumbruch am Dateiende. ++} --- nant-0.85.dfsg1.orig/debian/patches/001-nant-task-cs-InitializeElement.dpatch +++ nant-0.85.dfsg1/debian/patches/001-nant-task-cs-InitializeElement.dpatch @@ -0,0 +1,24 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 001-nant-task-cs-InitializeElement.dpatch by Dave Beckett +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Patch from CVS to handle C# compiler changing underneath us again. Debian bug 422838 + +@DPATCH@ +--- nant-0.85/src/NAnt.Core/Task.cs.orig 2007-06-24 09:54:35.000000000 -0700 ++++ nant-0.85/src/NAnt.Core/Task.cs 2007-06-24 09:58:04.000000000 -0700 +@@ -400,7 +400,6 @@ + #region Protected Instance Methods + + /// Deprecated (to be deleted). +- [Obsolete("Deprecated- Use InitializeTask instead")] + protected override void InitializeElement(XmlNode elementNode) { + // Just defer for now so that everything just works + InitializeTask(elementNode); +@@ -415,4 +414,4 @@ + + #endregion Protected Instance Methods + } +-} +\ No newline at end of file ++}