[SCM] mplayer packaging branch, ubuntu, updated. debian/1.0.rc3+svn20100502-3-14-g0c42aea
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Tue Jun 1 21:20:40 UTC 2010
The following commit has been merged in the ubuntu branch:
commit faa6d001f902b3bc295e768d2a5a2145a683f90e
Merge: d452788cac05c3a126b0edad21b300f96888cdb1 2b8daa88dcfee35a3be40edd3b9f18a72f4ebbbc
Author: Reinhard Tartler <siretart at tauware.de>
Date: Tue Jun 1 22:57:24 2010 +0200
Merge branch 'upstream' into ubuntu
diff --combined debian/changelog
index ac886b9,990973a..1af16ed
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,1052 -1,29 +1,1046 @@@
- mplayer (2:1.0~rc3+svn20100502-ubuntu1) maverick; urgency=low
-
- * merge from debian
-
- -- Reinhard Tartler <siretart at tauware.de> Tue, 01 Jun 2010 22:23:42 +0200
-
-mplayer (1.0svn) unstable; urgency=low
+mplayer (2:1.0~rc3+svn20100502-4) unstable; urgency=low
- * change version naming from cvs to svn.
+ * copy in mencoder.c from upstream
+ * enable mplayer-gui (Closes: #579925) and mencoder packages.
+ (Closes: #396954, #400940, #580168)
- -- Aurelien Jacobs <aurel at gnuage.org> Tue, 20 Jun 2006 13:02:14 +0200
+ -- Reinhard Tartler <siretart at tauware.de> Wed, 26 May 2010 08:57:28 +0200
-mplayer (1.0cvs) unstable; urgency=low
+mplayer (2:1.0~rc3+svn20100502-3) medium; urgency=low
- * debian/rules: now compiled without --enable-runtime-cpudetection.
- If you plan to install the target .deb on a wide variety of machines,
- you may want to add that option to the configure command.
+ * Fix rtsp vulnerability. Patch applied by DSA. Closes: #581245
+ * Fix another integer overflow, Closes: #524805
+ * prepare new upload
+ * sync libao2/ao_pulse.c with svn r30062, Closes: #558196, #580113
+ * make configure use pkg-config for fribidi checks. Closes: #582784,
+ LP: #556200
+ * document 23mplayer-debug-printf.patch
+ * avoid mentioning of GTK frontend in mplayer description
+ * improve package descriptions of mplayer-doc and mplayer-dbg
+ * medium urgency because of fixed security issue
+ * fix SVN_VERION regex in debian rules to unbreak get-orig-source
+ target. Closes: #582369
+ * forcefully disable arts support. Closes: #581225
- -- Guillaume POIRIER <gpoirier at mplayerhq.hu> Mon, 20 Nov 2005 22:56:40 +0100
+ -- Reinhard Tartler <siretart at tauware.de> Tue, 25 May 2010 20:18:08 +0200
-mplayer (0.90cvs) unstable; urgency=low
+mplayer (2:1.0~rc3+svn20100502-2) unstable; urgency=low
- * this is a placeholder message
+ * Remove mencoder from Depends in mplayer-dbg package.
- -- Gabucino <gabucino at mplayerhq.hu> Fri, 7 Feb 2003 23:43:55 +0100
+ -- Andres Mejia <mcitadel at gmail.com> Mon, 03 May 2010 20:19:41 -0400
-mplayer (0.90rc4-0) unstable; urgency=low
+mplayer (2:1.0~rc3+svn20100502-1) unstable; urgency=low
- * new rc-release.
+ * new upstream snapshot from rc3 branch.
+ * remove patches applied upstream:
+
+ - 24_enable_fontconfig_by_default.diff
+ - 30_add_gmplayer_man_rules.diff
+ - 40_improve_desktop_file.patch
+ - 41_fix_forcedsubsonly.patch
+ - 50_fix_crashes_with_invalid_SDPs.patch
+ - 50_fix_initial_volume_setting_pulse_output.patch
+ - 61-malloc-bsd.patch
+ - 62-disable-vidix-on-kfreebsd-amd64.patch
+ - 63-sys-kd-include.patch
- -- Alex Beregszaszi <alex at naxine.org> Fri, 7 Feb 2003 23:43:55 +0100
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 01 May 2010 21:31:58 +0200
+mplayer (2:1.0~rc3+svn20090426-2) unstable; urgency=low
+
+ * don't install apport hook
+ * gross hack to avoid building mplayer-nogui and mplayer-gui packages
+ * add md5sum to remove to avoid spurious conffile prompt, Closes: #568272
+ * Make mplayer build on kFreeBSD (backports from upstream), Closes: #578622
+ - Revert obscure hack that disables the malloc.h check on certain BSD
+ platforms.
+ - disable vidix on kFreeBSD-amd64
+ - rename 'struct keypad' -> 'struct m_keypad' to avoid FTBFS on
+ kFreeBSD/amd64
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 24 Apr 2010 11:34:51 +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. (Closes: #573257)
+
+ -- 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
+
+ [ fabrice ]
+ * Introduce the mplayer-nogui package, that does not depend on GTK+
+
+ [ Reinhard Tartler ]
+ * new upstream svn version based on the 1.0rc3 branch
+ * various cleanups and refactoring in debian/rules
+ * no longer remove mencoder.c: It does hardly contain any "dangerous"
+ or patented code. Instead:
+ * strip libavcodec similar to how its done in the ffmpeg package. This
+ brings the patent policy of the mplayer and ffmpeg package in debian
+ finally in sync. c.f. the comments and the "discussion" in #522373.
+ * install upstream's version of binary_codecs.sh
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 04 Jun 2009 10:35:52 +0200
+
+mplayer (1.0~rc3+svn20090405-1) unstable; urgency=low
+
+ * New upstream version. Track the 1.0rc3 release branch for now.
+ * remove 50_r28803_segfault_print_int.patch, merged upstream.
+ * no longer remove the TOOLS subdirectory from the upstream source.
+ * make get-orig-source rule actually work.
+ * disable musepack support. Closes: #476384
+ * completely delegate handling of /etc/mplayer/mplayer.conf to
+ dpkg. This change removes also all debconf templates and reduces
+ package complexity.
+ * move .gbp.conf to debian/gbp.conf
+ * cleanups in debian/rules: prefer external debhelper helper files
+ * enhance upstream Makefile to install gmplayer manpages
+ - implement as quilt patch, submitted upstream
+ - debian/rules: make use of the added rules
+ * use dh_prep instead of dh_clean -k
+ * bump Standards-Version to 3.8.1
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 05 Apr 2009 11:37:37 +0200
+
+mplayer (1.0~rc2+svn20090303-7) unstable; urgency=low
+
+ * various cleanups in debian/rules.
+ * as a side effect, DEB_BUILD_OPTIONS set to noopt no longer works. It
+ really needs to be implemented in ./configure instead of weird hackery
+ in debian/rules. patches welcome.
+ * run 'make distclean' only of config.mak exists.
+ * remove debian/control.mplayer* variants.
+ * don't --enable-debug on mipsen. This hopfully fixes the FTBFS on mipsen.
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 02 Apr 2009 18:48:07 +0200
+
+mplayer (1.0~rc2+svn20090303-6) unstable; urgency=low
+
+ [ A Mennucc1 ]
+
+ * use ./configure flags to dynamically link FFmpeg,
+ delete patch 30link-system-ffmpeg.patch
+
+ [ Reinhard Tartler ]
+
+ * cleanup debian/rules: use --enable-debug on all architectures but mips.
+ in order to fix a FTBFS. This results in making the -dbg package on mips
+ useless. If you are interested in having a usable mplayer-dbg package on
+ mips, please try enabling that switch in debian/rules and send us your
+ buildlog!
+ * run 'make distclean' only of config.mak exists
+ * cleanup debian/rules: remove unnecessary clean statements
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 28 Mar 2009 07:24:07 +0100
+
+mplayer (1.0~rc2+svn20090303-5) unstable; urgency=low
+
+ * debian/control : move docbook-xml,docbook-xsl,xsltproc from
+ Build-Depends-Indep to Build-Depends, since they are needed to run
+ configure
+
+ -- A Mennucc1 <mennucc1 at debian.org> Mon, 23 Mar 2009 10:05:45 +0100
+
+mplayer (1.0~rc2+svn20090303-4) unstable; urgency=low
+
+ * try another fix for bug 520113
+ * disable specific patch for powerpc, that was reducing optimization to -O
+ to avoid gcc bug 475153
+
+ -- A Mennucc1 <mennucc1 at debian.org> Sun, 22 Mar 2009 10:11:36 +0100
+
+mplayer (1.0~rc2+svn20090303-3) unstable; urgency=low
+
+ * try a fix for bug 520113
+
+ -- A Mennucc1 <mennucc1 at debian.org> Fri, 20 Mar 2009 18:23:35 +0100
+
+mplayer (1.0~rc2+svn20090303-2) unstable; urgency=low
+
+ * always build documentation. Fixes FTBFS.
+
+ -- Reinhard Tartler <siretart at tauware.de> Fri, 13 Mar 2009 09:34:27 +0100
+
+mplayer (1.0~rc2+svn20090303-1) unstable; urgency=low
+
+ * new upstream snapshot (Closes: #517774)
+ * this version has dvdnav:// support (Closes: #430211)
+ * rebuild against new ffmpeg in unstable,
+ (Closes: #518670, #516933, #492229, #505048, #512892, #496709)
+ * converted package to use git Closes: #508483
+ * completly reworked the way the .orig.tar.gz is created, please see
+ debian/README.upstream-upgrade and debian/get-orig-source.sh for details
+ * large refactoring of debian/control and debian/rules
+ * dropped many unnecessary versioned build dependencies
+ * bumped debhelper compatibility level 4->7
+ * replace patch system from dpatch to quilt
+ * dropped the following patches, merged upstream:
+ - 10configure-alpha.dpatch
+ - 12configure-vidix-alpha.dpatch
+ - 24mplayer.desktop.dpatch
+ - 25kFreeBDS.dpatch
+ - 25mplayer-desktop.dpatch
+ - 30vorbis-block-alloc.dpatch
+ - 40rtsp_demux.dpatch
+ - 51xsai.dpatch
+ - CVE-2008-0073--rtsp_fix.diff
+ - CVE-2008-0629--stream_cddb.c.diff
+ - CVE-2008-0630.diff
+ - SA33136_demux_vqf.c.diff
+ - demux.patch
+ - demux_audio_fix_20080129.diff
+ - demux_mov_fix_20080129.diff
+ - oCERT-2008-013--realfix.diff
+ - theora_length_fix_svn27354.diff
+ - to-ffmpeg-free-0.svn20080206.diff
+ * reworked the way the control file for the mplayer-non-dfsg package is
+ handled: it now copied from debian/control.mplayer-non-dfsg. Add a
+ debian/control target in debian rules.
+ * do not run the actual rules of debian/rules in parallel, fixes FTBFS
+ * implement the debconf review by Josselin Mouette and Christian
+ Perrier. The last debconf question is mplayer/replace-existing-files
+ (which can be dropped after ucf is deployed in the package) and
+ mplayer/voutput, which needs more thought. (Closes: #445091)
+ * verified that http://oumph.free.fr/tmp/29761.h264 no longer crashes
+ mplayer (Closes: #497467)
+ * add japanese debconf translation, thanks to Hideki Yamane.
+ (Closes: #512874)
+ * warn about libstdc++.so.5 when installing binary codecs in i386 as well
+ (Closes: #497787)
+ * add libpulse-dev to build dependencies to enable pulseaudio backend
+ (Closes: #468470)
+ * add libschroedinger-dev to build dependencies
+
+ -- Reinhard Tartler <siretart at tauware.de> Wed, 11 Mar 2009 22:23:25 +0100
+
+mplayer (1.0~rc2-20) unstable; urgency=low
+
+ * use external libfaad : external libfaad is newer, and does not crash
+ on aac file in http://bugs.debian.org/407010
+
+ -- A Mennucc1 <mennucc1 at debian.org> Thu, 18 Dec 2008 11:48:42 +0100
+
+mplayer (1.0~rc2-19) unstable; urgency=high
+
+ * SA33136: MPlayer TwinVQ Processing Buffer Overflow Vulnerability
+ Thanks to T. Klein, G. Iuculano, R. Döffinger (Closes: #508803).
+
+ -- A Mennucc1 <mennucc1 at debian.org> Mon, 15 Dec 2008 21:05:07 +0100
+
+mplayer (1.0~rc2-18) unstable; urgency=high
+
+ * fix oCERT-2008-013 Mplayer real demuxer heap.
+ Thanks to Felipe Andres Manzano, Andrea Barisani,
+ Steffen Joeris, Reimar Döffinger. (Closes: #500683).
+ * Clean lintian warnings:
+ build-depend on libgif-dev instead of libungif4-dev
+ build-depend on x11proto-core-dev instead of x-dev
+ depends on debconf | debconf-2.0
+ * Up standard to 3.8.0.0
+ support DEB_BUILD_OPTIONS="parallel=n"
+
+ -- A Mennucc1 <mennucc1 at debian.org> Mon, 22 Sep 2008 11:01:26 +0200
+
+mplayer (1.0~rc2-17) unstable; urgency=low
+
+ * fix bashism in binary_codecs.sh script,
+ thanks to Raphael Geissert (Closes: #489636).
+ * use proper name 'mplayer.xpm' for the icon,
+ thanks to Fernando Mitio Yamada (Closes: #483499).
+ * fix: show correct length of theora video (from svn27354),
+ thanks to Sam Morris and Reimar Döffinger (Closes: #464207).
+ * [INTL:sv] Swedish strings for mplayer debconf,
+ thanks to brother at bsnet.se (Closes: #491777).
+
+ -- A Mennucc1 <mennucc1 at debian.org> Sun, 27 Jul 2008 09:26:24 +0200
+
+mplayer (1.0~rc2-16) unstable; urgency=high
+
+ * fix FTBFS, build-depends against libdvdread-dev,
+ thanks to Bastian Blank (Closes: #491366).
+ * update lists of binary codecs and mirrors
+
+ -- A Mennucc1 <mennucc1 at debian.org> Sun, 20 Jul 2008 12:05:47 +0200
+
+mplayer (1.0~rc2-15) unstable; urgency=low
+
+ * build-depend on liblzo2-dev
+ * Bug fix: "mplayer segfaults on opening any *.flv file", thanks A LOT to
+ Ondrej Certik (Closes: #489291).
+ * Bug fix: "mplayer: crashes on playing a standalone aac file", thanks
+ to Michal Suchanek (Closes: #489419).
+ * Bug fix: "mplayer: crashes with "MPlayer interrupted by signal 11
+ in module: demux_open" on FLV files", thanks to Paul Collins
+ (Closes: #487830).
+ * Bug fix: "mplayer: [INTL:it] debconf templates italian translation",
+ thanks to Alessandro Vietta (Closes: #481418).
+
+ -- A Mennucc1 <mennucc1 at debian.org> Sun, 06 Jul 2008 17:57:29 +0200
+
+mplayer (1.0~rc2-14) unstable; urgency=low
+
+ * Links with ffmpeg-free provided libraries (Closes: #395252).
+ * Uses libsvga1-dev in Build-Depends instead of svgalibg1-dev,
+ thanks to Guillem Jover (Closes: #483460).
+ * Build-depend on vstream-client-dev,
+ thanks to Paul Hedderly (Closes: #487291).
+
+ -- A Mennucc1 <mennucc1 at debian.org> Mon, 23 Jun 2008 13:20:34 +0200
+
+mplayer (1.0~rc2-12) unstable; urgency=low
+
+ * Conflicts on gcc-4.3 <= 4.3.0-3 to avoid bug 475153 .
+ * Sorry, 'DEB_BUILD_OPTIONS=noopt ./debian/rules build-arch'
+ is again broken in i386 . It is simply too difficult to build
+ mplayer on i386 w/o optimizing it a bit. For details, see
+ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=402950#44
+ and following.
+ * For this reason, and to help solving the strange bug 478731
+ I have decided to build mplayer with 'configure --enable-debug' and
+ to create a 'mplayer-dbg' package, to ship debugging symbols.
+
+ -- A Mennucc1 <mennucc1 at debian.org> Thu, 01 May 2008 20:40:42 +0200
+
+mplayer (1.0~rc2-11) unstable; urgency=low
+
+ * avoid FTBFS bug introduced by dpkg-buildpackage setting of "CFLAGS
+ & al" in environment,
+ thanks to Lucas Nussbaum (Closes: #475973).
+ * set 'autodetect' to 'xv,x11' to avoid problems with xvmc and/or gmplayer,
+ thanks to Walter B. Rasmann (Closes: #473686).
+ thanks to Sam Morris (Closes: #475934).
+ thanks to Victor Hahn (Closes: #458786).
+ * fix bashism in /bin/sh maintainer script,
+ thanks to Raphael Geissert (Closes: #472232).
+ * renamed mplayer.xpm to mplayer in desktop file,
+ thanks to giggz (Closes: #472833).
+ * added debian/README.source
+ * add libmpcdec to build-dependencies
+
+ -- A Mennucc1 <mennucc1 at debian.org> Thu, 01 May 2008 12:16:08 +0200
+
+mplayer (1.0~rc2-10) unstable; urgency=high
+
+ * fix: CVE-2008-0073 remote code execution via crafted rtsp stream,
+ thanks to Nico Golde and Reimar Döffinger (Closes: #473056).
+ * use ALSA by default, thanks to Sam Morris (Closes: #470617).
+
+ -- A Mennucc1 <mennucc1 at debian.org> Sat, 29 Mar 2008 09:40:09 +0100
+
+mplayer (1.0~rc2-9) unstable; urgency=low
+
+ * fix: gmplayer wrong driver setting "vo_driver= xmga", thanks to
+ Siegfrid Brandstätter (Closes: #449041).
+ * added dependency libaudio-dev, libfribidi-dev, libopenal-dev;
+ this should make mplayer compiling less dependent on build environment
+ * and moreover I think I enabled almost everything around, thanks to
+ Fabian Greffrath (Closes: #419790).
+ * add BiDi support, thanks to Khaled Hosny (Closes: #462611).
+ * removed 'uploaders: Dariush Pietrzak <eyck at kuszelas.com>'
+ thanks to Lucas Nussbaum (Closes: #460031).
+ * fix missing newline from message displayed by postinst script,
+ thanks to Serafeim Zanikolas (Closes: #468059).
+
+ -- A Mennucc1 <mennucc1 at debian.org> Fri, 21 Mar 2008 16:14:55 +0100
+
+mplayer (1.0~rc2-8) unstable; urgency=low
+
+ * fix SVN25823 for
+ CVE-2008-0630, buffer overflow via crafted url ,
+ thanks Niko Golde (closes: #464532)
+ * fix SVN25824 for
+ CVE-2008-0629, buffer overflow via crafted cddb title
+ thanks Niko Golde (closes: #464533)
+ * fix for CVE-2008-0485 Array index error in libmpdemux/demux_mov.c
+ a.k.a. CORE-2007-1218: MPlayer 1.0rc2 buffer overflow vulnerability
+ thanks Stefan Fritsch
+ * fix for CVE-2008-0486 Array index vulnerability in libmpdemux/demux_audio.c
+ a.k.a. CORE-2008-0122: MPlayer arbitrary pointer dereference
+ thanks Stefan Fritsch (closes: #464060)
+
+ -- A Mennucc1 <mennucc1 at debian.org> Fri, 8 Feb 2008 20:42:41 +0100
+
+mplayer (1.0~rc2-7) unstable; urgency=low
+
+ * fix segfault on GNU/kFreeBSD, by moving a patch from
+ debian/patches/25kFreeBDS.dpatch directly to debian/rules itself,
+ thanks to Petr Salinger (Closes: #457312).
+ * really remove /etc/init.d/mplayer and /etc/rc... files (used <
+ 1.0~rc2-1), thanks to Kumar Appaiah & piuparts (Closes: #454710).
+ * Avoid 'echo -e' bashism in postinst (now uses /bin/echo ),
+ thanks to Helmut Grohne (Closes: #451551).
+ * delete config.h config.mak from diff.gz,
+ thanks to Fabian Greffrath (Closes: #451381).
+ * [INTL:sk] Slovak po-debconf translation,
+ thanks to helix84 at centrum.sk (Closes: #440717).
+ * enable jack support, thanks to Free Ekanayaka (Closes: #440461).
+ * Document 22disable-xscreensaver.dpatch
+ * Bump standard to 3.7.3.0 :
+ - menu for "/usr/bin/gmplayer" goes in section="Applications/Video"
+ - added Homepage and Vcs fields
+
+ -- A Mennucc1 <mennucc1 at debian.org> Sat, 29 Dec 2007 13:08:22 +0000
+
+mplayer (1.0~rc2-6) unstable; urgency=low
+
+ * created debhelper debian/compat '5'
+ * corrected mplayer.menu to section="Applications/Viewers"
+ * fix: cant open a file with spaces in the name through nautilus,
+ thanks to giggz (Closes: #449298)
+ * fix: 2xsai filter generates side-by-side double-height images on amd64,
+ thanks to Josh Triplett and Reimar Döffinger (Closes: #450999)
+ * clean up of 10configure-alpha.dpatch and 12configure-vidix-alpha.dpatch
+ * Debconf templates and debian/control reviewed by the
+ debian-l10n-english team as part of the Smith review project.
+ Thanks to Christian Perrier.
+ Closes: #447111, #448247, #412394, #414510, #448247
+ [Debconf translation updates]
+ * Belarusian. Thanks Andrei Darashenka. Closes: #447115, #447305
+ * Galician. Thanks Jacobo Tarrio. Closes: #447300
+ * French Thanks Yves Rütschlé. Closes: #448844
+ * Finnish. Thanks Esko Arajärvi. Closes: #447349
+ * Spanish; Castilian. Thanks Javier Fernández-Sanguino Peña. Closes: #447416
+ * Czech. Thanks Miroslav Kure. Closes: #447439
+ * Portuguese. Thanks "traduz" Carlos Lisboa. Closes: #447800
+ * Vietnamese. Thanks Clytie Siddall. Closes: #447873
+ * Romanian. Thanks Eddy Petrișor. Closes: #447922
+ * Dutch; Flemish. Thanks "cobaco". Closes: #448120
+ * Italian. Thanks Luca Monducci. Closes: #448237
+ * German. Thanks Helge Kreutzmann. Closes: #448246
+ * Malayalam. Thanks Santhosh Thottingal. Closes: #448468
+ * Russian. Thanks Sergey Alyoshin. Closes: #449000
+
+ -- A Mennucc1 <mennucc1 at debian.org> Wed, 14 Nov 2007 15:49:04 +0100
+
+mplayer (1.0~rc2-5) unstable; urgency=low
+
+ * patch to play rtsp stream (hack to skip short packets)
+ thanks to Stefan Strasser, Reimar Döffinger (Closes: #410424).
+ * the bug "mplayer segfaults on ogg video" was actually a libtheora bug,
+ fixed in 1.0~beta1-1 or above: added dependency.
+ Thanks to Pierre Habouzit, Reimar Döffinger (Closes: #408071).
+ * Fix FTBFS on GNU/kFreeBSD, thanks to Petr Salinger (Closes: #448791).
+
+ -- A Mennucc1 <mennucc1 at debian.org> Sun, 04 Nov 2007 12:56:38 +0000
+
+mplayer (1.0~rc2-4) unstable; urgency=low
+
+ * fix: _vorbis_block_alloc() implicitly converted to pointer,
+ thanks to dann frazier (Closes: #447278).
+
+ -- A Mennucc1 <mennucc1 at debian.org> Fri, 19 Oct 2007 21:01:17 +0200
+
+mplayer (1.0~rc2-3) unstable; urgency=low
+
+ * vidix drivers cyberblade sis unichrome fail on alpha, and are probably
+ useless but in x86_32 and x86_64 archs
+
+ -- A Mennucc1 <mennucc1 at debian.org> Fri, 19 Oct 2007 18:10:59 +0200
+
+mplayer (1.0~rc2-2) unstable; urgency=low
+
+ * Runtime CPU detection only works for x86, x86-64 and PPC
+
+ -- A Mennucc1 <mennucc1 at debian.org> Fri, 19 Oct 2007 09:43:08 +0200
+
+mplayer (1.0~rc2-1) unstable; urgency=low
+
+ * New upstream version.
+ * Remove RTC debconf question and /etc/init.d/mplayer (Closes: #421363)
+ * Use dpatch.
+
+ -- A Mennucc1 <mennucc1 at debian.org> Wed, 18 Oct 2007 19:27:16 +0200
+
+mplayer (1.0~rc1-16.1) unstable; urgency=high
+
+ * Non-maintainer upload by testing security team.
+ * Check wLongsPerEntry in aviheader.c before using it to prevent
+ possible NULL pointer dereference (CVE-2007-4938) (Closes: #443478).
+
+ -- Nico Golde <nion at debian.org> Tue, 25 Sep 2007 12:39:15 +0200
+
+mplayer (1.0~rc1-16) unstable; urgency=low
+
+ * compile for --mcpu=ev5 on alpha; fixes "Illegal instruction on EV56",
+ thanks to Tom Evans & Ivan Jager (Closes: #431139).
+ * removed debian/patches (Closes: #409352).
+ * correct mplayer.config to respect font default, thanks Simon Ruggier.
+ * linked with liblivemedia, thanks to Hilmar Preusse (Closes: #440338).
+
+ -- A Mennucc1 <mennucc1 at debian.org> Sat, 01 Sep 2007 12:27:16 +0000
+
+mplayer (1.0~rc1-15) unstable; urgency=low
+
+ * Bug fix: "Depends on libconfhelper-perl, but this package has been
+ removed", thanks to David (Closes: #434509).
+ * Bug fix: "correction for binary_codecs.sh", thanks to nutzteil at web.de
+ (Closes: #431537).
+
+ -- A Mennucc1 <mennucc1 at debian.org> Wed, 1 Aug 2007 11:54:40 +0200
+
+mplayer (1.0~rc1-14) unstable; urgency=high
+
+ * fix for stack overflow in the code used to handle cddb queries,
+ CVE-2007-2948 and SAID 24302, thanks Stefan Cornelius of Secunia Research
+ * do not use libmad0, on request of upstream
+ * [INTL:ml] Malayalam debconf template translation
+ thanks to Santhosh Thottingal (Closes: #419527).
+ * [INTL:it] Italian debconf templates translation
+ thanks to Luca Monducci (Closes: #425259).
+ * [l10n:ro] Romanian debconf templates translation
+ thanks to Eddy Petrișor (Closes: #415368).
+
+ -- A Mennucc1 <mennucc1 at debian.org> Wed, 6 Jun 2007 10:17:22 +0200
+
+mplayer (1.0~rc1-13) unstable; urgency=low
+
+ * fix for CVE-2007-1246 and similar (Closes: #414075)
+ thanks Kees Cook & Moritz Jodeitand & R Togni
+ patches for files
+ loader/dmo/DMO_VideoDecoder.c from SVN 22204
+ loader/dshow/DS_VideoDecoder.c from SVN 22205
+ * [INTL] Japanese po-debconf templates translation,
+ thanks to Kobayashi Noritada (Closes: #413120).
+ * [INTL] Dutch po-debconf translation, thanks cobaco (Closes: #413880)
+ * [INTL] Russian po-debconf translation, thanks Yuri Kozlov (Closes: #414251)
+ * patch for ia64 unaligned access crash,
+ thanks to Bryan Stillwell for debugging &
+ Reimar Döffinger for the patch (Closes: #409431).
+ * mplayer-doc: add doc-base documentation indexes,
+ thanks to Martintxo (Closes: #405945).
+ * binary_codecs.sh: check MD5 on downloaded stuff (Closes: #405371).
+ * binary_codecs.sh: check if bzip2 is there, and bail out
+ graciously otherwise; if untarring fails, allow for retry.
+ Fixes "binary_codecs.sh doesn't install already downloaded codecs",
+ thanks to Ingo Bressler for problem analysis (Closes: #413063).
+ * binary_codecs.sh: do not use fping (my code lost part of URLs) (closes: #399144)
+ * binary_codecs.sh: warn that essential-ppc codecs need libstdc++5, thanks to
+ Bin Zhang (Closes: #404473) for pointing out.
+ * enable smb:// (Closes: #412079).
+ * mplayer.postinst: when vo=x11 or vo=fbdev, zoom=1 is set as well,
+ thanks to Robert Millan (Closes: #412252).
+ * -stop-xscreensaver option disables gnome-screensaver as well
+ (but only if cursor is inside mplayer window) , thanks Adam Tlałka
+ and Reimar Döffinger (Closes: #404975).
+ * [INTL] fix small typo in English template, thanks cobaco (closes: #414393)
+ * [INTL] devices.html -> video.html , thanks cobaco (closes: #414392)
+ * [INTL] True Type -> TrueType , thanks cobaco (closes: #414394)
+ * [INTL] ~/.mplayer/mplayer.conf -> ~/.mplayer/config ,
+ thanks Jacobo Tarrio (closes: #408055)
+
+ -- A Mennucc1 <mennucc1 at debian.org> Sat, 10 Mar 2007 12:57:16 +0100
+
+mplayer (1.0~rc1-12) unstable; urgency=medium
+
+ * (possible) security fixes backported from SVN
+ 7585 7586 7591 for libavcodec/h264.c
+ 7640 7650 for libavformat/asf.c
+ all thanks to Michael Niedermeyer
+ * Czech debconf translation; thanks to Miroslav Kure (Closes: #408626).
+ * Portuguese debconf translation; thanks to Traduz! (Closes: #408449).
+ * Swedish debconf translation; thanks to Andreas Henriksson (Closes: #407864).
+ * binary_codecs.sh should specify umask;
+ thanks to Linas Žvirblis (Closes: #406346).
+ * clarify dependencies (do not pick up them randomly!),
+ thanks to EspeonEefi (Closes: #405170);
+ debian/rules: when configuring, disable also: arts , jack , aa , dv , smb
+ debian/control: depend on: lzo, speex, dts, ladspa, gl (mesa)
+ * the above adds opengl video output (Closes: #400934).
+ * forked processes cannot use GTK gui; this fixes bug in caching streams
+ in gmplayer (Closes: #396962)
+ thanks to martin f krafft and Reimar Döffinger for patch.
+ * added in debian/patches all patches that I applied or I am working on
+
+ -- A Mennucc1 <mennucc1 at debian.org> Wed, 31 Jan 2007 10:30:24 +0100
+
+mplayer (1.0~rc1-11) unstable; urgency=high
+
+ * fix for CVE-2006-6172
+ * fixed "typo in the README.Debian", thanks to Aurelien
+ Jacobs (Closes: #403893).
+ * another (last?) fix for (Closes: #402950), thanks Sam Hocevar.
+
+ -- A Mennucc1 <mennucc1 at debian.org> Thu, 28 Dec 2006 23:03:42 +0100
+
+mplayer (1.0~rc1-10) unstable; urgency=high
+
+ * really apply patch for (Closes: #403379)
+ * many fixes to various codecs, to prevent crashes on
+ randomly altered streams
+
+ -- A Mennucc1 <mennucc1 at debian.org> Mon, 18 Dec 2006 11:46:35 +0100
+
+mplayer (1.0~rc1-9) unstable; urgency=low
+
+ * fix another segfault on (broken) MPEGs without I frames (Closes: #403379).
+ * fix: binary_codecs.sh failed to install essential-ppc
+ codecs, thanks to Bin Zhang (Closes: #403442).
+
+ -- A Mennucc1 <mennucc1 at debian.org> Sun, 17 Dec 2006 13:06:43 +0100
+
+mplayer (1.0~rc1-8) unstable; urgency=low
+
+ * fix segfault on (broken) MPEGs without I frames, (Closes: #402922).
+ * README.Debian: document apt pinning and debian-multimedia
+ * can be compiled with --enable-debug (Closes: #402920).
+ * supports DEB_BUILD_OPTIONS=nostrip/noopt (Closes: #402950)
+ (see README.Debian, though, for gory details)
+ * Spanish po-debconf translation", thanks
+ to Javier Fernández-Sanguino Peña (Closes: #402205).
+ * patch to compile in GNU/kFreeBSD, thanks to Petr Salinger (Closes: #402872).
+
+ -- A Mennucc1 <mennucc1 at debian.org> Fri, 15 Dec 2006 14:40:54 +0100
+
+mplayer (1.0~rc1-7) unstable; urgency=low
+
+ * Bug fix: "mplayer: FTBFS on AMD64", thanks to Emfox Zhou (Closes:
+ #401893).
+
+ -- A Mennucc1 <mennucc1 at debian.org> Thu, 7 Dec 2006 14:26:10 +0100
+
+mplayer (1.0~rc1-6) unstable; urgency=low
+
+ * debian/control : update mantainer fields
+ * debian/scripts/binary_codecs.sh : 'wget -c -N' -> 'wget -N'
+ * update debian/prefs/codecs_list and mirrors (closes: #399144)
+ * debian/rules : x86_64 -> amd64 (closes: #401697)
+ * applied patch (that should support codecs in amd64 )
+ http://people.freedesktop.org/~jinghua/real64/mplayer-amd64-real-codecs.diff
+ * update french translation (closes: #400106)
+ * update german translation (closes: #400296)
+ * (again!) set --with-codecsdir to avoid broken default; thanks to Emfox Zhou
+ (Closes: #396017).
+
+ -- A Mennucc1 <mennucc1 at debian.org> Wed, 6 Dec 2006 10:56:02 +0100
+
+mplayer (1.0~rc1-5) unreleased; urgency=low
+
+ * this version was built with external ffmpeg 0.svn6767
+ it is in http://tonelli.sns.it/pub/mplayer/experimental-shared
+
+ -- A Mennucc <debdev at tonelli.sns.it> Mon, 27 Nov 2006 15:03:02 +0100
+
+mplayer (1.0~rc1-4) unstable; urgency=low
+
+ * Depends on mplayer-skin
+ * Use fontconfig in /etc/mplayer/mplayer.conf , so that 'Sans' is
+ always a fallback; this solves:
+ "OSD missing numbers/letters", thanks to Sam Morris (Closes: #396531).
+ if fc-list is available, let the user choose between a huge list as well
+ * Bug fix: "mplayer: depends exclusively on debconf (debconf-2.0 should
+ be an alternative)", thanks to Eddy Petrișor (Closes: #397891).
+ * Patches from Diego Biurrun :
+ - README.jfdct.gz is already copied inside
+ libavcodec/jfdctfst.c libavcodec/jfdctint.c
+ - do not use external libdv (ffmpeg has internally a better one)
+ - rename win32codecs.sh to binary_codecs.sh,
+ * Bug fix: "mplayer: win32codecs.sh will not uninstall", thanks to Joey
+ Morris (Closes: #397867) and Diego for the patch.
+ * Applied some changes in debconf template, thanks to Helge
+ Kreutzmann (Closes: #397819).
+ * Supports caca (Closes: #397749).
+ * "Initial German debconf translation",
+ thanks to Helge Kreutzmann (Closes: #397822).
+ * "French program translation", thanks to Yves Rutschle (Closes: #398515).
+ * Bug fix: "FTBFS: bashisms in build scripts", thanks to
+ Florent Bayle (Closes: #396450).
+
+ -- A Mennucc1 <mennucc1 at debian.org> Sun, 19 Nov 2006 21:06:01 +0100
+
+mplayer (1.0~rc1-3) unstable; urgency=low
+
+ * Bug fix: "Outdated info in /usr/share/doc/mplayer/README.Debian",
+ thanks to Sam Morris (Closes: #396281).
+ * set --with-codecsdir to avoid broken default; thanks to Emfox Zhou
+ (Closes: #396017).
+
+ -- A Mennucc1 <mennucc1 at debian.org> Tue, 31 Oct 2006 09:13:32 +0100
+
+mplayer (1.0~rc1-2) unstable; urgency=low
+
+ * rewrote mplayer.{config,template,postinst} ; this also fixes
+ "mplayer: Strange contents of default config file", thanks to
+ Sam Morris (Closes: #395829).
+ * Reviewed description, thanks to Filipus Klutiero (Closes: #395540).
+ * Use po-debconf
+ [Diego suggested:]
+ * Don't install codecs.conf. If people fiddle w/ it, playback *will* break.
+ * --disable-bitmap-font, so no more
+ "annoying message on 'ttf doesn't look like a bitmap '",
+ thanks to Michael Piefel (Closes: #395325) and Diego
+
+ -- A Mennucc1 <mennucc1 at debian.org> Sat, 28 Oct 2006 17:49:41 +0200
+
+mplayer (1.0~rc1-1) unstable; urgency=low
+
+ * New upstream release
+ * -nortc is now default since -rtc has disadvantages with recent kernels
+ ( so the mplayer/rtc question is now low priority, defaults to false )
+ * do not pass --enable-directfb (it fails)
+ * reorganized debian/rules file (Closes: #395238,#395240,#395303).
+ * reformat of scripts/win32codecs.sh
+
+ -- A Mennucc1 <mennucc1 at debian.org> Thu, 26 Oct 2006 12:55:33 +0200
+
+mplayer (1.0~rc1~svn20199-1) unstable; urgency=low
+
+ * code pulled from SVN
+ (and some dirs deleted : see 'debian/rules fix-orig-source')
+ * do not depend on xmms
+ * build libraries with -fPIC
+ * ship in examples dir: etc/menu.conf etc/input.conf etc/codecs.conf
+
+ -- A Mennucc1 <mennucc1 at debian.org> Fri, 13 Oct 2006 11:41:47 +0200
+
+mplayer (1.0~rc1~svn19921) unstable; urgency=low
+
+ * code pulled from SVN
+ (and some dirs deleted : see 'debian/rules fix-orig-source')
+ * better debian/copyright file
+ * fixed some lintian issues
+ * new debian/rules targets that build a tar from SVN
+ * updated various README.Debian files (regarding all the
+ upstream code not shipped into Debian)
+ * 'debian/rules autocontrol' ( generates control.in -> control )
+ also adds dependencies for creating docs (if it is needed)
+ * in debconf, question on -vo is low priority, default is "autodetect"
+ (that is, no setting)
+ * mplayer init supports LSB
+
+ -- A Mennucc1 <mennucc1 at debian.org> Sun, 21 Sep 2006 10:08:27 +0200
+
+mplayer (1.0pre8-1) unstable; urgency=low
+
+ * New upstream release
+ * better debian/copyright file
+ * do not ship a skin
+
+ -- A Mennucc1 <mennucc1 at debian.org> Sun, 30 Jul 2006 12:25:14 +0200
+
+mplayer (1.0pre7try2-1) unstable; urgency=low
+
+ * New upstream release
+ * changed DEB_BUILD_OPTIONS to DEB_BUILD_CONFIGURE ,
+ DEB_BUILD_OPTIONS is used as in debian policy
+ * use gcc-3.4
+ * changed xlibs-dev to a long list of dependencies, for Debian/etch
+ * try to adhere to http://www.mplayerhq.hu/DOCS/tech/binary-packaging.txt
+ (see README.Debian for details)
+ * removed dependency on xlibmesa-dev, disabled opengl
+
+ -- A Mennucc1 <mennucc1 at debian.org> Mon, 16 Jan 2006 11:47:33 +0100
+
+mplayer (1.0pre7-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- A Mennucc1 <mennucc1 at debian.org> Sun, 24 Apr 2005 19:34:33 +0200
+
+mplayer (1.0pre6a-4) unstable; urgency=low
+
+ * Simon McVittie <hacks at pseudorandom.co.uk> wonderful work:
+ - Work around Debian bug #267442 (glibc's sys/uio.h and gcc's altivec.h have
+ conflicting uses for __vector) by re-ordering #includes
+ - Fix potential symlink attack in ./configure
+ - Disable support for binary codecs on platforms for which those codecs
+ aren't available; also disable the corresponding Debconf note when it's
+ inappropriate
+ - Changed Build-Depends: so it works in pbuilder
+ - Explicitly build-depend on libjpeg62-dev, libfontconfig1-dev,
+ libungif4-dev
+ - Tweak debian/rules to avoid certain errors being ignored
+ - Use --language=all
+
+ -- A Mennucc1 <mennucc1 at debian.org> Sat, 5 Mar 2005 22:24:57 +0100
+
+mplayer (1.0pre6a-3) unstable; urgency=low
+
+ * provide a target 'debian/rules get-orig-source'
+ that recreates the orig.tar.gz ; then use the above orig.tar.gz
+ * rewrote some parts of debian/rules
+ * don't clean and recompile docs if upstream ships them
+ * mplayer-doc was shipping too much stuff
+ * translated man pages where not installed properly
+ * compile with libdv4-dev
+ * correct README.Debian
+
+ -- A Mennucc1 <mennucc1 at debian.org> Tue, 20 Feb 2005 14:30:19 +0100
+
+mplayer (1.0pre6a-2) unstable; urgency=low
+
+ * Forgot build-dep on libtheora
+ * Must not depend on libxvidcore
+
+ -- A Mennucc1 <mennucc1 at debian.org> Mon, 14 Feb 2005 14:47:56 +0100
+
+mplayer (1.0pre6a-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- A Mennucc1 <mennucc1 at debian.org> Fri, 11 Feb 2005 19:33:42 +0100
+
+mplayer (1.0-cvs20030324-2) unstable; urgency=low
+
+ * some corrections, as suggested Diego Biurrun
+ - binary codecs should go into /usr/lib/codecs (upstream default)
+ - better template 'mplayer/install_codecs'
+ - an empty 'font=' in mplayer.conf breaks mplayer: postinst corrected
+ * correction in 'mplayer/cfgnote'
+ * better mplayer.postinst and mplayer.config
+
+ -- A Mennucc1 <mennucc1 at debian.org> Sun, 18 Apr 2004 17:25:37 +0200
+
+mplayer (1.0.cvs20030324-1) unstable; urgency=low
+
+ * following the discussion started by Diego Biurrun <diego at biurrun.de>
+ in debian-devel, I have prepared a new packaging of 'mplayer'
+ (with code that comes from CVS)
+ * the upstream tar.bz cannot be distributed by Debian, since it contains
+ CSS code; so I am repackaging it
+ * I have tried my best to address all known issues:
+ - the package contains the detailed Copyright made by Diego Biurrun
+ - the package does not contain CSS code, or AFAIK other code on which
+ there is active patent enforcement
+ - there is a script debian/cvs-changelog.sh that shows all changes
+ done to files included in this source.
+ This should comply with GPLv2 sec 2.a (in spirit if not in letter)
+ For this reason, the source code contains CVS directories.
+ * needs make (>= 3.80) for 'html-chunked-$(1)' in DOCS/xml/Makefile
+
+ -- A Mennucc1 <mennucc1 at debian.org> Wed, 30 Mar 2004 18:04:06 +0100
+
+mplayer (0.90-3) unstable; urgency=low
+
+ * changed description to stress that the .tar.gz in Debian is different from
+ the upstream (following suggested by Edward Block)
+ * --enable-fbdirect in configure
+ * uploaded to Debian
+
+ -- A Mennucc1 <mennucc1 at debian.org> Fri, 1 Aug 2003 16:21:50 +0200
+
+mplayer (0.90-2) unstable; urgency=low
+
+ * removed all CSS code. Now mplayer use lib dvdread
+
+ -- A Mennucc1 <mennucc1 at debian.org> Fri, 25 Jul 2003 10:50:26 +0200
+
+mplayer (0.90-1) unstable; urgency=low
+
+ * uploaded to Debian. The source code was scrutinized for
+ licenses and copyrights. Read copyright for a detailed discussion.
+
+ -- A Mennucc1 <mennucc1 at debian.org> Wed, 23 Jul 2003 09:45:41 +0200
+
+mplayer (0.90) unstable; urgency=low
+
+ * version bumped
+
+ -- Gabucino <gabucino at mplayerhq.hu> Sun, 16 Feb 2003 11:02:51 +0100
+
+mplayer (0.90rc4-1) unstable; urgency=low
+
+ * new rc-release
+
+ -- A Mennucc1 <mennucc1 at debian.org> Mon, 24 Feb 2003 18:40:13 +0100
+
+mplayer (0.90rc3-2) unstable; urgency=low
+
+ * configure: --disable-dvdnav --enable-mpdvdkit --disable-aa --disable-ggi
+ on suggestions from author(s)
+
+ -- A Mennucc1 <mennucc1 at debian.org> Thu, 23 Jan 2003 14:12:50 +0100
+
+mplayer (0.90rc3-1) unstable; urgency=low
+
+ * show notes in config, not template
+ * default device in Debian is usually /dev/cdrom, not /dev/dvd
+
+ -- A Mennucc1 <mennucc1 at debian.org> Mon, 20 Jan 2003 15:54:57 +0100
+
+mplayer (0.90rc2-5) unstable; urgency=low
+
+ * ftp-installer: Please read README.Debian.2
+ * other adjustments to debian/*
+ * notes in the templates were not showing, due to a missing go();
+
+ -- A Mennucc1 <mennucc1 at debian.org> Thu, 16 Jan 2003 10:02:43 +0100
+
+mplayer (0.90rc2-4) unstable; urgency=low
+
+ * #DEBHELPER# in postinst was not working OK (not passing arguments)
+ * template mplayer/install_codecs was not showing
+
+ -- Andrea Mennucc <debdev at Tonelli.sns.it> Tue, 14 Jan 2003 09:48:44 +0100
+
+mplayer (0.90rc2-3) unstable; urgency=low
+
+ * Thanks to Nagy for teaming up. His are mime and conffile and scripts.
+
+ -- Andrea Mennucc <debdev at Tonelli.sns.it> Mon, 13 Jan 2003 16:46:22 +0100
+
+mplayer (0.90rc2-2) unstable; urgency=low
+
+ * pass control to debconf scripts in postinst and postrm
+ * purge debconf database on purge.
+
+ -- Dariush Pietrzak <eyck at ghost.anime.pl> Sun, 12 Jan 2003 15:01:38 +0100
+
mplayer (0.90rc3-0) unstable; urgency=low
* new release.
diff --combined debian/control
index 4d74686,cef6880..5e76ec7
--- a/debian/control
+++ b/debian/control
@@@ -1,176 -1,31 +1,180 @@@
Source: mplayer
-Section: misc
+Section: video
Priority: optional
-Maintainer: Diego Biurrun <diego at biurrun.de>
-Standards-Version: 3.2.1
-Build-Depends: libgtk1.2-dev | libgtk2.0-dev, libpng12-dev, zlib1g-dev, x11proto-core-dev, libx11-dev, libxext-dev, libxinerama-dev, libxv-dev, debhelper (>= 2)
+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.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/
+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),
++ libavdevice-dev,
++ libavformat-dev,
++ libavutil-dev,
+ libcaca-dev,
+ libcdparanoia-dev | libcdparanoia0-dev,
+ libdirectfb-dev,
+ libdts-dev,
+ libdvdread-dev,
+ libesd0-dev,
+ libfaad-dev,
+ libfontconfig1-dev,
+ libfreetype6-dev,
+ libfribidi-dev,
+ libgif-dev,
+ libgl1-mesa-dev,
+ libgtk2.0-dev,
+ libjack-dev,
+ libjpeg62-dev,
+ liblircclient-dev,
+ liblivemedia-dev,
+ liblzo2-dev,
+ libmpcdec-dev,
+ libncurses5-dev,
+ libopenal-dev,
+ libpng12-dev | libpng-dev,
+ libpostproc-dev,
+ libpulse-dev,
+ libschroedinger-dev,
+ libsdl1.2-dev | libsdl1.1-dev,
+ libsmbclient-dev,
+ libspeex-dev,
+ libsvga1-dev [i386 amd64],
+ libswscale-dev,
+ libtheora-dev (>= 1.0~beta1),
+ libvorbis-dev,
+ libvorbisidec-dev,
+ libx11-dev,
+ libxext-dev,
+ libxinerama-dev,
+ libxv-dev,
+ libxvmc-dev,
+ libxxf86dga-dev,
+ libxxf86vm-dev,
+ libvdpau-dev [i386 amd64],
+ pkg-config,
+ quilt,
+ vstream-client-dev,
+ x11proto-core-dev,
+ xsltproc,
+ zlib1g-dev
+
+# disabled to avoid binary NEW
+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,
+ ttf-freefont,
+ bzip2,
+ fontconfig
+Depends: mplayer,
+ ${shlibs:Depends},
+ ${misc:Depends}
+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
-Depends: ${shlibs:Depends},debconf
-Description: The Ultimate Movie Player
- MPlayer is a movie player for LINUX (runs on many other Unices, and non-x86
- CPUs, see the ports section). It plays most MPEG, VOB, AVI, OGG/OGM, VIVO,
+Suggests: mplayer-doc,
+ ttf-freefont,
+ netselect | fping,
+ bzip2,
+ fontconfig
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+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,
- supported by many native, XAnim, RealPlayer, and Win32 DLL codecs. You can
- watch VideoCD, SVCD, DVD, 3ivx, RealMedia, and DivX movies too (and you don't
- need the avifile library at all!).
+ 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+.
.
- Another big feature of MPlayer is the wide range of supported output drivers.
- It works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, AAlib, DirectFB, but you
- can also use GGI and SDL (and this way all their drivers) and some lowlevel
- card-specific drivers (for Matrox, 3Dfx and Radeon, Mach64, Permedia3) too!
- Most of them supports software or hardware scaling, so you can enjoy movies in
- fullscreen.
+ Not all of the upstream code is distributed in the source tarball.
+ See the README.Debian and copyright files for details.
+
+Package: mplayer-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: mplayer,
+ ${misc:Depends}
+Recommends: ffmpeg-dbg
+Description: debugging symbols for MPlayer
+ This package contains the debugging symbols for MPlayer, a movie
+ player for Unix-like systems.
.
- MPlayer supports displaying through some hardware MPEG decoder boards, such as
- the DVB and DXR3/Hollywood+.
+ You only need these if you want to generate usefule debugging
+ backtraces.
+
+Package: mplayer-doc
+Architecture: all
+Section: doc
+Recommends: mplayer
+Depends: ${misc:Depends}
+Replaces: mplayer (<< 2:1.0~rc3+svn20090426-1)
+Description: documentation for MPlayer
+ This package contains the HTML documentation for MPlayer, a movie player for
+ Unix-like systems. It is available in several languages.
.
- And what about the nice big antialiased shaded subtitles (10 supported types)
- with European/ISO 8859-1,2 (Hungarian, English, Czech, etc), Cyrillic, Korean
- fonts, and the onscreen display (OSD)?
+ You only need this package if you want to read the mplayer manual. The manpages
+ are included in the regular mplayer package.
diff --combined debian/gbp.conf
index d6bc349,0000000..1615f89
mode 100644,000000..100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,6 -1,0 +1,6 @@@
+[DEFAULT]
+upstream-branch = upstream
- debian-branch = ubuntu
++debian-branch = master
+upstream-tag = upstream/%(version)s
+debian-tag = debian/%(version)s
+pristine-tar = True
diff --combined debian/get-orig-source.sh
index f7dc506,0000000..bb30f72
mode 100644,000000..100644
--- a/debian/get-orig-source.sh
+++ b/debian/get-orig-source.sh
@@@ -1,115 -1,0 +1,121 @@@
+#!/bin/sh
+#
+# Script to create a 'pristine' tarball for the debian mplayer source package
+# Copyright (C) 2009, Reinhard Tartler
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+set -eu
+
+usage() {
+ cat >&2 <<EOF
+usage: $0 [-dh]
+ -h : display help
+ -d : svn date
+EOF
+}
+
+debug () {
+ $DEBUG && echo "DEBUG: $*" >&2
+}
+
+error () {
+ echo "$1" >&2
+ exit 1;
+}
+
+set +e
+PARAMS=`getopt hd: "$@"`
+if test $? -ne 0; then usage; exit 1; fi;
+set -e
+
+eval set -- "$PARAMS"
+
+DEBUG=false
+SVNDATE=
+
+while test $# -gt 0
+do
+ case $1 in
+ -h) usage; exit 1 ;;
+ -d) SVNDATE=$2; shift ;;
+ --) shift ; break ;;
+ *) echo "Internal error!" ; exit 1 ;;
+ esac
+ shift
+done
+
+# sanity checks now
+dh_testdir
+
+if [ -z $SVNDATE ]; then
+ error "you need to specify an svn date. e.g. 20081230 for Dec 29. 2008"
+fi
+
- # CLEANUPSCRIPT=`pwd`/debian/strip.sh
++CLEANUPSCRIPT=`pwd`/debian/strip.sh
+TARBALL=`pwd`/../mplayer_1.0~rc3+svn${SVNDATE}.orig.tar.gz
+TARBALL_UNSTRIPPED=`pwd`/../mplayer-non-dfsg_1.0~rc3+svn${SVNDATE}.orig.tar.gz
+PACKAGENAME=mplayer
+
+TMPDIR=`mktemp -d`
+trap 'rm -rf ${TMPDIR}' EXIT
+
+baseurl="svn://svn.mplayerhq.hu/mplayer/branches/1.0rc3"
+
+svn export -r{${SVNDATE}} \
+ --ignore-externals \
+ ${baseurl} \
+ ${TMPDIR}/${PACKAGENAME}
+
+svn info -r{${SVNDATE}} \
+ ${baseurl} \
+ | awk '/^Revision/ {print $2}' \
+ > ${TMPDIR}/${PACKAGENAME}/.svnrevision
+
+# get svn externals
+svn pg svn:externals $baseurl | grep -v libswscale | \
+while read external url; do
+ [ -z $url ] && continue
+ dest="${TMPDIR}/${PACKAGENAME}/${external}"
+ svn export -r{${SVNDATE}} --ignore-externals $url $dest
+ svn info $url -r{${SVNDATE}} \
+ | awk '/^Revision/ {print $2}' > ${dest}/.svnrevision
+done
+
+# for mplayer release branches, libswscale is special since it contains
+# svn revision options. The revision below needs manual syncing with
+# upstream's svn.
+
+# TODO: find some way to integrate this in the while loop above
+
+dest="${TMPDIR}/${PACKAGENAME}/libswscale"
+revision=28777
+svn export -r $revision svn://svn.ffmpeg.org/mplayer/trunk/libswscale $dest
+echo $revision > ${dest}/.svnrevision
+
+# this doesn't belong in strip.sh, because the unstripped source should
+# have this directory renamed as well.
+( cd ${TMPDIR}/${PACKAGENAME} && rm -rfv debian )
+
+( cd ${TMPDIR}/ && mv ${PACKAGENAME} ${PACKAGENAME}-${SVNDATE} )
+
+tar czf ${TARBALL_UNSTRIPPED} -C ${TMPDIR} ${PACKAGENAME}-${SVNDATE}
+
++( cd ${TMPDIR}/${PACKAGENAME}-${SVNDATE} && sh ${CLEANUPSCRIPT} )
++
++tar czf ${TARBALL} -C ${TMPDIR} ${PACKAGENAME}-${SVNDATE}
++
++# print diff
++( cd ${TMPDIR} && ptardiff ${TARBALL_UNSTRIPPED} ) | tee ${TARBALL}.diff
diff --combined debian/rules
index e89a2b3,b2173e6..c254829
--- a/debian/rules
+++ b/debian/rules
@@@ -1,191 -1,102 +1,196 @@@
#!/usr/bin/make -f
-# Made with the aid of debmake, by Christoph Lameter,
-# based on the sample debian/rules file for GNU hello by Ian Jackson.
-#export DH_VERBOSE=1
-# This is the debhelper compatability version to use.
-export DH_COMPAT=4
-package := mplayer
-prefix := $(shell pwd)/debian/$(package)
-
-arch := $(shell dpkg --print-architecture)
-
-
-configure: configure-stamp
-configure-stamp:
+include /usr/share/quilt/quilt.make
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+# do not run the actual rules of this makefile in parallel. sub-makes
+# can go in parallel
+.NOTPARALLEL:
+
+############
+
+DEB_SOURCE := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
+DEB_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
+UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -r 's/[^:]+://; s/-[^-]+$$//')
+SVN_VERSION := $(shell echo $(UPSTREAM_VERSION) | sed -nr 's/^[0-9.:-~]+\+svn([0-9]+)$$/\1/p')
+
+
+#UPSTREAMSOURCE := upstream SVN repository
+UPSTREAMSOURCE := http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc1.tar.bz2
+
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+
+
+# XXX enable-menu is frowned upon by upstream
+DEB_BUILD_CONFIGURE = \
+ --prefix=/usr \
+ --confdir=/etc/mplayer \
+ --enable-xvmc \
+ --enable-menu \
+ --disable-arts \
+ --enable-largefiles \
+ --language=all \
+ --disable-libdvdcss-internal \
+ --disable-dvdread-internal \
++ --disable-libavutil_a \
++ --disable-libavcodec_a \
++ --disable-libavformat_a \
++ --disable-libpostproc_a \
++ --disable-libswscale_a \
+ $(archconf)
+
+ifeq ($(DEB_HOST_ARCH),i386)
+#configure optimizes for the cpu detected at ./configure time
+#in order to build a generic binary, avoid non-standard opcodes through gcc
+ archconf += --target=i586-linux
+ DEB_BUILD_CONFIGURE += --enable-runtime-cpudetection
+endif
+ifeq ($(DEB_HOST_ARCH),amd64)
+ DEB_BUILD_CONFIGURE += --enable-runtime-cpudetection
+endif
+ifeq ($(DEB_HOST_ARCH),kfreebsd-i386)
+ DEB_BUILD_CONFIGURE += --enable-runtime-cpudetection
+endif
+ifeq ($(DEB_HOST_ARCH),kfreebsd-amd64)
+ DEB_BUILD_CONFIGURE += --enable-runtime-cpudetection
+endif
+ifeq ($(DEB_HOST_ARCH),powerpc)
+ DEB_BUILD_CONFIGURE += --enable-runtime-cpudetection
+endif
+ifeq ($(DEB_HOST_ARCH),alpha)
+#Avoid high optimization through gcc.
+# see http://permalink.gmane.org/gmane.linux.debian.ports.alpha/7295
+ archconf += --target=alpha_ev5-linux
+endif
+
+# generate debugging symbols for mplayer-dbg for all archs but mipsen,
+# see bug #520113
+ifeq (,$(findstring mips,$(DEB_HOST_ARCH)))
+DEB_BUILD_CONFIGURE += --enable-debug
+endif
+
+
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ MAKEFLAGS += -j$(NUMJOBS)
+endif
+
+
+ifeq (linux,$(DEB_HOST_ARCH_OS))
+ DEB_BUILD_CONFIGURE += --enable-mga --enable-3dfx --enable-tdfxfb
+endif
+
+####### build-arch
+
+
+# See http://wiki.debian.org/Teams/Dpkg/DebianRules; #465282 and
+# https://wiki.ubuntu.com/DistCompilerFlags
+CLEAN_ENV=env -u CFLAGS -u CPPFLAGS -u LDFLAGS -u FFLAGS -u CXXFLAGS
+
+# cowboy in mencoder.c manually fetched from upstream to avoid having to reroll
+# a new upstream tarball. Will be dropped with a new upstream upgrade
+mencoder.c: debian/mencoder.c
+ cp $^ $@
+
+install-arch: mencoder.c $(QUILT_STAMPFN)
dh_testdir
- # Add here commands to configure the package.
- $(checkdir)
- # If you plan to install the target .deb on a wide variety of machines,
- # you may want to add the "--enable-runtime-cpudetection" option to
- # the line below, but beware: the resulting binary will run slower
- ./configure --prefix=/usr --confdir=/etc/mplayer $(DEB_BUILD_OPTIONS)
-
- touch configure-stamp
-
-build: configure-stamp build-stamp
-build-stamp:
+ dh_prep -a
+ [ ! -f config.mak ] || $(MAKE) distclean
+ echo "$(UPSTREAM_VERSION)" > snapshot_version
+ # build non-gui version
+ $(CLEAN_ENV) \
+ ./configure $(COMMON_CONFIGURE_FLAGS) $(DEB_BUILD_CONFIGURE) --disable-gui
+ $(CLEAN_ENV) \
+ $(MAKE)
+ $(MAKE) install-mplayer DESTDIR=$(CURDIR)/debian/mplayer
+ $(MAKE) install-mplayer-man DESTDIR=$(CURDIR)/debian/mplayer
+ $(MAKE) install-mencoder-man DESTDIR=$(CURDIR)/debian/mplayer
+ install -D -m 644 debian/mplayer.conf \
+ $(CURDIR)/debian/mplayer/etc/mplayer/mplayer.conf
+ #install mencoder
+ $(MAKE) install-mencoder DESTDIR=$(CURDIR)/debian/mencoder
+ # build gui version
+ $(CLEAN_ENV) \
+ ./configure $(COMMON_CONFIGURE_FLAGS) $(DEB_BUILD_CONFIGURE) --enable-gui
+ $(CLEAN_ENV) \
+ $(MAKE) mplayer
+ install -D -m 755 mplayer $(CURDIR)/debian/mplayer-gui/usr/bin/gmplayer
+ install -D -m 644 etc/mplayer.desktop \
+ $(CURDIR)/debian/mplayer-gui/usr/share/applications/mplayer.desktop
+ install -D -m 644 etc/mplayer.xpm \
+ $(CURDIR)/debian/mplayer-gui/usr/share/pixmaps/mplayer.xpm
+
+###### build-indep
+
+# commands to compile the documentation
+install-indep: install-indep-stamp
+install-indep-stamp:
dh_testdir
-
- # commands to compile the package.
- ${MAKE}
-
- touch build-stamp
-
-clean:
+ sh debian/all-lang-config-mak.sh > config.mak
+ cd DOCS/xml && ./configure
+ $(MAKE) -C DOCS/xml html-chunked
+ dh_installchangelogs -i
+ dh_installdocs -i
+ dh_compress -i
+ dh_fixperms -i
+ touch $@
+
+################ clean
+
+clean: clean-real unpatch
+clean-real:
dh_testdir
dh_testroot
- rm -f build-stamp configure-stamp
-
- # commands to clean up after the build process.
- -$(MAKE) distclean
- rm -f help_mp.h config.h config.mak
- dh_clean
+ [ ! -f config.mak ] || $(MAKE) -C DOCS/xml distclean || true
+ [ ! -f config.mak ] || $(MAKE) distclean
+ dh_clean build-arch-stamp configure-arch-stamp snapshot_version
+ dh_clean mencoder.c # cleanup cowboyed mencoder.c
-# Build architecture-independent files here.
-binary-indep: build
-# We have nothing to do by default.
+# Build architecture-independent packages
+binary-indep: install-indep
-# Build architecture-dependent files here.
-binary-arch: build
+# Build architecture-dependent packages
+binary-arch: install-arch
dh_testdir
dh_testroot
- dh_clean -k
- dh_installdirs
-
- # commands to install the package into debian/<packagename>
- $(MAKE) prefix=$(prefix)/usr BINDIR=$(prefix)/usr/bin CONFDIR=$(prefix)/etc/mplayer LIBDIR=$(prefix)/usr/lib DATADIR=$(prefix)/usr/share/mplayer MANDIR=$(prefix)/usr/share/man install
-
- dh_link usr/bin/mplayer usr/bin/gmplayer \
- usr/share/man/man1/mplayer.1.gz usr/share/man/man1/gmplayer.1.gz
-
-
- dh_installdebconf
- dh_installdocs -X.svn -Xmplayer.1 DOCS/*
- dh_installexamples etc/example.conf etc/dvb-menu.conf etc/input.conf etc/menu.conf
- dh_installmenu
- dh_installmime
- dh_installinfo
- dh_installchangelogs
- #ChangeLog
+ dh_install -a
+ dh_installchangelogs -a
+ dh_installdocs -a
+ dh_installexamples -a
+ dh_installmenu -a
+ dh_installmime -a
+ dh_installman -a
+ dh_strip -a --dbg-package=mplayer-dbg
dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_makeshlibs
+ dh_compress -a
+ dh_fixperms -a
+ dh_makeshlibs -a
dh_installdeb
- dh_perl
dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
+binary: binary-indep binary-arch
+###############################################
+##These targets generate the DFSG-free tar.gz.
+## They are not automatically invoked.
-#binary-arch: checkroot build
-# $(checkdir)
-# -rm -rf debian/tmp
-# install -d debian/tmp
-# cd debian/tmp && install -d `cat ../dirs`
-
-
-# Must have debmake installed for this to work. Otherwise please copy
-# /usr/bin/debstd into the debian directory and change debstd to debian/debstd
-# debstd
-# dpkg-gencontrol -isp
-# chown -R root.root debian/tmp
-# chmod -R go=rX debian/tmp
-# dpkg --build debian/tmp ..
+get-orig-source:
+ dh_testdir
+ # strip patented code
+ chmod +x debian/strip.sh
+ sh debian/get-orig-source.sh -d $(SVN_VERSION)
-binary: binary-indep binary-arch
+PHONY += build clean binary-indep binary-arch binary-common binary
+PHONY += install binary binary-arch binary-indep clean checkroot get-orig-source
+PHONY += autocontrol fix-orig-source copy-orig-from-svn download-and-unpack-orig
-.PHONY: binary binary-arch binary-indep clean checkroot
+.PHONY: $(PHONY)
--
mplayer packaging
More information about the pkg-multimedia-commits
mailing list