[Pkg-cli-apps-commits] [SCM] gnome-do-plugins branch, master, updated. debian/0.8.4-1-1-gfad2401

[Christopher James Halse Rogers]

The following commit has been merged in the master branch:
commit fad2401d0784d50c74a22a8195f7ed4980eab8cc
Author: Christopher James Halse Rogers <raof at ubuntu.com>
Date:   Mon Aug 29 11:13:40 2011 +1000

    Add 02_select_correct_banshee_dbus_implementation.patch
    
    Fixes the detection of when to use dbus-sharp instead of ndesk.dbus, which
    was causing do-plugins to FTBFS in sid.
    
    Closes: 634433

diff --git a/debian/control b/debian/control
index 3b7f23c..8797ba9 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Build-Depends-Indep:
   mono-devel (>= 2.4.3),
   autotools-dev,
   automake,
+  dh-autoreconf,
   gnome-do (>= 0.8.5),
   banshee (>= 1.4.2),
   pkg-config,
diff --git a/debian/patches/02_select_correct_banshee_dbus_implementation.patch b/debian/patches/02_select_correct_banshee_dbus_implementation.patch
new file mode 100644
index 0000000..db9ef1b
--- /dev/null
+++ b/debian/patches/02_select_correct_banshee_dbus_implementation.patch
@@ -0,0 +1,47 @@
+Description: Select correct DBus implementation for Banshee plugin harder.
+Author: Christopher James Halse Rogers <raof at ubuntu.com>
+Upstream: yes
+
+Index: gnome-do-plugins/configure.ac
+===================================================================
+--- gnome-do-plugins.orig/configure.ac	2011-08-29 10:35:02.005394120 +1000
++++ gnome-do-plugins/configure.ac	2011-08-29 10:40:21.245397488 +1000
+@@ -17,10 +17,7 @@
+ AC_SUBST(ASM_VERSION)
+ 
+ dnl pkg-config
+-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+-if test "x$PKG_CONFIG" = "xno"; then
+-        AC_MSG_ERROR([You need to install pkg-config])
+-fi
++PKG_PROG_PKG_CONFIG
+ 
+ AC_PROG_INSTALL
+ 
+@@ -35,7 +32,25 @@
+ 
+ dnl -- Banshee.CollectionIndexer.dll links to DBus# after 2.1, so the Banshee
+ dnl -- plugin must follow suit.
+-PKG_CHECK_EXISTS([banshee-collection-indexer >= 2.1], BANSHEE_USE_DBUS_SHARP=yes, BANSHEE_USE_DBUS_SHARP=no)
++AC_MSG_CHECKING([Banshee.CollectionIndexer package])
++PKG_CHECK_EXISTS([banshee-collection-indexer],
++		 [BANSHEE_COLLECTION_INDEXER=banshee-collection-indexer],
++		 [BANSHEE_COLLECTION_INDEXER=no])
++if test "x$BANSHEE_COLLECTION_INDEXER" = "xno" ; then
++	PKG_CHECK_EXISTS([banshee-collection-indexer-1],
++			 [BANSHEE_COLLECTION_INDEXER=banshee-collection-indexer-1],
++			 [BANSHEE_COLLECTION_INDEXER=not found])
++fi
++AC_MSG_RESULT([$BANSHEE_COLLECTION_INDEXER])
++
++AC_MSG_CHECKING([which DBus implementation Banshee.CollectionIndexer requires])
++if $PKG_CONFIG --print-requires $BANSHEE_COLLECTION_INDEXER 2>&1 | grep dbus-sharp-1.0 > /dev/null ; then
++	BANSHEE_USE_DBUS_SHARP=yes
++	AC_MSG_RESULT([dbus-sharp])
++else
++	BANSHEE_USE_DBUS_SHARP=no
++	AC_MSG_RESULT([ndesk-dbus])
++fi
+ AM_CONDITIONAL(BANSHEE_DBUS_SHARP, test "x$BANSHEE_USE_DBUS_SHARP" = "xyes")
+ 
+ dnl -- DBus# required for Banshee and Telepathy support
diff --git a/debian/patches/series b/debian/patches/series
index ddc9fbe..1a0e073 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 00_debian_default_plugins.patch
 01_firefox_iceweasel_rename.patch
+02_select_correct_banshee_dbus_implementation.patch
diff --git a/debian/rules b/debian/rules
index 91f5032..6d4ab2d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,4 +22,4 @@ override_dh_auto_clean:
 	dh_auto_clean
 
 %:
-	dh --with quilt,cli $@
+	dh --with quilt,cli,autoreconf $@

-- 
gnome-do-plugins