[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 6729499d945eb446a135118914ddaa4b512d8ce9
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Aug 7 12:10:20 2010 -0400

    update deiban/changelog

diff --git a/debian/changelog b/debian/changelog
index 2fff7f8..90094ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,12 @@
-mplayer (2:1.0~rc4~try1.dsfg1-1) maverick; urgency=low
+mplayer (2:1.0~rc4~try1.dsfg1-1ubuntu1) maverick; urgency=low
 
-  * start new upload to ubuntu
+  * merge from debian, remaining changes:
+    - build depend against, lame, x264, xvid
+  * debian/patches/60eval-api.patch, backport patch from upstream to
+    unbreak compilation for eval.h move not yet in 0.6
+  * gmplayer is gone now, please see smplayer as alternative frontend.
+    LP: #503537, #493088, #467534, #467524, #460326, #390399, #285570,
+        #208680, #118709, #513065, #459595, #455913, #179918, #65165.
 
  -- Reinhard Tartler <siretart at tauware.de>  Sat, 07 Aug 2010 12:03:56 -0400
 

-- 
mplayer packaging