[Pkg-mpd-commits] [pkg-mpd] 05/09: Refresh patches, dropping those included upstream

Tue Feb 14 21:44:25 UTC 2017

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

fsfs pushed a commit to branch master
in repository pkg-mpd.

commit a72203d5e259faece57f349cea880d331a42231d
Author: Florian Schlichting <fsfs at debian.org>
Date:   Tue Feb 14 20:05:57 2017 +0100

    Refresh patches, dropping those included upstream
---
 .../bind-to-address-socket-activation.patch        |  17 ----
 debian/patches/curl-proxy.patch                    |  21 ----
 debian/patches/hurd_pthread.patch                  |  13 +--
 debian/patches/libsystemd.patch                    | 106 ---------------------
 debian/patches/mpd.service.documentation.patch     |  23 -----
 debian/patches/prune-doc-data.patch                |   4 +-
 debian/patches/series                              |   4 -
 debian/patches/systemd_honor_MPDCONF.patch         |   4 +-
 8 files changed, 5 insertions(+), 187 deletions(-)

diff --git a/debian/patches/bind-to-address-socket-activation.patch b/debian/patches/bind-to-address-socket-activation.patch
deleted file mode 100644
index 0fe2520..0000000
--- a/debian/patches/bind-to-address-socket-activation.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: document that socket activation voids bind_to_address setting
-Author: Florian Schlichting <fsfs at debian.org>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=785418
-Forwarded: http://mailman.blarg.de/pipermail/mpd-devel/2015-June/000363.html
-
---- a/doc/mpdconf.example
-+++ b/doc/mpdconf.example
-@@ -75,7 +75,8 @@
- #
- # This setting sets the address for the daemon to listen on. Careful attention
- # should be paid if this is assigned to anything other then the default, any.
--# This setting can deny access to control of the daemon.
-+# This setting can deny access to control of the daemon. Not effective if
-+# systemd socket activiation is in use.
- #
- # For network
- #bind_to_address		"any"
diff --git a/debian/patches/curl-proxy.patch b/debian/patches/curl-proxy.patch
deleted file mode 100644
index b5cba05..0000000
--- a/debian/patches/curl-proxy.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: document effect of http_proxy envvar on curl plugin
-Author: Florian Schlichting <fsfs at debian.org> 
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=624774
-Forwarded: http://mailman.blarg.de/pipermail/mpd-devel/2015-June/000363.html
-
---- a/doc/user.xml
-+++ b/doc/user.xml
-@@ -1804,6 +1804,13 @@
-           Opens remote files or streams over HTTP.
-         </para>
- 
-+        <para>
-+          Note that unless overridden by the below settings (e.g. by
-+          setting them to a blank value), general curl configuration
-+          from environment variables such as http_proxy or specified
-+          in ~/.curlrc will be in effect.
-+        </para>
-+
-         <informaltable>
-           <tgroup cols="2">
-             <thead>
diff --git a/debian/patches/hurd_pthread.patch b/debian/patches/hurd_pthread.patch
index f7fac4b..6a030e2 100644
--- a/debian/patches/hurd_pthread.patch
+++ b/debian/patches/hurd_pthread.patch
@@ -3,20 +3,9 @@ Description: fix compilation errors on Debian GNU/Hurd
  is special and cannot be used with constexpr. Hence exclude __gnu_hurd__.
 Author: Florian Schlichting <fsfs at debian.org>
 
---- a/src/notify.hxx
-+++ b/src/notify.hxx
-@@ -28,7 +28,7 @@
- 	Cond cond;
- 	bool pending;
- 
--#ifdef __GLIBC__
-+#if defined(__GLIBC__) && !defined(__gnu_hurd__)
- 	constexpr
- #endif
- 	notify():pending(false) {}
 --- a/src/thread/PosixCond.hxx
 +++ b/src/thread/PosixCond.hxx
