[Pkg-cli-apps-commits] [banshee] 01/04: Drop obsolete gnome-desktop dependency

[Chow Loong Jin]

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

hyperair pushed a commit to branch master
in repository banshee.

commit c669405fe46183e9d5a7ff840fb7cb828a210cbf
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Sat Sep 12 22:01:12 2015 +0800

    Drop obsolete gnome-desktop dependency
---
 debian/control                                     |  1 -
 ...e-obsolete-check-for-gnome-desktop-2.0-2..patch | 31 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index b1c1fa5..3ed454a 100644
--- a/debian/control
+++ b/debian/control
@@ -45,7 +45,6 @@ Build-Depends: debhelper (>= 9),
                libgstreamer1.0-dev (>= 0.10.26),
                libgstreamer-plugins-base1.0-dev (>= 0.10.26),
                gnome-doc-utils (>= 0.17.3),
-               libgnome-desktop-dev,
                libmono-upnp-cil-dev (>= 0.1.1-2~),
                libdbus-glib-1-dev (>= 0.80)
 Standards-Version: 3.9.3
diff --git a/debian/patches/build-Remove-obsolete-check-for-gnome-desktop-2.0-2..patch b/debian/patches/build-Remove-obsolete-check-for-gnome-desktop-2.0-2..patch
new file mode 100644
index 0000000..80d650c
--- /dev/null
+++ b/debian/patches/build-Remove-obsolete-check-for-gnome-desktop-2.0-2..patch
@@ -0,0 +1,31 @@
+From: Bertrand Lorentz <bertrand.lorentz at gmail.com>
+Date: Sat, 12 Sep 2015 21:59:33 +0800
+Subject: build: Remove obsolete check for gnome-desktop-2.0 >= 2.28
+
+The check was just used to put the right name in the .desktop file. We
+keep the check for MeeGo to still do the right thing there.
+
+From: commit:ed39c120a1aa604d0b5e324580a044715c033a17
+---
+ configure.ac | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 5e272ba..7926526 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -69,12 +69,9 @@ SHAMROCK_FIND_MONO_2_0_COMPILER
+ SHAMROCK_FIND_MONO_RUNTIME
+ SHAMROCK_CHECK_MONO_2_0_GAC_ASSEMBLIES([Mono.Cairo Mono.Posix ICSharpCode.SharpZipLib])
+ 
+-dnl Check for GNOME >= 2.28 to see if we should remove
+-dnl 'Media Player' from the app Name, bgo#596242, except
+-dnl in MeeGo where GNOME >= 2.28, but we want the full name
+-PKG_CHECK_MODULES(GNOME_2_28, gnome-desktop-2.0 >= 2.28, HAVE_GNOME_2_28=yes, HAVE_GNOME_2_28=no)
++dnl In MeeGo we want the full name, but not in GNOME 3 (see bgo#596242)
+ PKG_CHECK_MODULES(MEEGO_PANEL, meego-panel, HAVE_MEEGO_PANEL=yes, HAVE_MEEGO_PANEL=no)
+-if test "x$HAVE_GNOME_2_28" = "xno" -o "x$HAVE_MEEGO_PANEL" = "xyes"; then
++if "x$HAVE_MEEGO_PANEL" = "xyes"; then
+ 	BANSHEE_DESKTOP_NAME="_Name=Banshee Media Player"
+ else
+ 	BANSHEE_DESKTOP_NAME="_Name=Banshee"
diff --git a/debian/patches/series b/debian/patches/series
index 9ba96c8..8d8859c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@ Use-new-style-GStreamer-1.0-raw-audio-caps-in-the-WA.patch
 Use-dbus-2.patch
 Remove-IDBusExportable-inheritance-from-exported-int.patch
 Database-fix-performance-for-the-new-SQLite-s-query-.patch
+build-Remove-obsolete-check-for-gnome-desktop-2.0-2..patch

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