[Pkg-telepathy-commits] [folks] 02/15: Add patch to reduce dependency on evolution-data-server

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch telepathy1
in repository folks.

commit dd4385eb2b21039a5015dc8c8f1715f3c81d16a2
Author: Simon McVittie <smcv at debian.org>
Date:   Tue Mar 25 16:10:54 2014 +0000

    Add patch to reduce dependency on evolution-data-server
---
 debian/changelog                                   |  3 ++
 debian/control                                     |  4 +--
 ...book-dependency-when-not-compiling-the-Bl.patch | 38 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 938ada2..fe898b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ folks (0.9.6-2) UNRELEASED; urgency=medium
 
   * Team upload
   * Disable fatal deprecation warnings
+  * Add patch to reduce dependency on evolution-data-server: it's only
+    the BlueZ backend, which we don't compile, that needs a newer version
+    than 3.8.
 
  -- Simon McVittie <smcv at debian.org>  Tue, 25 Mar 2014 15:37:49 +0000
 
diff --git a/debian/control b/debian/control
index 7c0932c..296b7dd 100644
--- a/debian/control
+++ b/debian/control
@@ -19,9 +19,9 @@ Build-Depends: debhelper (>= 9),
                libxml2-dev,
                libncurses5-dev,
                libreadline6-dev,
-               libebook1.2-dev (>= 3.9.1),
+               libebook1.2-dev (>= 3.8),
                libedataserver1.2-dev (>= 3.7.90),
-               libebook-contacts1.2-dev (>= 3.9.1),
+               libebook-contacts1.2-dev (>= 3.8),
                libzeitgeist-2.0-dev (>= 0.9.14)
 Standards-Version: 3.9.5
 Section: libs
diff --git a/debian/patches/0001-Reduce-libebook-dependency-when-not-compiling-the-Bl.patch b/debian/patches/0001-Reduce-libebook-dependency-when-not-compiling-the-Bl.patch
new file mode 100644
index 0000000..2b2dfdb
--- /dev/null
+++ b/debian/patches/0001-Reduce-libebook-dependency-when-not-compiling-the-Bl.patch
@@ -0,0 +1,38 @@
+From: Simon McVittie <simon.mcvittie at collabora.co.uk>
+Date: Mon, 24 Mar 2014 09:45:01 +0000
+Subject: Reduce libebook dependency when not compiling the BlueZ backend
+
+Debian unstable is currently stuck with Evolution 3.8, due to the
+number of ABI transitions required to get from here to there. Folks
+does not appear to need a newer version if the optional BlueZ backend
+is not installed, and Debian doesn't currently enable that backend
+anyway.
+
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=726980
+---
+ configure.ac | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index cfadede..79c54fe 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -202,7 +202,8 @@ VALA_REQUIRED=0.22.0.28-9090
+ VALADOC_REQUIRED=0.3.1
+ TRACKER_SPARQL_MAJOR=0.16
+ TRACKER_SPARQL_REQUIRED=0.15.2
+-EBOOK_REQUIRED=3.9.1
++EBOOK_REQUIRED=3.8
++EBOOK_REQUIRED_FOR_BLUEZ=3.9.1
+ EDATASERVER_REQUIRED=3.5.3.1
+ ZEITGEIST_REQUIRED=0.9.14
+ GEE_REQUIRED=0.8.4
+@@ -263,6 +264,8 @@ AS_IF([test x$enable_tracker_backend = xyes], [
+                            $TRACKER_SPARQL_REQUIRED])
+ ])
+ 
++AS_IF([test x$enable_bluez_backend = xyes], [EBOOK_REQUIRED=$EBOOK_REQUIRED_FOR_BLUEZ])
++
+ AS_IF([test x$enable_eds_backend = xyes], [
+         PKG_CHECK_MODULES([EBOOK], [libebook-1.2 >= $EBOOK_REQUIRED
+                                     libebook-contacts-1.2 >= $EBOOK_REQUIRED])
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c5cb21c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Reduce-libebook-dependency-when-not-compiling-the-Bl.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/folks.git