[SCM] mplayer packaging branch, ubuntu, updated. debian/1.0.rc4.try1-1-22-g6729499

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 50829064f89206c95ea6f63b557019f489a0852c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Jul 29 07:27:18 2010 -0400

    update debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 9ef3361..5dcbe48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mplayer (2:1.0~rc4~try1-1ubuntu1) maverick; urgency=low
+
+  * merge from debian/experimental, remaining changes:
+    - build depend against, lame, x264, xvid
+    - enable mencoder and mplayer-gui
+  * ensure that quilt patches are actually applied
+
+ -- Reinhard Tartler <siretart at tauware.de>  Thu, 29 Jul 2010 07:25:31 -0400
+
 mplayer (2:1.0~rc4~try1-1) experimental; urgency=low
 
   * New Upstream Version, LP: #539315

-- 
mplayer packaging