[SCM] Debian packaging of libaudio-mpd-perl branch, master, updated. debian/1.112670-1-14-g06c743e

[Florian Schlichting]

The following commit has been merged in the master branch:
commit cc2c066802a9cfa34eee10170381580839a42d17
Author: Florian Schlichting <fschlich at zedat.fu-berlin.de>
Date:   Thu Mar 1 16:53:08 2012 +0000

    Dropped all three patches, applied upstream

diff --git a/debian/changelog b/debian/changelog
index d5511eb..c162a02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-libaudio-mpd-perl (1.120610-1) UNRELEASED; urgency=low
+libaudio-mpd-perl (1.120610-1) unstable; urgency=low
 
   * Imported Upstream version 1.120610.
+  * Dropped all three patches, applied upstream.
 
- -- Florian Schlichting <fschlich at zedat.fu-berlin.de>  Thu, 01 Mar 2012 16:46:25 +0000
+ -- Florian Schlichting <fschlich at zedat.fu-berlin.de>  Thu, 01 Mar 2012 16:54:42 +0000
 
 libaudio-mpd-perl (1.113280-1) unstable; urgency=low
 
diff --git a/debian/patches/bug655669-mpd-dynamic.patch b/debian/patches/bug655669-mpd-dynamic.patch
deleted file mode 100644
index 1ed3822..0000000
--- a/debian/patches/bug655669-mpd-dynamic.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: silence Perl warnings with inactive mpd
- It does the right thing, but it looks somewhat ugly when mpd doesn't
- have an audio collection or there's no song currently running.
-Author: Florian Schlichting <fschlich at zedat.fu-berlin.de>
-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=655669
-Forwarded: https://rt.cpan.org/Public/Bug/Display.html?id=75436
-
---- a/bin/mpd-dynamic
-+++ b/bin/mpd-dynamic
-@@ -34,6 +34,8 @@
- 
- # fetch list of songs known by mpd.
- my @files = $mpd->collection->all_pathes;
-+die "Please set up mpd's audio collection before running mpd-dynamic"
-+    unless @files;
- 
- 
- while (1) { # endless loop
-@@ -48,7 +50,7 @@
- 
-     # yup - update playlist & song.
-     $playlist = $status->playlist;
--    $song     = $status->song;
-+    $song     = $status->song // 0;
- 
-     # keep at most $ARGV{old} songs.
-     if ( $song > $ARGV{old} ) {
diff --git a/debian/patches/bug655670-mpd-rate.patch b/debian/patches/bug655670-mpd-rate.patch
deleted file mode 100644
index f4888e6..0000000
--- a/debian/patches/bug655670-mpd-rate.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: properly handle Perl error
- "Can't call method "file" on an undefined value" isn't nearly as
- helpful as "Cannot rate current song, as no song currently is 
- playing!"
-Author: Florian Schlichting <fschlich at zedat.fu-berlin.de>
-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=655670
-Forwarded: https://rt.cpan.org/Public/Bug/Display.html?id=75436
-
---- a/bin/mpd-rate
-+++ b/bin/mpd-rate
-@@ -24,7 +24,12 @@
- use Getopt::Euclid qw{ :minimal_keys };
- 
- # fetch current song
--my $song = encode( 'utf-8', Audio::MPD->new->current->file );
-+my $playing = Audio::MPD->new->current;
-+unless (defined $playing)
-+{
-+    die "Cannot rate current song, as no song currently is playing!";
-+}
-+my $song = encode( 'utf-8', $playing->file );
- 
- # open ratings file
- my %ratings;
diff --git a/debian/patches/fix-script-name-in-pod.patch b/debian/patches/fix-script-name-in-pod.patch
deleted file mode 100644
index 51405d6..0000000
--- a/debian/patches/fix-script-name-in-pod.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: let NAME section match the actual script name
-Author: Florian Schlichting <fschlich at zedat.fu-berlin.de>
-Forwarded: https://rt.cpan.org/Public/Bug/Display.html?id=75437
-
---- a/bin/mpd-dynamic
-+++ b/bin/mpd-dynamic
-@@ -106,7 +106,7 @@
- 
- =head1 NAME
- 
--mpd_dynamic - a dynamic playlist for mpd
-+mpd-dynamic - a dynamic playlist for mpd
- 
- =head1 VERSION
- 
---- a/bin/mpd-rate
-+++ b/bin/mpd-rate
-@@ -49,7 +49,7 @@
- 
- =head1 NAME
- 
--mpd_rate - rate your songs for mpd-dynamic
-+mpd-rate - rate your songs for mpd-dynamic
- 
- =head1 VERSION
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index ff65fbe..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-bug655670-mpd-rate.patch
-bug655669-mpd-dynamic.patch
-fix-script-name-in-pod.patch

-- 
Debian packaging of libaudio-mpd-perl