[Pkg-mpd-commits] [pkg-mpd] 01/02: Merge tag 'debian/0.17.6-1' into wheezy-backports

[Florian Schlichting]

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

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

commit 4af189c06033a05042e48af642188422913840d3
Merge: ac06303 35f79a3
Author: Florian Schlichting <fsfs at debian.org>
Date:   Sat Nov 23 22:06:19 2013 +0100

    Merge tag 'debian/0.17.6-1' into wheezy-backports
    
    Debian release 0.17.6-1
    
    Conflicts:
    	debian/changelog

 Makefile.in                          |   2 +-
 NEWS                                 |  20 +++++-
 configure                            | 121 +++++++++++++++++++++++++++++++----
 configure.ac                         |  11 +++-
 debian/changelog                     |  25 ++++++++
 debian/control                       |   7 +-
 debian/mpd.init.d                    |   4 +-
 debian/patches/bug622368.patch       |  62 ------------------
 debian/patches/series                |   1 -
 debian/rules                         |   2 +-
 doc/doxygen.conf                     |   2 +-
 doc/mpd.conf.5                       |  30 ++++-----
 scripts/makedist.sh                  |  25 --------
 scripts/mpd-indent.sh                |   6 --
 scripts/test.sh                      |  93 ---------------------------
 src/command.c                        |   2 +-
 src/conf.c                           |   2 +-
 src/decoder/ffmpeg_decoder_plugin.c  |   1 +
 src/decoder/mikmod_decoder_plugin.c  |   4 ++
 src/decoder/modplug_decoder_plugin.c |   2 +-
 src/mixer/alsa_mixer_plugin.c        |  12 +++-
 src/playlist_edit.c                  |   7 +-
 src/playlist_save.c                  |  11 ++++
 src/song_update.c                    |   2 +-
 src/stored_playlist.c                |  16 ++++-
 src/update_song.c                    |   2 +-
 26 files changed, 236 insertions(+), 236 deletions(-)

diff --cc debian/changelog
index cb4e759,6558e67..59ef3cc
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,28 +1,34 @@@
+ mpd (0.17.6-1) unstable; urgency=low
+ 
+   * Import Upstream version 0.17.6
+   * Drop modplug-header-path.patch, applied upstream
+ 
+  -- Florian Schlichting <fsfs at debian.org>  Tue, 15 Oct 2013 21:03:49 +0200
+ 
+ mpd (0.17.5-2) unstable; urgency=low
+ 
+   * Fix path to modplug.h (closes: #725535)
+ 
+  -- Florian Schlichting <fsfs at debian.org>  Sat, 12 Oct 2013 21:43:37 +0200
+ 
+ mpd (0.17.5-1) unstable; urgency=low
+ 
+   [ Florian Schlichting ]
+   * Import Upstream version 0.17.5
+   * Add a note on JACK to README.Debian (closes: #655482).
+   * Use dh-systemd (patch from Michael Stapelberg, thanks! closes: #715164)
+   * mpd.init.d: ensure avahi, if available, is started first (closes: #711429)
+   * Drop bug622368.patch, applied upstream.
+   * Update Vcs-Browser and Vcs-Git control fields to their canonical value.
+ 
+  -- Florian Schlichting <fsfs at debian.org>  Fri, 09 Aug 2013 14:37:04 +0200
+ 
 +mpd (0.17.4-3~bpo70+1) wheezy-backports; urgency=low
 +
 +  * Rebuild for wheezy-backports.
 +
 + -- Florian Schlichting <fsfs at debian.org>  Wed, 15 May 2013 21:39:18 +0200
 +
  mpd (0.17.4-3) unstable; urgency=low
  
    * Enable ffado plugin on [amd64 armel armhf i386 powerpc] only

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