[SCM] mplayer packaging branch, master, updated. debian/1.0.rc3+svn20090426-1ubuntu14-16-gda51fea
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Thu Apr 22 18:55:16 UTC 2010
The following commit has been merged in the master branch:
commit f7dc940957f498422fb5b81a90b2ab92c3628370
Merge: 20c354983574c61b38537bf9b3ee06c172e78f34 9612bf347d6455241a8359fef2e5d42c3ce852e9
Author: Reinhard Tartler <siretart at tauware.de>
Date: Sat Apr 17 17:29:30 2010 +0200
Merge branch 'ubuntu'
Just merge all changes from ubuntu, and revert the obvious ones. I've
most certainly forgot some, they will be fixed in subsequent
commits. For now let's take most of the work done on the package from
ubuntu.
diff --combined debian/changelog
index 8d67166,008481f..57710bf
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,162 +1,168 @@@
- mplayer (1.0~rc3+svn20090426-2) UNRELEASED; urgency=low
++mplayer (2:1.0~rc3+svn20090426-2) unstable; urgency=low
+
- * Bump version for new release.
++ * preparing new upload
+
- -- Andres Mejia <mcitadel at gmail.com> Mon, 06 Jul 2009 22:48:20 -0400
++ -- Reinhard Tartler <siretart at tauware.de> Fri, 16 Apr 2010 13:59:32 +0200
++
+ mplayer (2:1.0~rc3+svn20090426-1ubuntu16) lucid; urgency=low
+
+ * move config file and apport hook 'mplayer-nogui'->'mplayer'
+ LP: #540491, #549613
+ * improve mplayer version output
+ * no longer build depend on libfaac, see LP #374900 for details
+ * attach alsa_information in the apport hook
+
+ -- Reinhard Tartler <siretart at tauware.de> Wed, 31 Mar 2010 19:54:53 +0200
+
+ mplayer (2:1.0~rc3+svn20090426-1ubuntu15) lucid; urgency=low
+
+ * backport newer libx264 wrapper, LP: #539555
+
+ -- Reinhard Tartler <siretart at tauware.de> Wed, 17 Mar 2010 13:39:44 +0100
+
+ mplayer (2:1.0~rc3+svn20090426-1ubuntu14) lucid; urgency=low
+
+ * cleanup --configure flags
+ * drop VDPAU build hacks, Closes: #566868, LP: #530481, #532007
+ * enable musepack support
+ * enable libaa support, LP: #502767, #455535
+ * enable enca support, LP: #115519
+ * remove DEB_BUILD_CONFIGURE override hack
+ * fix weird permission bits for mplayer.desktop and mplayer.xpm
+ * reorganize binary packages to no longer install the gui version by
+ default
+ * refactor debian/rules to avoid sub makes
+ * add patch to allow compilation with newer x264
+ * use mp_msg instead of printf in debug help message
+ * bump standards version
+ * as no longer used, remove dependencies on debconf
+ * Fix possible crashes with invalid SDPs, LP: #519579
+ * add missing replaces
+ * install manpages in the 'mplayer' package. and only there
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 11 Mar 2010 12:45:55 +0100
+
+ mplayer (2:1.0~rc3+svn20090426-1ubuntu13) lucid; urgency=low
+
+ * rebuild for ffmpeg versioned symbols
+
+ -- Reinhard Tartler <siretart at tauware.de> Tue, 19 Jan 2010 21:31:51 +0100
+
+ mplayer (2:1.0~rc3+svn20090426-1ubuntu12) lucid; urgency=low
+
+ * debian/patches/41_fix_forcedsubsonly.patch: fix the forcedsubsonly
+ option. This fixes a problem with ogmrip always encoding with
+ subtitles. (LP: #458129).
+ * debian/control: Change build-dep libxvidcore4-dev to libxvidcore-dev.
+ (LP: #486169)
+
+ -- Marc Deslauriers <marc.deslauriers at ubuntu.com> Mon, 23 Nov 2009 20:11:33 -0500
+
+ mplayer (2:1.0~rc3+svn20090426-1ubuntu11) lucid; urgency=low
+
+ * Add 50_fix_initial_volume_setting_pulse_output.patch to resolve the
+ stream volume being set to max upon each mplayer invocation
+ (LP: #482408)
+
+ -- Daniel T Chen <crimsun at ubuntu.com> Wed, 18 Nov 2009 19:42:09 -0500
+
+ mplayer (2:1.0~rc3+svn20090426-1ubuntu10) karmic; urgency=low
+
+ * make sure that patches are applied for non-i386 builds as well.
+ Fixes: LP: #390398, #448603, #448595, #441566, #440346
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 15 Oct 2009 17:55:21 +0200
+
+ mplayer (2:1.0~rc3+svn20090426-1ubuntu9) karmic; urgency=low
+
+ [ Julien Lavergne ]
+ * Renable xvid support by removing --disable-xvid in debian/rules.
+
+ [ Reinhard Tartler ]
+ * Also enable mp3lame support (at least for now) LP: #386449
+ * don't override the mplayer built-in defaults for the vo module LP: #446040
+ * verified that mennuc's screensaver patch is enabled and works in the default
+ configuration. LP: #439787
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 08 Oct 2009 09:23:29 +0200
+
+ mplayer (2:1.0~rc3+svn20090426-1ubuntu8) karmic; urgency=low
+
+ * build depend on nvidia-185-libvdpau-dev only on i386 and amd64
+ * add ubuntu specific configuration file. LP: #276957, #440343
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 03 Oct 2009 10:45:23 +0200
+
+ mplayer (2:1.0~rc3+svn20090426-1ubuntu7) karmic; urgency=low
+
+ * remove 41_use_fontconfig_by_default.patch, doesn't apply
+ * enable VDPAU on i386 and amd64 (LP: #437039)
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 28 Sep 2009 19:32:29 +0000
+
+ mplayer (2:1.0~rc3+svn20090426-1ubuntu6) karmic; urgency=low
+
+ [ Andres Mejia ]
+ * Enable VDPAU support by including vdpau headers in deb packaging.
+
+ [ Reinhard Tartler ]
+ * sort build dependencies alphabetically
+ * avoid using tabs - prefer space instead
+ * reenable 22disable-xscreensaver.patch. The patch does work, but you
+ need to have the mouse cursor INSIDE the window
+ * don't build-depend on libmad, the internal mp3lib library is superiour
+ for most cases these days, according to upstream. LP: #111025, #163382
+ * add clarifications to the libgsm license.
+ * install the TOOLS/midentify.sh script LP: #333828
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 24 Sep 2009 21:09:24 +0200
+
+ mplayer (2:1.0~rc3+svn20090426-1ubuntu5) karmic; urgency=low
+
+ * No-change rebuild to pick up new ffmpeg shlibs file.
+
+ -- Stefan Potyra <sistpoty at ubuntu.com> Fri, 28 Aug 2009 21:04:38 +0200
+
+ mplayer (2:1.0~rc3+svn20090426-1ubuntu4) karmic; urgency=low
+
+ * remove 22disable-xscreensaver.patch. Patch is not working properly
+ anyways and actually potentially dangerous because it is faking input
+ activity.
+ * enable fontconfig by default.
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 18 Jun 2009 16:09:33 +0200
+
+ mplayer (2:1.0~rc3+svn20090426-1ubuntu3) karmic; urgency=low
+
+ [ Reinhard Tartler ]
+ * add additional build dependencies that are available in
+ ubuntu/multiverse LP: #386449
+ * prefer auto-detection and lavc variants of many codecs in debian/rules
+ * install .desktop and .xpm file in the mplayer package
+
+ [ Siegfried Gevatter ]
+ * improve desktop file to conform (more) to the freedesktop file
+ specification LP: #386505
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 15 Jun 2009 23:24:25 +0200
+
+ mplayer (2:1.0~rc3+svn20090426-1ubuntu2) karmic; urgency=low
+
+ * Bump epoch in debian/control as well, so that the Replaces field has
+ any effect in ubuntu
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 08 Jun 2009 07:51:12 +0200
+
+ mplayer (2:1.0~rc3+svn20090426-1ubuntu1) karmic; urgency=low
+
+ * Switch to debian packaging for the mplayer package
+ * New upstream release, LP: #336697, #260918, #246675, #243453, #74282
+ * Fixes security issues: CVE-2008-5616, LP: #308939
+ * many flv fixes LP: #73271, #347021
+ * Build and install mencoder
+ * Bump epoch
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 06 Jun 2009 23:01:52 +0200
mplayer (1.0~rc3+svn20090426-1) unstable; urgency=low
diff --combined debian/control
index cece8e4,9239529..f8c8880
--- a/debian/control
+++ b/debian/control
@@@ -1,12 -1,13 +1,12 @@@
Source: mplayer
Section: video
Priority: optional
-Maintainer: Ubuntu MOTU Developers <ubuntu-motu at lists.ubuntu.com>
-XSBC-Original-Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
+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>
DM-Upload-Allowed: yes
- Standards-Version: 3.8.1
+ Standards-Version: 3.8.4
Vcs-Git: git://git.debian.org/git/pkg-multimedia/mplayer.git
Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/mplayer.git;a=summary
Homepage: http://www.mplayerhq.hu/
@@@ -14,6 -15,8 +14,8 @@@ Build-Depends: debhelper (>= 7)
docbook-xml,
docbook-xsl,
ladspa-sdk,
+ libenca-dev,
+ libaa1-dev,
libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libaudio-dev,
libavcodec-dev (>= 0.svn20080206),
@@@ -26,6 -29,7 +28,7 @@@
libdts-dev,
libdvdread-dev,
libesd0-dev,
+ libfaad-dev,
libfontconfig1-dev,
libfreetype6-dev,
libfribidi-dev,
@@@ -37,6 -41,8 +40,7 @@@
liblircclient-dev,
liblivemedia-dev,
liblzo2-dev,
- libmp3lame-dev,
+ libmpcdec-dev,
libncurses5-dev,
libopenal-dev,
libpng12-dev | libpng-dev,
@@@ -52,21 -58,23 +56,21 @@@
libvorbis-dev,
libvorbisidec-dev,
libx11-dev,
libxext-dev,
libxinerama-dev,
libxv-dev,
libxvmc-dev,
libxxf86dga-dev,
libxxf86vm-dev,
+ libvdpau-dev [i386 amd64],
pkg-config,
- po-debconf,
quilt,
vstream-client-dev,
x11proto-core-dev,
xsltproc,
zlib1g-dev
- Package: mplayer
+ Package: mplayer-gui
Architecture: any
Section: video
Suggests: mplayer-doc,
@@@ -74,11 -82,12 +78,12 @@@
netselect | fping,
bzip2,
fontconfig
- Depends: debconf | debconf-2.0,
- mplayer-skin,
- mplayer-nogui,
+ Depends: mplayer-skin,
+ mplayer,
${shlibs:Depends},
${misc:Depends}
-Replaces: mplayer-doc (<< 2:1.0~rc3+svn20090426-1ubuntu14),
- mplayer (<< 2:1.0~rc3+svn20090426-1ubuntu14)
++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,
@@@ -97,20 -106,42 +102,42 @@@
Not all of the upstream code is distributed in the source tarball.
See the README.Debian and copyright files for details.
- Package: mplayer-nogui
+ Package: mencoder
Architecture: any
Section: video
Suggests: mplayer-doc,
ttf-freefont,
- netselect | fping,
bzip2,
- fontconfig,
- nvidia-libvdpau1 | nvidia-libvdpau
- Depends: debconf | debconf-2.0,
+ fontconfig
+ Depends: mplayer,
${shlibs:Depends},
${misc:Depends}
- Replaces: mplayer (<< 1.0~rc3+svn20090426-1),
- mplayer-doc (<< 1.0~rc3+svn20090426-1)
+ Description: MPlayer's Movie Encoder
+ 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.
+ .
+ This package contains menconder, a simple movie encoder, designed to
+ encode MPlayer-playable movies
+ (AVI/ASF/OGG/DVD/VCD/VOB/MPG/MOV/VIV/FLI/RM/NUV/NET) to other
+ MPlayer-playable formats. It can encode with various codecs, like DivX4
+ (1 or 2 passes), libavcodec, PCM/MP3/VBRMP3 audio. Also has stream
+ copying and video resizing abilities.
+
+ Package: mplayer
+ Architecture: any
+ Section: video
+ Suggests: mplayer-doc,
+ ttf-freefont,
+ netselect | fping,
+ bzip2,
+ fontconfig
+ Depends: ${shlibs:Depends},
+ ${misc:Depends}
-Replaces: mplayer-doc (<< 2:1.0~rc3+svn20090426-1ubuntu14),
- mplayer-nogui (<< 2:1.0~rc3+svn20090426-1ubuntu16),
- mencoder (<< 2:1.0~rc3+svn20090426-1ubuntu14)
++Replaces: mplayer-doc (<< 2:1.0~rc3+svn20090426-2),
++ mplayer-nogui (<< 2:1.0~rc3+svn20090426-2),
++ mencoder (<< 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,
@@@ -135,7 -166,9 +162,9 @@@ Package: mplayer-db
Architecture: any
Section: debug
Priority: extra
- Depends: mplayer, ${misc:Depends}
+ Depends: mplayer,
+ mencoder,
+ ${misc:Depends}
Recommends: ffmpeg-dbg
Description: debugging symbols for MPlayer
This package contains the debugging symbols for MPlayer, a movie
@@@ -147,7 -180,15 +176,15 @@@ Architecture: al
Section: doc
Recommends: mplayer
Depends: ${misc:Depends}
- Replaces: mplayer (<< 1.0~rc3+svn20090426-1)
+ Replaces: mplayer (<< 2:1.0~rc3+svn20090426-1)
Description: documentation for MPlayer
This package contains the documentation for MPlayer, a movie player for
Unix-like systems.
+
+ Package: mplayer-nogui
+ Architecture: all
+ Depends: mplayer,
+ ${misc:Depends}
+ Description: movie player for Unix-like systems (transitional package)
+ This is a transitional package to assist with upgrading from older
+ versions of mplayer. It can be safely removed.
--
mplayer packaging
More information about the pkg-multimedia-commits
mailing list