[Pkg-mpd-commits] [gmpc-plugins] 01/01: Imported Debian patch 11.8.16-2.1

[Etienne Millon]

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

emillon-guest pushed a commit to branch master
in repository gmpc-plugins.

commit 61eca2d63b02ef5c459a43aab20a25dd9303ea00
Author: Antoine Beaupré <anarcat at debian.org>
Date:   Fri Apr 15 18:20:01 2016 -0400

    Imported Debian patch 11.8.16-2.1
---
 debian/changelog               |  9 +++++++++
 debian/patches/kill-term.patch | 24 ++++++++++++++++++++++++
 debian/patches/series          |  1 +
 debian/rules                   |  7 ++++++-
 4 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c744dc7..b35a286 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+gmpc-plugins (11.8.16-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Disable a bunch of plugins (jamendo, magnatune, tagedit and albumview)
+    to workaround FTBFS (Closes: #807735)
+  * shout plugin should kill with TERM instead of HUP (Closes: #820908)
+
+ -- Antoine Beaupré <anarcat at debian.org>  Fri, 15 Apr 2016 18:20:01 -0400
+
 gmpc-plugins (11.8.16-2) unstable; urgency=low
 
   * Disable LyricWiki plugin (Closes: #539821)
diff --git a/debian/patches/kill-term.patch b/debian/patches/kill-term.patch
new file mode 100644
index 0000000..3e66c53
--- /dev/null
+++ b/debian/patches/kill-term.patch
@@ -0,0 +1,24 @@
+Description: kill streaming process with SIGTERM
+
+ ogg123 doesn't stop when sent SIGHUP. this is probably so that you
+ can start music in a terminal and keep it running when the terminal
+ is closed, so it makes sense to me. unfortunately, the shout plugin
+ sends SIGHUP when the player is stopped, so ogg123 keeps on
+ going. many users probably don't notice the issue because, logically,
+ the stream itself should stop working and then ogg123 will terminate,
+ but some streams have a fallback configured, which plays the same
+ track over and over again.
+ 
+Author: Antoine Beaupré
+
+--- gmpc-plugins-11.8.16.orig/gmpc-shout/src/plugin.c
++++ gmpc-plugins-11.8.16/gmpc-shout/src/plugin.c
+@@ -301,7 +301,7 @@ static void stop_ogg123(void)
+ 	{
+ #ifndef __WIN32__
+ 		printf("killing: %i\n", ogg123_pid);
+-		kill (ogg123_pid, SIGHUP);
++		kill (ogg123_pid, SIGTERM);
+ #else
+ 		TerminateProcess (ogg123_pid, 1);
+ #endif
diff --git a/debian/patches/series b/debian/patches/series
index f7528c1..78e4a8e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Fix-typo-Psychadelic-Psychedelic.patch
+kill-term.patch
diff --git a/debian/rules b/debian/rules
index 5797a8a..470ceb8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,12 @@ DEB_DH_STRIP_ARGS:=--dbg-package=$(DBG_NAME)
 	dh $@ --with autoreconf
 
 override_dh_auto_configure:
-	dh_auto_configure -- --disable-lyricwiki
+	dh_auto_configure -- \
+		--disable-lyricwiki \
+		--disable-jamendo \
+		--disable-magnatune \
+		--disable-tagedit \
+		--disable-albumview
 
 override_dh_strip:
 	dh_strip $(DEB_DH_STRIP_ARGS)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mpd/gmpc-plugins.git