[Pkg-cli-libs-commits] [SCM] nunit branch, master, updated. debian/2.5.10.11092+dfsg-3-11-ge508942

[Julian Taylor]

The following commit has been merged in the master branch:
commit 92f40bb82e0efb859048017e55b536d811517558
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date:   Sun Apr 15 17:30:44 2012 +0200

    remove instantiate-a-ProjectService patch
    
    rejected upstream, monodevelop works around the issue itself

diff --git a/debian/patches/instantiate-a-ProjectService-when-creating-a-domain.patch b/debian/patches/instantiate-a-ProjectService-when-creating-a-domain.patch
deleted file mode 100644
index a83de04..0000000
--- a/debian/patches/instantiate-a-ProjectService-when-creating-a-domain.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Julian Taylor <jtaylor.debian at googlemail.com>
-Date: Mon, 30 Jan 2012 23:40:42 +0100
-Subject: instantiate a ProjectService when creating a domain
-
-required for Services.ProjectService.CanLoadProject used later.
-fixes monodevelop's nunit addin.
-Issue introduced in upstream revision 3127.
-Forwarded: yes
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/nunit/+bug/889241
-Bug: https://bugs.launchpad.net/nunitv2/+bug/928421
----
- src/ClientUtilities/util/Services/DomainManager.cs |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
---- a/src/ClientUtilities/util/Services/DomainManager.cs
-+++ b/src/ClientUtilities/util/Services/DomainManager.cs
-@@ -56,6 +56,8 @@
- 		public AppDomain CreateDomain( TestPackage package )
- 		{
- 			AppDomainSetup setup = new AppDomainSetup();
-+			if (Services.ProjectService == null)
-+				ServiceManager.Services.AddService(new ProjectService());
- 			 
- 			//For paralell tests, we need to use distinct application name
-         	setup.ApplicationName = "Tests" + "_" + Environment.TickCount;
diff --git a/debian/patches/series b/debian/patches/series
index 62b043e..36d7200 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 use_default_framework.patch
 05_build_xml_doc_for_nunit.core.dpatch
-instantiate-a-ProjectService-when-creating-a-domain.patch

-- 
nunit