-@@ -41,7 +41,7 @@
+@@ -43,7 +43,7 @@
  	pthread_cond_t cond;
  
  public:
diff --git a/debian/patches/libsystemd.patch b/debian/patches/libsystemd.patch
deleted file mode 100644
index 76f3f8d..0000000
--- a/debian/patches/libsystemd.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-Description: transition to libsystemd from deprecated libsystemd-daemon
- systemd 209 merged the various libsystemd-* libraries into a single
- libsystemd.so, so we check for that instead and rename the configure
- option, define, etc accordingly.
-Author: Florian Schlichting <fsfs at debian.org>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=779762
-Forwarded: not-needed (solved in a less invasive and backward-compatible way upstream)
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -586,10 +586,10 @@
- MPD_DEPENDS([enable_sqlite], [enable_glib],
- 	[Cannot use --enable-sqlite with --disable-glib])
- 
--AC_ARG_ENABLE(systemd-daemon,
--	AS_HELP_STRING([--enable-systemd-daemon],
--		[use the systemd daemon library (default=auto)]),,
--	[enable_systemd_daemon=$linux_auto])
-+AC_ARG_ENABLE(systemd,
-+	AS_HELP_STRING([--enable-systemd],
-+		[use the systemd library (default=auto)]),,
-+	[enable_systemd=$linux_auto])
- 
- AC_ARG_ENABLE(tcp,
- 	AS_HELP_STRING([--disable-tcp],
-@@ -770,11 +770,11 @@
- 	AC_MSG_ERROR([No client interfaces configured!])
- fi
- 
--MPD_AUTO_PKG(systemd_daemon, SYSTEMD_DAEMON, libsystemd-daemon,
--	[systemd activation], [libsystemd-daemon not found])
--AM_CONDITIONAL(ENABLE_SYSTEMD_DAEMON, test x$enable_systemd_daemon = xyes)
--if test x$enable_systemd_daemon = xyes; then
--	AC_DEFINE([ENABLE_SYSTEMD_DAEMON], 1, [Define to use the systemd daemon library])
-+MPD_AUTO_PKG(systemd, SYSTEMD, libsystemd,
-+	[systemd activation], [libsystemd not found])
-+AM_CONDITIONAL(ENABLE_SYSTEMD, test x$enable_systemd = xyes)
-+if test x$enable_systemd = xyes; then
-+	AC_DEFINE([ENABLE_SYSTEMD], 1, [Define to use the systemd library])
- fi
- 
- dnl ---------------------------------------------------------------------------
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -58,7 +58,7 @@
- 	$(ICU_LDADD) \
- 	libutil.a \
- 	$(FS_LIBS) \
--	$(SYSTEMD_DAEMON_LIBS) \
-+	$(SYSTEMD_LIBS) \
- 	$(GLIB_LIBS)
- 
- src_mpd_SOURCES = \
---- a/config.h.in
-+++ b/config.h.in
-@@ -75,8 +75,8 @@
- /* Define to enable sqlite database support */
- #undef ENABLE_SQLITE
- 
--/* Define to use the systemd daemon library */
--#undef ENABLE_SYSTEMD_DAEMON
-+/* Define to use the systemd library */
-+#undef ENABLE_SYSTEMD
- 
- /* Define to enable the TwoLAME encoder plugin */
- #undef ENABLE_TWOLAME_ENCODER
---- a/src/Listen.cxx
-+++ b/src/Listen.cxx
-@@ -32,7 +32,7 @@
- #include <string.h>
- #include <assert.h>
- 
--#ifdef ENABLE_SYSTEMD_DAEMON
-+#ifdef ENABLE_SYSTEMD
- #include <systemd/sd-daemon.h>
- #endif
- 
-@@ -77,7 +77,7 @@
- 	}
- }
- 
--#ifdef ENABLE_SYSTEMD_DAEMON
-+#ifdef ENABLE_SYSTEMD
- 
- static bool
- listen_systemd_activation(Error &error_r)
-@@ -109,7 +109,7 @@
- 
- 	listen_socket = new ClientListener(loop, partition);
- 
--#ifdef ENABLE_SYSTEMD_DAEMON
-+#ifdef ENABLE_SYSTEMD
- 	if (listen_systemd_activation(error))
- 		return true;
- 
---- a/doc/user.xml
-+++ b/doc/user.xml
-@@ -110,7 +110,7 @@
-   libupnp-dev \
-   libavahi-client-dev \
-   libsqlite3-dev \
--  libsystemd-daemon-dev libwrap0-dev \
-+  libsystemd-dev libwrap0-dev \
-   libcppunit-dev xmlto \
-   libboost-dev \
-   libglib2.0-dev libicu-dev
diff --git a/debian/patches/mpd.service.documentation.patch b/debian/patches/mpd.service.documentation.patch
deleted file mode 100644
index 7ac6106..0000000
--- a/debian/patches/mpd.service.documentation.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: mpd.service: Set the Documentation option
- This makes references to mpd(1) and mpd(5) appear in systemd status output.
-Author: Wieland Hoffmann <themineo at gmail.com>
-Origin: upstream
-
---- a/systemd/system/mpd.service.in
-+++ b/systemd/system/mpd.service.in
-@@ -1,5 +1,6 @@
- [Unit]
- Description=Music Player Daemon
-+Documentation=man:mpd(1) man:mpd.conf(5)
- After=network.target sound.target
- 
- [Service]
---- a/systemd/user/mpd.service.in
-+++ b/systemd/user/mpd.service.in
-@@ -1,5 +1,6 @@
- [Unit]
- Description=Music Player Daemon
-+Documentation=man:mpd(1) man:mpd.conf(5)
- After=network.target sound.target
- 
- [Service]
diff --git a/debian/patches/prune-doc-data.patch b/debian/patches/prune-doc-data.patch
index 25c0647..2397974 100644
--- a/debian/patches/prune-doc-data.patch
+++ b/debian/patches/prune-doc-data.patch
@@ -4,11 +4,11 @@ Forwarded: not-needed
 
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -2109,7 +2109,7 @@
+@@ -2343,7 +2343,7 @@
  #
  
  man_MANS = doc/mpd.1 doc/mpd.conf.5
