[SCM] mplayer/master: update debian/changelog

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a3958391cd1b7c094dd5e29e77235a514cd5ee99
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Oct 29 10:31:44 2011 +0200

    update debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 89cac5e..a9300fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+mplayer (2:1.0~rc4.dfsg1+svn33713-3) unstable; urgency=high
+
+  [ Alessio Treglia ]
+  * Properly set Replaces/Conflicts on mplayer2{,-dbg} to avoid
+    file overwrite errors.
+  * Adjust versioning of mplayer listed in the mplayer-dbg's Depends field.
+
+  [ Reinhard Tartler ]
+  * Fix build failure on sparc after recent binutils change.
+  * Urgency medium bumped because of RC-level bugfix
+    and speeding up x264 transition.
+
+ -- Reinhard Tartler <siretart at tauware.de>  Sat, 29 Oct 2011 10:29:57 +0200
+
 mplayer (2:1.0~rc4.dfsg1+svn33713-2) unstable; urgency=low
 
   [ Andres Mejia ]

-- 
mplayer packaging