[SCM] mplayer2/master: Merge branch 'master.experimental'

[alessio at users.alioth.debian.org]

New changelog entry.
Build-Depends on libcdio-{cdda,paranoia}-dev.
Drop support for cdparanoia.
Merge tag 'upstream/2.0-541-gf64a4e9' into master.experimental
Imported Upstream version 2.0-541-gf64a4e9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 76b2ab79dcac6dffbd7a8ac6512b57b392cdf453
X-Git-Newrev: 4fe5ef89ced5bbe71525d702000a9a72b5c81d4a

The following commit has been merged in the master branch:
commit 4fe5ef89ced5bbe71525d702000a9a72b5c81d4a
Merge: 76b2ab79dcac6dffbd7a8ac6512b57b392cdf453 a25d15a751ac763650d09a66b5fdd4fe63be787b
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri May 4 13:30:26 2012 +0200

    Merge branch 'master.experimental'
    
    - Merge changelogs.

diff --combined debian/changelog
index 8c2f464,77543fe..fc52840
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,11 +1,18 @@@
+ mplayer2 (2.0-541-gf64a4e9-1) experimental; urgency=low
+ 
+   * New upstream snapshot.
+   * Drop support for cdparanoia.
+   * Build-Depends on libcdio-{cdda,paranoia}-dev.
+ 
+  -- Alessio Treglia <alessio at debian.org>  Tue, 01 May 2012 03:20:17 +0200
+ 
 +mplayer2 (2.0-518-gb711624-2) unstable; urgency=low
 +
 +  * Upload to unstable.
 +  * Merge 2.0-518-gb711624 from experimental.
 +
 + -- Alessio Treglia <alessio at debian.org>  Tue, 01 May 2012 03:32:15 +0200
 +
  mplayer2 (2.0-518-gb711624-1) experimental; urgency=low
  
    * New upstream snapshot.

-- 
mplayer2 packaging