[Pkg-cli-apps-commits] [SCM] Tomboy - desktop note taking program using Wiki style links branch, experimental, updated. debian/1.7.2-1-4-gc60ae40

[Iain Lane]

The following commit has been merged in the experimental branch:
commit c2709c3a1daec0d12972cc6945c635858483385c
Author: Iain Lane <laney at debian.org>
Date:   Mon Aug 15 22:24:02 2011 +0100

    Remove 10_disable_unit_tests patch; now supported via configure flag

diff --git a/debian/patches/10_disable_unit_tests b/debian/patches/10_disable_unit_tests
deleted file mode 100644
index e6855ec..0000000
--- a/debian/patches/10_disable_unit_tests
+++ /dev/null
@@ -1,94 +0,0 @@
-Description: Enabling the unit tests causes a binary dep on ndesk-dbus to be created. Patch them out.
-Forwarded: not-needed
-Author: Iain Lane <laney at ubuntu.com>
-Index: tomboy.git/Tomboy/Addins/WebSyncService/Api/Tests/NoteInfoTests.cs
-===================================================================
---- tomboy.git.orig/Tomboy/Addins/WebSyncService/Api/Tests/NoteInfoTests.cs	2011-04-12 19:36:26.686442375 +0100
-+++ tomboy.git/Tomboy/Addins/WebSyncService/Api/Tests/NoteInfoTests.cs	2011-04-12 19:36:07.697186613 +0100
-@@ -23,7 +23,7 @@
- //      Sandy Armstrong <sanfordarmstrong at gmail.com>
- // 
- 
--#if ENABLE_TESTS
-+#if false
- 
- using System;
- 
-Index: tomboy.git/Tomboy/Addins/WebSyncService/Api/Tests/ResourceReferenceTests.cs
-===================================================================
---- tomboy.git.orig/Tomboy/Addins/WebSyncService/Api/Tests/ResourceReferenceTests.cs	2011-04-12 19:36:26.626444727 +0100
-+++ tomboy.git/Tomboy/Addins/WebSyncService/Api/Tests/ResourceReferenceTests.cs	2011-04-12 19:36:07.667187789 +0100
-@@ -23,7 +23,7 @@
- //      Sandy Armstrong <sanfordarmstrong at gmail.com>
- // 
- 
--#if ENABLE_TESTS
-+#if false
- 
- using System;
- 
-Index: tomboy.git/Tomboy/Addins/WebSyncService/Api/Tests/UserInfoTests.cs
-===================================================================
---- tomboy.git.orig/Tomboy/Addins/WebSyncService/Api/Tests/UserInfoTests.cs	2011-04-12 19:36:26.736440417 +0100
-+++ tomboy.git/Tomboy/Addins/WebSyncService/Api/Tests/UserInfoTests.cs	2011-04-12 19:36:07.707186221 +0100
-@@ -23,7 +23,7 @@
- //      Sandy Armstrong <sanfordarmstrong at gmail.com>
- // 
- 
--#if ENABLE_TESTS
-+#if false
- 
- using System;
- 
-Index: tomboy.git/Tomboy/Addins/WebSyncService/Hyena.Json/Tests/DeserializerTests.cs
-===================================================================
---- tomboy.git.orig/Tomboy/Addins/WebSyncService/Hyena.Json/Tests/DeserializerTests.cs	2011-04-12 19:36:27.016429443 +0100
-+++ tomboy.git/Tomboy/Addins/WebSyncService/Hyena.Json/Tests/DeserializerTests.cs	2011-04-12 19:36:07.717185829 +0100
-@@ -26,7 +26,7 @@
- // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- //
- 
--#if ENABLE_TESTS
-+#if false
- 
- using System;
- using System.Reflection;
-Index: tomboy.git/Tomboy/Addins/WebSyncService/Hyena.Json/Tests/SerializerTests.cs
-===================================================================
---- tomboy.git.orig/Tomboy/Addins/WebSyncService/Hyena.Json/Tests/SerializerTests.cs	2011-04-12 19:36:26.956431795 +0100
-+++ tomboy.git/Tomboy/Addins/WebSyncService/Hyena.Json/Tests/SerializerTests.cs	2011-04-12 19:36:07.707186221 +0100
-@@ -23,7 +23,7 @@
- //      Sandy Armstrong <sanfordarmstrong at gmail.com>
- // 
- 
--#if ENABLE_TESTS
-+#if false
- 
- using System;
- 
-Index: tomboy.git/Tomboy/Addins/WebSyncService/Hyena.Json/Tests/TokenizerTests.cs
-===================================================================
---- tomboy.git.orig/Tomboy/Addins/WebSyncService/Hyena.Json/Tests/TokenizerTests.cs	2011-04-12 19:36:27.066427483 +0100
-+++ tomboy.git/Tomboy/Addins/WebSyncService/Hyena.Json/Tests/TokenizerTests.cs	2011-04-12 19:36:07.727185437 +0100
-@@ -26,7 +26,7 @@
- // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- //
- 
--#if ENABLE_TESTS
-+#if false
- 
- using System;
- using System.Reflection;
-Index: tomboy.git/Tomboy/Addins/WebSyncService/Tests/NoteConvertTests.cs
-===================================================================
---- tomboy.git.orig/Tomboy/Addins/WebSyncService/Tests/NoteConvertTests.cs	2011-04-12 19:36:26.476450605 +0100
-+++ tomboy.git/Tomboy/Addins/WebSyncService/Tests/NoteConvertTests.cs	2011-04-12 19:36:07.737185045 +0100
-@@ -23,7 +23,7 @@
- //      Sandy Armstrong <sanfordarmstrong at gmail.com>
- // 
- 
--#if ENABLE_TESTS
-+#if false
- 
- using System;
- using System.Collections.Generic;
diff --git a/debian/patches/series b/debian/patches/series
index ee83618..7d7ba76 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 01_dllmaps.patch
-10_disable_unit_tests
 20_remove_pcfile_requires
 30_fix_manpage_syntax
diff --git a/debian/rules b/debian/rules
index cfc7bf5..79f7d6c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,7 @@ override_dh_auto_configure:
 		--disable-update-mimedb \
 		--disable-panel-applet \
 		--disable-schemas-install \
+		--disable-tests \
 		LDFLAGS="$(LDFLAGS)" \
 		GMCS=/usr/bin/mono-csc
 

-- 
Tomboy - desktop note taking program using Wiki style links