[Pkg-cli-apps-commits] [SCM] Tomboy - desktop note taking program using Wiki style links branch, master, updated. debian/1.0.1-2-1-g8c0b464

[Iain Lane]

The following commit has been merged in the master branch:
commit 8c0b464c633acd0b446aa7d9f6d848dae3b47480
Author: Iain Lane <laney at ubuntu.com>
Date:   Thu Dec 17 21:44:04 2009 +0000

    Disable unit tests, use mono-devel >= 2.4.3
    
    * debian/patches/10_disable_unit_tests.patch: Disable unit tests
      unconditionally as they cause a non-deterministic build depending on
      whether nunit is present or not.
    * debian/control: Remove all build-deps from `mono' source package and
      instead rely on mono-devel (>= 2.4.3) to pull them in.

diff --git a/debian/changelog b/debian/changelog
index a7a82bd..fd1d967 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+tomboy (1.0.1-3) UNRELEASED; urgency=low
+
+  * debian/patches/10_disable_unit_tests.patch: Disable unit tests
+    unconditionally as they cause a non-deterministic build depending on
+    whether nunit is present or not.
+  * debian/control: Remove all build-deps from `mono' source package and
+    instead rely on mono-devel (>= 2.4.3) to pull them in. 
+
+ -- Iain Lane <laney at ubuntu.com>  Thu, 17 Dec 2009 21:43:20 +0000
+
 tomboy (1.0.1-2) unstable; urgency=low
 
   * debian/ltmain-as-needed.sh: Update, as a version mismatch with
diff --git a/debian/control b/debian/control
index b5bd480..70dc763 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 7.0.50),
                libtool,
                intltool,
                pngquant,
-               mono-devel (>= 2.4.2.3),
+               mono-devel (>= 2.4.3),
                libgtk2.0-cil (>= 2.10.4),
                libgconf2.0-cil,
                libgnome2.24-cil,
@@ -23,7 +23,6 @@ Build-Depends: debhelper (>= 7.0.50),
                libgmime2.4-cil,
                gnome-doc-utils (>= 0.3.2),
                scrollkeeper,
-               libmono-cairo2.0-cil,
                libndesk-dbus1.0-cil (>= 0.4),
                libndesk-dbus-glib1.0-cil (>= 0.3),
                libmono-addins0.2-cil (>= 0.3),
diff --git a/debian/patches/10_disable_unit_tests b/debian/patches/10_disable_unit_tests
new file mode 100644
index 0000000..2a91683
--- /dev/null
+++ b/debian/patches/10_disable_unit_tests
@@ -0,0 +1,18 @@
+Index: tomboy.git/configure.in
+===================================================================
+--- tomboy.git.orig/configure.in	2009-12-17 21:45:00.368882798 +0000
++++ tomboy.git/configure.in	2009-12-17 21:52:28.138882748 +0000
+@@ -266,10 +266,10 @@
+ #
+ # NUnit required for (optional) unit tests
+ #
+-PKG_CHECK_MODULES(NUNIT, mono-nunit, HAVE_NUNIT="yes", HAVE_NUNIT="no")
++#PKG_CHECK_MODULES(NUNIT, mono-nunit, HAVE_NUNIT="yes", HAVE_NUNIT="no")
+ AM_CONDITIONAL(HAVE_NUNIT, test "$HAVE_NUNIT" = "yes")
+-AC_SUBST(NUNIT_LIBS)
+-AC_PATH_PROG(NUNIT, nunit-console)
++#AC_SUBST(NUNIT_LIBS)
++#AC_PATH_PROG(NUNIT, nunit-console)
+ 
+ #
+ # Check for X11 libraries
diff --git a/debian/patches/series b/debian/patches/series
index b0814fc..f228118 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01_dllmaps.patch
+10_disable_unit_tests

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