[SCM] mplayer/ubuntu: Merge branch 'ubuntu-uploaded' into ubuntu
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sat Feb 26 13:40:26 UTC 2011
import mplayer_1.0\~rc4.dfsg1-1ubuntu1.dsc that was actually uploaded
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/ubuntu
X-Git-Reftype: branch
X-Git-Oldrev: 9a8a88a546f55b971ebfde584c9324dff89441dd
X-Git-Newrev: 831c0600c9fb8ec2c16b777b9f861f06771cc7cc
The following commit has been merged in the ubuntu branch:
commit 831c0600c9fb8ec2c16b777b9f861f06771cc7cc
Merge: 9a8a88a546f55b971ebfde584c9324dff89441dd 37874e47ca6717ecd35b38262d8fd46c3d46ebce
Author: Reinhard Tartler <siretart at tauware.de>
Date: Sat Feb 26 14:35:16 2011 +0100
Merge branch 'ubuntu-uploaded' into ubuntu
Conflicts:
debian/changelog
debian/control
diff --combined debian/changelog
index 062612e,21fcb28..9f807a3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,12 +1,19 @@@
- mplayer (2:1.0~rc4.dfsg1-1ubuntu1) natty; urgency=low
++mplayer (2:1.0~rc4.dfsg1-1ubuntu2) natty; urgency=low
+
- * Merge from debian/unstable. Remaining changes:
++ * Finish Merge from debian/unstable. Remaining changes:
+ - Build depend on lame, x264, xvidcore and libbluray
+
- -- Reinhard Tartler <siretart at tauware.de> Sat, 26 Feb 2011 14:00:45 +0100
++ -- Reinhard Tartler <siretart at tauware.de> Sat, 26 Feb 2011 14:37:59 +0100
++
+ mplayer (2:1.0~rc4.dfsg1-1ubuntu1) natty; urgency=low
+
+ * Merge from debian unstable. Remaining changes:
+ - build depend against, lame, x264, xvid
+ * Dropped changes, applied upstream:
+ - debian/patches/60eval-api.patch, backport patch from upstream to
+ unbreak compilation for eval.h move not yet in 0.6
+
+ -- Angel Abad <angelabad at ubuntu.com> Mon, 07 Feb 2011 15:21:29 +0100
mplayer (2:1.0~rc4.dfsg1-1) unstable; urgency=low
@@@ -22,13 -25,13 +32,19 @@@ mplayer (2:1.0~rc4~try2.dfsg1-1) experi
* minor clarifications in debian/copyright
-- Reinhard Tartler <siretart at tauware.de> Sun, 23 Jan 2011 21:59:46 +0100
-
- mplayer (2:1.0~rc4~try1.dsfg1-1ubuntu2) natty; urgency=low
++
++mplayer (2:1.0~rc4~try1.dsfg1-1ubuntu3) UNRELEASED; urgency=low
+
+ * enable libbluray support
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 26 Feb 2011 12:42:18 +0100
+ mplayer (2:1.0~rc4~try1.dsfg1-1ubuntu2) natty; urgency=low
+
+ * No change rebuild against current libx264
+
+ -- Bhavani Shankar <bhavi at ubuntu.com> Fri, 24 Dec 2010 11:24:57 +0530
+
mplayer (2:1.0~rc4~try1.dsfg1-1ubuntu1) maverick; urgency=low
* merge from debian, remaining changes:
@@@ -72,9 -75,6 +88,6 @@@ mplayer (2:1.0~rc4~try1-1) experimental
-- Reinhard Tartler <siretart at tauware.de> Wed, 28 Jul 2010 21:04:54 -0400
- <<<<<<< HEAD
- mplayer (2:1.0~rc3++final-0ubuntu3) maverick; urgency=low
- =======
mplayer (2:1.0~rc3++final.dfsg1-2) unstable; urgency=low
* prepare next upload
@@@ -90,7 -90,13 +103,27 @@@ mplayer (2:1.0~rc3++final.dfsg1-1) unst
-- Reinhard Tartler <siretart at tauware.de> Sat, 31 Jul 2010 23:44:52 -0400
mplayer (2:1.0~rc3++final-1~exp1) experimental; urgency=low
- >>>>>>> debian/2%1.0_rc4.dfsg1-1
+
+ * build mplayer against internal ffmpeg to workaround interoperability
+ problems with FFmpeg 0.6
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 03 Jun 2010 18:25:34 +0200
+
-mplayer (2:1.0~rc3++final-0ubuntu3) maverick; urgency=low
++mplayer (2:1.0~rc3++final.dfsg1-2) unstable; urgency=low
++
++ * prepare next upload
++
++ -- Reinhard Tartler <siretart at tauware.de> Sat, 07 Aug 2010 10:20:58 -0400
++
++mplayer (2:1.0~rc3++final.dfsg1-1) unstable; urgency=low
++
++ * upload to unstable
++ * enable mencoder and mplayer-gui package
++ * build again against the system FFmpeg 0.5
++
++ -- Reinhard Tartler <siretart at tauware.de> Sat, 31 Jul 2010 23:44:52 -0400
++
++mplayer (2:1.0~rc3++final-1~exp1) experimental; urgency=low
* readd x264, xvid and mp3lame support, LP: #606125
diff --combined debian/control
index a1edd0a,5f0d37d..95e8c7f
--- a/debian/control
+++ b/debian/control
@@@ -1,7 -1,8 +1,8 @@@
Source: mplayer
Section: video
Priority: optional
- Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
+ Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
+ XSBC-Original-Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
Uploaders: A Mennucc1 <mennucc1 at debian.org>,
Reinhard Tartler <siretart at tauware.de>,
Andres Mejia <mcitadel at gmail.com>
@@@ -21,7 -22,6 +22,7 @@@ Build-Depends: debhelper (>= 7)
libavdevice-dev (>= 4:0.6),
libavformat-dev (>= 4:0.6),
libavutil-dev (>= 4:0.6),
+ libbluray-dev,
libcaca-dev,
libcdparanoia-dev | libcdparanoia0-dev,
libdirectfb-dev,
@@@ -73,6 -73,35 +74,35 @@@
xsltproc,
zlib1g-dev
+ Package: mplayer-gui
+ Architecture: any
+ Suggests: mplayer-doc,
+ ttf-freefont,
+ bzip2,
+ fontconfig
+ Depends: mplayer-skin,
+ mplayer,
+ ${shlibs:Depends},
+ ${misc:Depends}
+ Replaces: mplayer-doc (<< 2:1.0~rc3+svn20090426-2),
+ mplayer (<< 2:1.0~rc3+svn20090426-2)
+ Description: movie player for Unix-like systems
+ MPlayer plays most MPEG, VOB, AVI, Ogg/OGM, VIVO,
+ ASF/WMA/WMV, QT/MOV/MP4, FLI, RM, NuppelVideo, yuv4mpeg, FILM, RoQ, PVA files,
+ supported by many native, XAnim, RealPlayer, and Win32 DLL codecs. It can
+ also play VideoCD, SVCD, DVD, 3ivx, RealMedia, and DivX movies.
+ .
+ Another big feature of MPlayer is the wide range of supported output
+ drivers. It works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev,
+ DirectFB, but also SDL (plus all its drivers) and some
+ low level card-specific drivers (for Matrox, 3Dfx and Radeon, Mach64
+ and Permedia3). Most of them support software or hardware scaling,
+ therefore allowing fullscreen display. MPlayer is also able
+ to use some hardware MPEG decoder boards, such as the DVB
+ and DXR3/Hollywood+.
+ .
+ This package includes the gui variant of mplayer.
+
Package: mencoder
Architecture: any
Suggests: mplayer-doc,
--
mplayer packaging
More information about the pkg-multimedia-commits
mailing list