[libdevice-cdio-perl] 01/01: Merge branch 'jessie'

[Intrigeri]

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

intrigeri pushed a commit to branch master
in repository libdevice-cdio-perl.

commit 6e670acf97a95339fca2da50fd80b6e26ba8ff61
Merge: 76d8687 634cd77
Author: intrigeri <intrigeri at boum.org>
Date:   Mon Dec 15 06:41:25 2014 +0000

    Merge branch 'jessie'
    
    Conflicts:
    	debian/changelog

 debian/changelog                                   |  11 +-
 .../04_wrong_handling_of_output_parameters.patch   | 113 ---------------------
 debian/patches/series                              |   1 -
 3 files changed, 10 insertions(+), 115 deletions(-)

diff --cc debian/changelog
index 05455b3,226e962..aae7535
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,12 +1,25 @@@
- libdevice-cdio-perl (0.3.0-3) UNRELEASED; urgency=medium
++libdevice-cdio-perl (0.3.0-4) UNRELEASED; urgency=medium
 +
 +  [ gregor herrmann ]
 +  * Strip trailing slash from metacpan URLs.
 +
 +  [ Salvatore Bonaccorso ]
 +  * Update Vcs-Browser URL to cgit web frontend
 +
 +  [ gregor herrmann ]
 +  * debian/control: update Module::Build dependency.
 +
 + -- gregor herrmann <gregoa at debian.org>  Thu, 27 Feb 2014 22:35:03 +0100
 +
+ libdevice-cdio-perl (0.3.0-3) unstable; urgency=medium
+ 
+   * Team upload.
+   * Drop 04_wrong_handling_of_output_parameters.patch: we've not been
+     able to find out what it was good for back in 2007, and it now causes
+     at least one bug (Closes: #772005).
+ 
+  -- intrigeri <intrigeri at debian.org>  Mon, 15 Dec 2014 07:37:16 +0100
+ 
  libdevice-cdio-perl (0.3.0-2) unstable; urgency=low
  
    [ Salvatore Bonaccorso ]

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