[Pkg-cli-apps-commits] r4004 - in /packages/nant/trunk/debian: changelog control patches/004-nant-nunit_2.4.dpatch patches/00list watch
ctrlsoft-guest at users.alioth.debian.org
ctrlsoft-guest at users.alioth.debian.org
Sat Jun 14 15:03:29 UTC 2008
Author: ctrlsoft-guest
Date: Sat Jun 14 15:03:29 2008
New Revision: 4004
URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4004
Log:
Build against version 2.4 of nunit.
Added:
packages/nant/trunk/debian/patches/004-nant-nunit_2.4.dpatch (with props)
Modified:
packages/nant/trunk/debian/changelog
packages/nant/trunk/debian/control
packages/nant/trunk/debian/patches/00list
packages/nant/trunk/debian/watch
Modified: packages/nant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/nant/trunk/debian/changelog?rev=4004&op=diff
==============================================================================
--- packages/nant/trunk/debian/changelog (original)
+++ packages/nant/trunk/debian/changelog Sat Jun 14 15:03:29 2008
@@ -1,3 +1,11 @@
+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 <jelmer at samba.org> Sat, 14 Jun 2008 16:59:38 +0200
+
nant (0.85.dfsg1-1) unstable; urgency=low
* Remove binaries without source. (Closes: #374634)
Modified: packages/nant/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/nant/trunk/debian/control?rev=4004&op=diff
==============================================================================
--- packages/nant/trunk/debian/control (original)
+++ packages/nant/trunk/debian/control Sat Jun 14 15:03:29 2008
@@ -4,8 +4,8 @@
Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
Uploaders: Dave Beckett <dajobe at debian.org>, Jelmer Vernooij <jelmer at samba.org>
Build-Depends: debhelper (>= 5)
-Build-Depends-Indep: mono-mcs (>= 1.1.6) | c-sharp-compiler, mono-gmcs, mono-gac, libmono-dev (>= 1.1.6), pkg-config, cli-common-dev (>= 0.4.4), dpatch, libnunit2.2.6-cil, libndoc-cil, libmono-winforms1.0-cil, libmono-winforms2.0-cil, liblog4net1.2-cil, libmono-sharpzip2.84-cil, libmono-sharpzip0.84-cil
-Standards-Version: 3.7.3
+Build-Depends-Indep: mono-mcs (>= 1.1.6) | c-sharp-compiler, mono-gmcs, mono-gac, libmono-dev (>= 1.1.6), pkg-config, cli-common-dev (>= 0.4.4), dpatch, libnunit2.4-cil, libndoc-cil, libmono-winforms1.0-cil, libmono-winforms2.0-cil, liblog4net1.2-cil, libmono-sharpzip2.84-cil, libmono-sharpzip0.84-cil
+Standards-Version: 3.8.0
Homepage: http://nant.sourceforge.net/
Vcs-Svn: svn://svn.debian.org/pkg-cli-apps/packages/nant/trunk
DM-Upload-Allowed: yes
Added: packages/nant/trunk/debian/patches/004-nant-nunit_2.4.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/nant/trunk/debian/patches/004-nant-nunit_2.4.dpatch?rev=4004&op=file
==============================================================================
--- packages/nant/trunk/debian/patches/004-nant-nunit_2.4.dpatch (added)
+++ packages/nant/trunk/debian/patches/004-nant-nunit_2.4.dpatch Sat Jun 14 15:03:29 2008
@@ -1,0 +1,119 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06_nunit_2.4.dpatch by Jelmer Vernooij <jelmer at samba.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Update NUnit task to work with NUnit 2.4.7
+
+ at 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.
++}
Propchange: packages/nant/trunk/debian/patches/004-nant-nunit_2.4.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: packages/nant/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/nant/trunk/debian/patches/00list?rev=4004&op=diff
==============================================================================
--- packages/nant/trunk/debian/patches/00list (original)
+++ packages/nant/trunk/debian/patches/00list Sat Jun 14 15:03:29 2008
@@ -1,3 +1,4 @@
001-nant-task-cs-InitializeElement.dpatch
002-nant-load-partial-name.dpatch
003-nant-use-system-dlls.dpatch
+004-nant-nunit_2.4.dpatch
Modified: packages/nant/trunk/debian/watch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/nant/trunk/debian/watch?rev=4004&op=diff
==============================================================================
--- packages/nant/trunk/debian/watch (original)
+++ packages/nant/trunk/debian/watch Sat Jun 14 15:03:29 2008
@@ -1,2 +1,3 @@
version=2
-http://qa.debian.org/watch/sf.php/nant/nant-([.0-9]+?)-src.tar.gz
+opts=dversionmangle=s/\.dfsg\d+$// \
+ http://sf.net/nant/nant-([.0-9]+?)-src.tar.gz
More information about the Pkg-cli-apps-commits
mailing list