[libaudio-mpd-perl] 03/03: Merge tag 'debian/2.000-2'

[gregor herrmann]

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

gregoa pushed a commit to branch master
in repository libaudio-mpd-perl.

commit 6422d4994c2fe87e057c7e3a1aa3e0b6be5cc2a6
Merge: 4be13c1 0cc6f7f
Author: gregor herrmann <gregoa at debian.org>
Date:   Wed Nov 12 21:06:14 2014 +0100

    Merge tag 'debian/2.000-2'
    
    tagging package libaudio-mpd-perl version debian/2.000-2
    
    Conflicts:
    	debian/changelog

 debian/changelog              | 17 ++++++++++++++++-
 debian/patches/mpd-0.19.patch | 34 ++++++++++++++++++++++++++++++++++
 debian/patches/series         |  1 +
 3 files changed, 51 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 5aeca83,2c28a0a..f9201b5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,18 +1,28 @@@
- libaudio-mpd-perl (2.000-2) UNRELEASED; urgency=medium
++libaudio-mpd-perl (2.000-3) UNRELEASED; urgency=medium
 +
 +  [ Salvatore Bonaccorso ]
 +  * Update Vcs-Browser URL to cgit web frontend
 +
 +  [ gregor herrmann ]
 +  * debian/control: update {versioned,alternative} (build) dependencies.
 +
 + -- Salvatore Bonaccorso <carnil at debian.org>  Sat, 16 Aug 2014 09:29:38 +0200
 +
+ libaudio-mpd-perl (2.000-2) unstable; urgency=medium
+ 
+   * Add patch to make tests work with mpd >= 0.19.
+     
+     One tests checks for the accumulated playtime of the audio samples.
+     Test::Corpus::Audio::MPD contains 5 tracks just over 1.8 seconds each.
+     mpd < 0.19 rounded each track up to 2 seconds then added the lengths in
+     seconds to get 10s, but mpd >= 0.19 adds up the lengths in ms and then
+     rounds it down to 9s.
+     Change this test to look for >= 9 and <= 10 seconds.
+ 
+     Thanks to Simon McVittie for the patch. (Closes: #768692)
+ 
+  -- gregor herrmann <gregoa at debian.org>  Wed, 12 Nov 2014 20:52:49 +0100
+ 
  libaudio-mpd-perl (2.000-1) unstable; urgency=low
  
    [ Alessandro Ghedini ]

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