[Pkg-mpd-commits] [pkg-mpd] 05/06: Drop typo.patch and stdint.patch, applied upstream; refresh curl-proxy.patch and libsystemd.patch (offset)

[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 bf2200b9e53791acc2264a6108dc2598de538de8
Author: Florian Schlichting <fsfs at debian.org>
Date:   Sat Apr 30 23:51:25 2016 +0200

    Drop typo.patch and stdint.patch, applied upstream; refresh curl-proxy.patch and libsystemd.patch (offset)
---
 debian/changelog                |  2 ++
 debian/patches/curl-proxy.patch |  2 +-
 debian/patches/libsystemd.patch |  2 +-
 debian/patches/series           |  2 --
 debian/patches/stdint.patch     | 16 ----------------
 debian/patches/typo.patch       | 15 ---------------
 6 files changed, 4 insertions(+), 35 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e2fee3d..23815c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ mpd (0.19.15-1) unstable; urgency=medium
   * Import Upstream version 0.19.15 (Closes: #822848)
   * Disable failing tests on mips64el (Binutils assertion), like we do on mips
     and mipsel
+  * Drop typo.patch and stdint.patch, applied upstream; refresh
+    curl-proxy.patch and libsystemd.patch (offset)
 
  -- Florian Schlichting <fsfs at debian.org>  Sat, 30 Apr 2016 23:47:35 +0200
 
diff --git a/debian/patches/curl-proxy.patch b/debian/patches/curl-proxy.patch
index c601d77..dd58913 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
-@@ -1736,6 +1736,13 @@
+@@ -1777,6 +1777,13 @@
            Opens remote files or streams over HTTP.
          </para>
  
diff --git a/debian/patches/libsystemd.patch b/debian/patches/libsystemd.patch
index 1c9b9d4..cd03ebe 100644
--- a/debian/patches/libsystemd.patch
+++ b/debian/patches/libsystemd.patch
@@ -95,7 +95,7 @@ Forwarded: not-needed (solved in a less invasive and backward-compatible way ups
  
 --- a/doc/user.xml
 +++ b/doc/user.xml
-@@ -109,7 +109,7 @@
+@@ -110,7 +110,7 @@
    libupnp-dev \
    libavahi-client-dev \
    libsqlite3-dev \
diff --git a/debian/patches/series b/debian/patches/series
index ef53f82..14dd1e7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,11 +1,9 @@
 systemd_honor_MPDCONF.patch
-typo.patch
 also-dis_en_able-socket.patch
 protect_system.patch
 libsystemd.patch
 curl-proxy.patch
 bind-to-address-socket-activation.patch
 prune-doc-data.patch
-stdint.patch
 mpd.service.documentation.patch
 mpd.service.documentation.user.patch
diff --git a/debian/patches/stdint.patch b/debian/patches/stdint.patch
deleted file mode 100644
index 38a6ab0..0000000
--- a/debian/patches/stdint.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: fix a build failure caused by a lacking include
-Author: Florian Schlichting <fsfs at debian.org>
-Bug-Debian: http://bugs.debian.org/822401
-
-diff --git a/src/decoder/DecoderBuffer.hxx b/src/decoder/DecoderBuffer.hxx
-index 9cf47d9..db5b30e 100644
---- a/src/decoder/DecoderBuffer.hxx
-+++ b/src/decoder/DecoderBuffer.hxx
-@@ -25,6 +25,7 @@
- #include "util/ConstBuffer.hxx"
- 
- #include <stddef.h>
-+#include <stdint.h>
- 
- struct Decoder;
- class InputStream;
diff --git a/debian/patches/typo.patch b/debian/patches/typo.patch
deleted file mode 100644
index eeb65c1..0000000
--- a/debian/patches/typo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix a doc typo
-Author: Florian Schlichting <fsfs at debian.org>
-Forwarded: http://mailman.blarg.de/pipermail/mpd-devel/2015-June/000363.html
-
---- a/doc/user.xml
-+++ b/doc/user.xml
-@@ -16,7 +16,7 @@
-       <application>MPD</application> (Music Player Daemon) is, as the
-       name suggests, a server software allowing you to remotely play
-       your music, handle playlists, deliver music (HTTP streams with
--      various sub-protocols) and organizze playlists.
-+      various sub-protocols) and organize playlists.
-     </para>
- 
-     <para>

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