[SCM] mplayer/ubuntu: Merge commit 'debian/2%1.0_rc4.dfsg1-1' into ubuntu
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sat Feb 26 13:19:17 UTC 2011
use gzip compression
track upstream branch
start new upload
don't try to install mplayer-gui, cleanup after merging
merge the experimental branch
add versioned build depends for all ffmpeg packages
update debian/changelog
clarifications in debian/copyright
remove patches that are applied upstream
new upstream snapshot
Merge commit 'upstream/1.0.rc4.try2.dfsg1' into master.experimental
Imported Upstream version 1.0~rc4~try2.dfsg1
enable joystick at compilation but leave it disable in config (Closes: #592082)
unbreak compilation for eval.h move not yet in 0.6
clarifications in debian/copyright
update debian/changelog
track upstream rc3 branch
work in master
update debian/changelog
Merge commit '717df26f7d9c0a2843ea8060550d3c5adb54d511'
remove unwanted dvdcss
update debian/changelog
Revert "compile against internal ffmpeg for now"
update debian/changelog
enable mencoder and mplayer-gui
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/ubuntu
X-Git-Reftype: branch
X-Git-Oldrev: 6729499d945eb446a135118914ddaa4b512d8ce9
X-Git-Newrev: 9a8a88a546f55b971ebfde584c9324dff89441dd
The following commit has been merged in the ubuntu branch:
commit 5433eb0424b38029e0198cc9716f9f1669023cee
Merge: 5d9bd4300d8eb4d8a115c52fbb1a15db033daaba d43259d57b54abf72865a6fc06864aafa39eea63
Author: Reinhard Tartler <siretart at tauware.de>
Date: Sat Feb 26 13:54:48 2011 +0100
Merge commit 'debian/2%1.0_rc4.dfsg1-1' into ubuntu
Conflicts:
debian/changelog
debian/control
debian/gbp.conf
debian/patches/series
diff --combined debian/changelog
index 3f268f9,1e5adff..d0e8df0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,21 +1,39 @@@
+ mplayer (2:1.0~rc4.dfsg1-1) unstable; urgency=low
+
+ * upload to unstable
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 06 Feb 2011 17:06:33 +0100
+
+ mplayer (2:1.0~rc4~try2.dfsg1-1) experimental; urgency=low
+
+ [ steph ]
+ * enable joystick at compilation but leave it disable in config
+ (Closes: #592082, LP: #617986)
+
+ [ Reinhard Tartler ]
+ * new upstream snapshot, remove patches that are applied upstream
+ * 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
+
+ * enable libbluray support
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 26 Feb 2011 12:42:18 +0100
+
+mplayer (2:1.0~rc4~try1.dsfg1-1ubuntu1) maverick; urgency=low
+
+ * 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 (2:1.0~rc4~try1.dsfg1-1) experimental; urgency=low
* enable the mencoder package
@@@ -27,15 -27,6 +45,15 @@@
-- Reinhard Tartler <siretart at tauware.de> Mon, 02 Aug 2010 16:30:06 -0400
+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
@@@ -47,9 -38,24 +65,27 @@@
-- 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
+
+ -- 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
++>>>>>>> debian/2%1.0_rc4.dfsg1-1
- * build mplayer against internal ffmpeg to workaround interoperability
- problems with FFmpeg 0.6
+ * readd x264, xvid and mp3lame support, LP: #606125
-- Reinhard Tartler <siretart at tauware.de> Thu, 03 Jun 2010 18:25:34 +0200
diff --combined debian/control
index 167871f,8e7b0ab..d7261c5
--- a/debian/control
+++ b/debian/control
@@@ -20,8 -20,7 +20,8 @@@ Build-Depends: debhelper (>= 7)
libavcodec-dev (>= 4:0.6),
libavdevice-dev (>= 4:0.6),
libavformat-dev (>= 4:0.6),
- libavutil-dev,
+ libavutil-dev (>= 4:0.6),
+ libbluray-dev,
libcaca-dev,
libcdparanoia-dev | libcdparanoia0-dev,
libdirectfb-dev,
@@@ -41,29 -40,26 +41,29 @@@
liblircclient-dev,
liblivemedia-dev,
liblzo2-dev,
+ libmp3lame-dev,
libmpcdec-dev,
libncurses5-dev,
libopenal-dev,
libpng12-dev | libpng-dev,
- libpostproc-dev,
+ libpostproc-dev (>= 4:0.6),
libpulse-dev,
libschroedinger-dev,
libsdl1.2-dev | libsdl1.1-dev,
libsmbclient-dev,
libspeex-dev,
libsvga1-dev [i386 amd64],
- libswscale-dev,
+ libswscale-dev (>= 4:0.6),
libtheora-dev (>= 1.0~beta1),
libvdpau-dev [i386 amd64],
libvorbis-dev,
libvorbisidec-dev,
libx11-dev,
+ libx264-dev (>= 2:0.85.1442),
libxext-dev,
libxinerama-dev,
libxv-dev,
+ libxvidcore-dev,
libxvmc-dev,
libxxf86dga-dev,
libxxf86vm-dev,
@@@ -73,6 -69,35 +73,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,
diff --combined debian/gbp.conf
index d6bc349,a999e17..dffd1ed
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,6 -1,7 +1,7 @@@
[DEFAULT]
upstream-branch = upstream
-debian-branch = master
+debian-branch = ubuntu
upstream-tag = upstream/%(version)s
debian-tag = debian/%(version)s
pristine-tar = True
+ compression = gzip
--
mplayer packaging
More information about the pkg-multimedia-commits
mailing list