--doc_DATA = AUTHORS COPYING NEWS README doc/mpdconf.example
+-doc_DATA = AUTHORS COPYING NEWS README.md doc/mpdconf.example
 +doc_DATA = AUTHORS doc/mpdconf.example
  
  DOCBOOK_FILES = doc/protocol.xml doc/user.xml doc/developer.xml
diff --git a/debian/patches/series b/debian/patches/series
index fb8195b..c0b8a44 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,4 @@
 systemd_honor_MPDCONF.patch
-libsystemd.patch
-curl-proxy.patch
-bind-to-address-socket-activation.patch
 prune-doc-data.patch
-mpd.service.documentation.patch
 mpd.service.documentation.user.patch
 hurd_pthread.patch
diff --git a/debian/patches/systemd_honor_MPDCONF.patch b/debian/patches/systemd_honor_MPDCONF.patch
index 4b18f27..c58dfe3 100644
--- a/debian/patches/systemd_honor_MPDCONF.patch
+++ b/debian/patches/systemd_honor_MPDCONF.patch
@@ -4,10 +4,10 @@ Forwarded: not-needed
 
 --- a/systemd/system/mpd.service.in
 +++ b/systemd/system/mpd.service.in
-@@ -3,7 +3,8 @@
- After=network.target sound.target
+@@ -5,7 +5,8 @@
  
  [Service]
+ Type=notify
 -ExecStart=@prefix@/bin/mpd --no-daemon
 +EnvironmentFile=/etc/default/mpd
 +ExecStart=@prefix@/bin/mpd --no-daemon $MPDCONF

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

