[Pkg-cli-libs-commits] [SCM] zeitgeist-sharp branch, master, updated. debian/0.8.0.0-2-5-gd617154

[Iain Lane]

The following commit has been merged in the master branch:
commit 273cd3093f8f8cd26ff1d3dd43f82f42c3559a42
Author: Iain Lane <laney at debian.org>
Date:   Sun Jun 17 19:39:56 2012 +0100

    Check for zeitgeist-daemon executable instead of using pkg-config.
    
    Resolves FTBFS.
    
    Closes: #669469
    LP: #935495

diff --git a/debian/patches/series b/debian/patches/series
index 35cdb06..2d251b3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 tweak_pcfile_location_for_debianisms.patch
+zeitgeist-daemon-ac-check-prog.patch
diff --git a/debian/patches/zeitgeist-daemon-ac-check-prog.patch b/debian/patches/zeitgeist-daemon-ac-check-prog.patch
new file mode 100644
index 0000000..f8488a1
--- /dev/null
+++ b/debian/patches/zeitgeist-daemon-ac-check-prog.patch
@@ -0,0 +1,18 @@
+Description: Check for the zeitgeist-daemon executable instead of using pkg-config
+Author: Manish Sinha <manishsinha at ubuntu.com>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=669469
+Forwarded: not-needed
+
+Index: b/configure.ac
+===================================================================
+--- a/configure.ac
++++ b/configure.ac
+@@ -45,7 +45,7 @@
+ PKG_CHECK_MODULES([DBUS_SHARP_GLIB_10], [dbus-sharp-glib-1.0])
+ PKG_CHECK_MODULES([GLIB_SHARP_20], [glib-sharp-2.0])
+ 
+-PKG_CHECK_MODULES([ZEITGEIST_DAEMON], [zeitgeist-daemon >= 0.7.1])
++AC_CHECK_PROG([ZEITGEIST_DAEMON], [zeitgeist-daemon], yes, no)
+ 
+ AC_CONFIG_FILES([
+ Zeitgeist/zeitgeist-sharp.pc

-- 
zeitgeist-sharp