[Pkg-cli-apps-commits] [blam] 01/01: Move to use dbus-sharp-2.0 and dbus-sharp-glib-2.0

[Carlos Martín Nieto]

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

cmartin-guest pushed a commit to branch maint-1.8.9
in repository blam.

commit 5a2ac285a4595826a2daedebd031bdbe6621392f
Author: Carlos Martín Nieto <cmn at dwim.me>
Date:   Mon Oct 13 12:44:22 2014 +0200

    Move to use dbus-sharp-2.0 and dbus-sharp-glib-2.0
---
 debian/control                      |  2 +-
 debian/patches/0004-Use-dbus2.patch | 48 +++++++++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 debian/rules                        |  2 +-
 4 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index ab8072f..69d8036 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends-Indep: mono-devel (>= 2.4.3),
  libgconf2.0-cil-dev,
  libglade2.0-cil-dev,
  libwebkit-cil-dev,
- libdbus-glib1.0-cil-dev | libndesk-dbus-glib1.0-cil-dev
+ libdbus-glib2.0-cil-dev
 Standards-Version: 3.9.2
 Homepage: http://blam.cmartin.tk
 Vcs-Git: git://git.debian.org/pkg-cli-apps/packages/blam.git
diff --git a/debian/patches/0004-Use-dbus2.patch b/debian/patches/0004-Use-dbus2.patch
new file mode 100644
index 0000000..857deb6
--- /dev/null
+++ b/debian/patches/0004-Use-dbus2.patch
@@ -0,0 +1,48 @@
+Description: Use dbus-sharp-2
+Bug-Debian: https://bugs.debian.org/761535
+Author: Carlos Martín Nieto <cmn at dwim.me>
+
+Debian now only has dbus-sharp-2.0 and dbus-glib-2.0.
+
+
+Index: blam/configure.in
+===================================================================
+--- blam.orig/configure.in
++++ blam/configure.in
+@@ -60,25 +60,18 @@ AC_ARG_WITH([dbus],
+ 	[],
+ 	with_dbus=auto
+ )
+-# In auto mode, prefer dbus-sharp
+-PKG_CHECK_EXISTS([dbus-sharp-1.0], DBUS_SHARP_SUPPORT=yes, DBUS_SHARP_SUPPORT=no)
+-PKG_CHECK_EXISTS([ndesk-dbus-1.0], NDESK_DBUS_SUPPORT=yes, NDESK_DBUS_SUPPORT=no)
+-if test "x$with_dbus" = "xauto"; then
+-   if test "$DBUS_SHARP_SUPPORT" = "xyes"; then
+-      ENABLE_DBUS=$DBUS_SHARP_SUPPORT
+-   else
+-      ENABLE_DBUS=$NDESK_DBUS_SUPPORT
+-   fi
++
++PKG_CHECK_EXISTS([dbus-sharp-2.0], DBUS_SHARP_SUPPORT=yes, DBUS_SHARP_SUPPORT=no)
++if test "x$with_dbus" = "xauto" -o "x$with_dbus" = "xyes"; then
++  ENABLE_DBUS=$DBUS_SHARP_SUPPORT
++else
++  ENABLE_DBUS="no"
+ fi
+-# If we found a package or the user told us
+-if test "x$with_dbus" = "xyes"; then
+-   if test "x$DBUS_SHARP_SUPPORT" = "xyes"; then
+-      PKG_CHECK_MODULES(DBUS_SHARP, dbus-sharp-glib-1.0, ENABLE_NDESK_DBUS="yes", ENABLE_NDESK_DBUS="no")
+-      AC_SUBST(DBUS_LIBS, "$DBUS_SHARP_LIBS")
+-   else
+-      PKG_CHECK_MODULES(DBUS_NDESK, ndesk-dbus-glib-1.0, ENABLE_DBUS_SHARP="yes", ENABLE_DBUS_SHARP="no")
+-      AC_SUBST(DBUS_LIBS, "$DBUS_NDESK_LIBS")
+-   fi
++
++# If we found the package
++if test "x$ENABLE_DBUS" = "xyes"; then
++   PKG_CHECK_MODULES(DBUS_SHARP, dbus-sharp-glib-2.0, ENABLE_DBUS_SHARP="yes", ENABLE_DBUS_SHARP="no")
++   AC_SUBST(DBUS_LIBS, "$DBUS_SHARP_LIBS")
+ fi
+ # Tell the code what we're using
+ AM_CONDITIONAL(NDESK_DBUS, test "x$ENABLE_NDESK_DBUS" = "xyes")
diff --git a/debian/patches/series b/debian/patches/series
index 6876116..3876821 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Add-the-Planet-Debian-feed-by-default.patch
 0002-Use-elif.patch
 0003-Make-Show-in-browser-a-link-in-the-blam-theme.patch
+0004-Use-dbus2.patch
diff --git a/debian/rules b/debian/rules
index aae238c..82ff63b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ include /usr/share/cli-common/cli.make
 export MONO_SHARED_DIR=$(CURDIR)
 
 %:
-	dh  $@
+	dh  $@ --with autoreconf
 override_dh_auto_configure::
 	dh_auto_configure -- GMCS=/usr/bin/mono-csc MCS=/usr/bin/mono-csc
 override_dh_clean::

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/blam.git