[Pkg-cli-apps-commits] [SCM] widemargin branch, master, updated. debian/1.0.11-1-4-gd5f8959

[Iain Lane]

The following commit has been merged in the master branch:
commit 2f8a0eea51ff0d58d77819e3b33ecef8b162cbc8
Author: Iain Lane <laney at debian.org>
Date:   Thu Nov 3 01:36:37 2011 +0000

    Add new patch for nunit 2.5 compat
    
    Closes: #647322

diff --git a/debian/control b/debian/control
index 547b01b..844f904 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: gnome
 Priority: extra
 Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
 Uploaders: Daniel Hughes <trampster at gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), cli-common-dev (>= 0.7.1), mono-xbuild (>= 2.6.7), libgtk2.0-cil-dev (>= 2.12.10), mono-devel (>= 2.6.7), libglade2.0-cil-dev (>= 2.12.10)
+Build-Depends: debhelper (>= 7.0.50~), cli-common-dev (>= 0.7.1), mono-xbuild (>= 2.6.7), libgtk2.0-cil-dev (>= 2.12.10), mono-devel (>= 2.6.7), libglade2.0-cil-dev (>= 2.12.10), libnunit-cil-dev (>= 2.5)
 Standards-Version: 3.9.2
 Homepage: https://bitbucket.org/trampster/widemargin
 Vcs-Git: git://git.debian.org/git/pkg-cli-apps/packages/widemargin.git
diff --git a/debian/patches/nunit-2.5 b/debian/patches/nunit-2.5
new file mode 100644
index 0000000..4b94b0e
--- /dev/null
+++ b/debian/patches/nunit-2.5
@@ -0,0 +1,65 @@
+Index: widemargin/WideMargin.Database.Tests/BibleDatabaseTests.cs
+===================================================================
+--- widemargin.orig/WideMargin.Database.Tests/BibleDatabaseTests.cs	2011-10-06 10:39:41.339518415 +0100
++++ widemargin/WideMargin.Database.Tests/BibleDatabaseTests.cs	2011-11-03 01:36:05.387217838 +0000
+@@ -17,7 +17,6 @@
+ using System;
+ using NUnit.Framework;
+ using NUnit.Core;
+-using NUnit.Framework.SyntaxHelpers;
+ using System.Data;
+ using Mono.Data.Sqlite;
+ using WideMargin.Database;
+Index: widemargin/WideMargin.Database.Tests/WideMargin.Database.Tests.csproj
+===================================================================
+--- widemargin.orig/WideMargin.Database.Tests/WideMargin.Database.Tests.csproj	2011-10-06 10:39:41.339518415 +0100
++++ widemargin/WideMargin.Database.Tests/WideMargin.Database.Tests.csproj	2011-11-03 01:35:37.672304373 +0000
+@@ -34,10 +34,10 @@
+     <Reference Include="System.Core" />
+     <Reference Include="System.Xml.Linq" />
+     <Reference Include="System.Xml" />
+-    <Reference Include="nunit.framework, Version=2.4.7.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
++    <Reference Include="nunit.framework, Version=2.5.10.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
+       <Package>mono-nunit</Package>
+     </Reference>
+-    <Reference Include="nunit.core, Version=2.4.7.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
++    <Reference Include="nunit.core, Version=2.5.10.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
+       <Package>mono-nunit</Package>
+     </Reference>
+     <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+Index: widemargin/WideMargin.GUI.Tests/PageRangerTests.cs
+===================================================================
+--- widemargin.orig/WideMargin.GUI.Tests/PageRangerTests.cs	2011-10-06 10:39:41.427514967 +0100
++++ widemargin/WideMargin.GUI.Tests/PageRangerTests.cs	2011-11-03 01:35:12.609286942 +0000
+@@ -17,7 +17,6 @@
+ using System;
+ using NUnit.Framework;
+ using WideMargin.GUI;
+-using NUnit.Framework.SyntaxHelpers;
+ 
+ namespace WideMargin.GUI.Tests
+ {
+Index: widemargin/WideMargin.GUI.Tests/WideMargin.GUI.Tests.csproj
+===================================================================
+--- widemargin.orig/WideMargin.GUI.Tests/WideMargin.GUI.Tests.csproj	2011-10-06 10:39:41.427514967 +0100
++++ widemargin/WideMargin.GUI.Tests/WideMargin.GUI.Tests.csproj	2011-11-03 01:34:57.409882828 +0000
+@@ -31,10 +31,10 @@
+   </PropertyGroup>
+   <ItemGroup>
+     <Reference Include="System" />
+-    <Reference Include="nunit.framework, Version=2.4.7.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
++    <Reference Include="nunit.framework, Version=2.5.10.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
+       <Package>nunit</Package>
+     </Reference>
+-    <Reference Include="nunit.core, Version=2.4.7.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
++    <Reference Include="nunit.core, Version=2.5.10.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
+       <Package>nunit</Package>
+     </Reference>
+   </ItemGroup>
+@@ -53,4 +53,4 @@
+       <Properties InternalTargetFrameworkVersion="3.5" />
+     </MonoDevelop>
+   </ProjectExtensions>
+-</Project>
+\ No newline at end of file
++</Project>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..976c2eb
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+nunit-2.5

-- 
widemargin