[Pkg-cli-apps-commits] [SCM] Tomboy - desktop note taking program using Wiki style links branch, master-devel, updated. debian/1.2.1-1-12-g96075af

[Iain Lane]

The following commit has been merged in the master-devel branch:
commit 10012c15a00396db0042e9a0e1eaf6b7112a4101
Author: Iain Lane <laney at ubuntu.com>
Date:   Sun Jul 4 18:00:47 2010 +0100

    debian/patches/*: Add patch headers

diff --git a/debian/patches/01_dllmaps.patch b/debian/patches/01_dllmaps.patch
index 8db26ff..97a39e0 100644
--- a/debian/patches/01_dllmaps.patch
+++ b/debian/patches/01_dllmaps.patch
@@ -1,3 +1,4 @@
+Description: Update libtomboy dllmap to use absolute path
 Index: tomboy.git/Tomboy/Tomboy.exe.config.in
 ===================================================================
 --- tomboy.git.orig/Tomboy/Tomboy.exe.config.in	2009-04-27 18:29:09.000000000 +0100
diff --git a/debian/patches/10_disable_unit_tests b/debian/patches/10_disable_unit_tests
index 93851d7..5f73389 100644
--- a/debian/patches/10_disable_unit_tests
+++ b/debian/patches/10_disable_unit_tests
@@ -1,8 +1,11 @@
+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/configure.in
 ===================================================================
---- tomboy.git.orig/configure.in	2010-04-02 23:29:04.379138367 +0100
-+++ tomboy.git/configure.in	2010-04-02 23:29:26.719138968 +0100
-@@ -283,10 +283,10 @@
+--- tomboy.git.orig/configure.in	2010-07-04 15:03:35.208602782 +0100
++++ tomboy.git/configure.in	2010-07-04 15:28:43.618602487 +0100
+@@ -272,10 +272,10 @@
  #
  # NUnit required for (optional) unit tests
  #

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