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

[trampster-guest]

The following commit has been merged in the master branch:
commit fdd7ee93884aa523c23694aa3578b460a1ccccd4
Author: trampster-guest <trampster at gmail.com>
Date:   Tue Nov 6 21:21:07 2012 +1300

    removed patches as the nunit patch does not apply, it is not required because we don't depend of a specific nunit version anymore.

diff --git a/debian/patches/nunit.patch b/debian/patches/nunit.patch
deleted file mode 100644
index 8a000ec..0000000
--- a/debian/patches/nunit.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Description: Port to nunit 2.6 API
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=647322
-Forwarded: yes
-Author: Iain Lane <laney at debian.org>
-
-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.6.0.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.6.0.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.6.0.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.6.0.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
deleted file mode 100644
index afe9ef5..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-nunit.patch

-- 
widemargin