[Pkg-mpd-commits] [pkg-mpd] 12/13: Refresh patches

[Florian Schlichting]

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

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

commit 8bb82e6ed597b0683cab886c1c79a4456417984a
Author: Florian Schlichting <fsfs at debian.org>
Date:   Tue Dec 13 21:34:51 2016 +0100

    Refresh patches
---
 debian/patches/curl-proxy.patch                     |  2 +-
 debian/patches/libsystemd.patch                     |  4 ++--
 debian/patches/mpd.service.documentation.patch      | 15 +++++++++++----
 debian/patches/mpd.service.documentation.user.patch | 14 ++++++++++++--
 debian/patches/prune-doc-data.patch                 |  2 +-
 debian/patches/systemd_honor_MPDCONF.patch          |  4 ++--
 6 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/debian/patches/curl-proxy.patch b/debian/patches/curl-proxy.patch
index dd58913..b5cba05 100644
--- a/debian/patches/curl-proxy.patch
+++ b/debian/patches/curl-proxy.patch
@@ -5,7 +5,7 @@ Forwarded: http://mailman.blarg.de/pipermail/mpd-devel/2015-June/000363.html
 
 --- a/doc/user.xml
 +++ b/doc/user.xml
-@@ -1777,6 +1777,13 @@
+@@ -1804,6 +1804,13 @@
            Opens remote files or streams over HTTP.
          </para>
  
diff --git a/debian/patches/libsystemd.patch b/debian/patches/libsystemd.patch
index 1cb142a..76f3f8d 100644
--- a/debian/patches/libsystemd.patch
+++ b/debian/patches/libsystemd.patch
@@ -8,7 +8,7 @@ Forwarded: not-needed (solved in a less invasive and backward-compatible way ups
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -570,10 +570,10 @@
+@@ -586,10 +586,10 @@
  MPD_DEPENDS([enable_sqlite], [enable_glib],
  	[Cannot use --enable-sqlite with --disable-glib])
  
@@ -23,7 +23,7 @@ Forwarded: not-needed (solved in a less invasive and backward-compatible way ups
  
  AC_ARG_ENABLE(tcp,
  	AS_HELP_STRING([--disable-tcp],
-@@ -754,11 +754,11 @@
+@@ -770,11 +770,11 @@
  	AC_MSG_ERROR([No client interfaces configured!])
  fi
  
diff --git a/debian/patches/mpd.service.documentation.patch b/debian/patches/mpd.service.documentation.patch
index 173d0d4..7ac6106 100644
--- a/debian/patches/mpd.service.documentation.patch
+++ b/debian/patches/mpd.service.documentation.patch
@@ -3,10 +3,17 @@ Description: mpd.service: Set the Documentation option
 Author: Wieland Hoffmann <themineo at gmail.com>
 Origin: upstream
 
-diff --git a/systemd/mpd.service.in b/systemd/mpd.service.in
-index a72eb92..caf0d67 100644
---- a/systemd/mpd.service.in
-+++ b/systemd/mpd.service.in
+--- 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
diff --git a/debian/patches/mpd.service.documentation.user.patch b/debian/patches/mpd.service.documentation.user.patch
index c55cc65..38ecda0 100644
--- a/debian/patches/mpd.service.documentation.user.patch
+++ b/debian/patches/mpd.service.documentation.user.patch
@@ -2,8 +2,18 @@ Description: add user documentation to systemd status
 Author: Florian Schlichting <fsfs at debian.org>
 Forwarded: not-needed
 
---- a/systemd/mpd.service.in
-+++ b/systemd/mpd.service.in
+--- a/systemd/system/mpd.service.in
++++ b/systemd/system/mpd.service.in
+@@ -1,6 +1,7 @@
+ [Unit]
+ Description=Music Player Daemon
+ Documentation=man:mpd(1) man:mpd.conf(5)
++Documentation=file:///usr/share/doc/mpd/user-manual.html
+ After=network.target sound.target
+ 
+ [Service]
+--- a/systemd/user/mpd.service.in
++++ b/systemd/user/mpd.service.in
 @@ -1,6 +1,7 @@
  [Unit]
  Description=Music Player Daemon
diff --git a/debian/patches/prune-doc-data.patch b/debian/patches/prune-doc-data.patch
index 16e9d08..25c0647 100644
--- a/debian/patches/prune-doc-data.patch
+++ b/debian/patches/prune-doc-data.patch
@@ -4,7 +4,7 @@ Forwarded: not-needed
 
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -2104,7 +2104,7 @@
+@@ -2109,7 +2109,7 @@
  #
  
  man_MANS = doc/mpd.1 doc/mpd.conf.5
diff --git a/debian/patches/systemd_honor_MPDCONF.patch b/debian/patches/systemd_honor_MPDCONF.patch
index c8de5a9..4b18f27 100644
--- a/debian/patches/systemd_honor_MPDCONF.patch
+++ b/debian/patches/systemd_honor_MPDCONF.patch
@@ -2,8 +2,8 @@ Description: source $MPDCONF from /etc/default/mpd
 Author: Florian Schlichting <fsfs at debian.org>
 Forwarded: not-needed
 
---- a/systemd/mpd.service.in
-+++ b/systemd/mpd.service.in
+--- a/systemd/system/mpd.service.in
++++ b/systemd/system/mpd.service.in
 @@ -3,7 +3,8 @@
  After=network.target sound.target
  

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