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

[Iain Lane]

The following commit has been merged in the master branch:
commit b6e36a324e9353e99e9e21962cbb5120c372cd40
Author: Iain Lane <laney at debian.org>
Date:   Mon Mar 12 21:06:48 2012 +0000

    Use GMime 2.6 instead of 2.4; the latter is being dropped.
    
    Closes: #663216

diff --git a/debian/control b/debian/control
index 56d41af..cf41d5c 100644
--- a/debian/control
+++ b/debian/control
@@ -4,17 +4,20 @@ Priority: optional
 Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
 Uploaders: Sebastian Dröge <slomo at debian.org>, Iain Lane <laney at debian.org>
 Build-Depends: debhelper (>= 7.0.50),
+               dh-autoreconf,
+               gnome-common,
                intltool,
                pngquant,
                mono-devel (>= 2.4.3),
                libgtk2.0-cil-dev (>= 2.10.4),
+               libgconf2-dev,
                libgconf2.0-cil-dev (>= 2.24),
                libgtkspell-dev (>= 2.0.9),
                cli-common-dev (>= 0.5.7),
                imagemagick,
                libgtk2.0-dev (>= 2.14.0),
                libatk1.0-dev (>= 1.2.4),
-               libgmime2.4-cil-dev,
+               libgmime2.6-cil-dev,
                gnome-doc-utils (>= 0.3.2),
                scrollkeeper,
                libdbus1.0-cil-dev (>= 0.4),
diff --git a/debian/patches/40_use_gmime_2.6.patch b/debian/patches/40_use_gmime_2.6.patch
new file mode 100644
index 0000000..7cacabd
--- /dev/null
+++ b/debian/patches/40_use_gmime_2.6.patch
@@ -0,0 +1,19 @@
+Description: Use gmime 2.6 instead of 2.4
+Author: Michael Biebl <biebl at debian.org>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=663216
+
+Index: tomboy/configure.in
+===================================================================
+--- tomboy.orig/configure.in	2012-03-12 21:05:16.128137316 +0000
++++ tomboy/configure.in	2012-03-12 21:06:16.085786547 +0000
+@@ -232,8 +232,8 @@
+ # Evolution.dll needs GMime#
+ #
+ if test "x$ENABLE_GNOME" != "xno"; then
+-	if pkg-config --exists gmime-sharp-2.4; then
+-		PKG_CHECK_MODULES(EVOLUTION, gmime-sharp-2.4, ENABLE_EVOLUTION="yes", ENABLE_EVOLUTION="no")
++	if pkg-config --exists gmime-sharp-2.6; then
++		PKG_CHECK_MODULES(EVOLUTION, gmime-sharp-2.6, ENABLE_EVOLUTION="yes", ENABLE_EVOLUTION="no")
+ 	else
+ 		PKG_CHECK_MODULES(EVOLUTION, gmime-sharp >= 2.2.7, ENABLE_EVOLUTION="yes", ENABLE_EVOLUTION="no")
+ 	fi
diff --git a/debian/patches/series b/debian/patches/series
index 7d7ba76..3d4256a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01_dllmaps.patch
 20_remove_pcfile_requires
 30_fix_manpage_syntax
+40_use_gmime_2.6.patch
diff --git a/debian/rules b/debian/rules
index ce78be9..0de1087 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,9 @@ DEB_SOURCE_NAME = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^
 DEB_VERSION = $(shell dpkg-parsechangelog -l$(DEBIAN_DIR)/changelog | grep ^Version | cut -d" " -f2)   
 VERSION = $(shell echo $(DEB_VERSION) | cut -d"-" -f1 | sed 's/+dfsg.*//')
 
+override_dh_autoreconf:
+	NOCONFIGURE=1 dh_autoreconf /usr/bin/gnome-autogen.sh
+
 override_dh_auto_configure:
 	dh_auto_configure -- \
 		--disable-scrollkeeper \
@@ -42,6 +45,6 @@ get-orig-source:
 		--rename
 
 %:
-	dh $@
+	dh $@ --with autoreconf
 
 .PHONY: get-orig-source

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