[SCM] VLC media player packaging branch, lucid, updated. debian/1.0.4-1ubuntu1
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Wed Dec 30 17:37:52 UTC 2009
The following commit has been merged in the lucid branch:
commit 18c5907a40f2fee90f788cb142a831e1af148bb5
Merge: 0e3a4c5a9964dae7b8e42a57e4c334ea6b670bc9 7ca33ea144146e79e72e404f832a3351e9203eec
Author: Reinhard Tartler <siretart at tauware.de>
Date: Wed Dec 30 18:16:28 2009 +0100
Merge branch 'sid' into lucid
Conflicts:
debian/changelog
debian/control
debian/rules
debian/vlc-nox.install
debian/vlc.install
diff --combined debian/changelog
index 0a10915,486563b..58e27c5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,34 -1,34 +1,65 @@@
+ vlc (1.0.4-1) unstable; urgency=low
+
+ * New upstream release
+ + According to upstream, no longer overlaps kde and xfce panels in
+ fullscreen mode, Closes: #562601, LP: #453173
+
+ [ Christophe Mutricy ]
+ * libavutil50 seems to be troublesome. Add it to bugs/control
+ * Add a vlc-plugin-svg package (Closes: #560009)
+ * Switch to xulrunner-dev (Closes: #555915)
+ * Activate the global hotkey module (Closes: #548916)
+ * Mention other maintainers and that the binaries are GPL v3 as we
+ link with LGPL v3 libraries (LP: #489093)
+ * Build-depend on a recent enough live555 to avoid comma vs. decimal
+ point problem (Closes: #539946)
+
+ [ Benjamin Drung ]
+ * Recommend vlc-plugin-pulse for vlc, so that pulse can be used as
+ default output.
+
+ [ Whoopie ]
+ * Enable CDDB in the CDDA module (LP: #439131)
+ * Enable DV support (LP: #392115)
+
+ [ Benjamin Drung ]
+ * Fix typos, that are reported by lintian.
+ * Sort confflags in debian/rules
+ * Split normal configure flags from feature configure flags
+
+ -- Christophe Mutricy <xtophe at videolan.org> Wed, 30 Dec 2009 12:56:49 +0100
+
+vlc (1.0.3-1ubuntu3) lucid; urgency=low
+
+ * prepare new upload
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 21 Nov 2009 22:16:53 +0100
+
+vlc (1.0.3-1ubuntu2) lucid; urgency=low
+
+ [ Reinhard Tartler ]
+ * don't crash when cairo-dock is running. LP: #416294
+ Very ugly patch from upstream to disable ARGB channel usage
+ in libqt4
+ * enable and install the fb module on Linux systems. Closes: #556228
+
+ [ Whoopie ]
+ * enable CDDB in the CDDA module (LP: #439131) and enable
+ globalhotkeys module (LP: #439077)
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 21 Nov 2009 22:11:48 +0100
+
+vlc (1.0.3-1ubuntu1) lucid; urgency=low
+
+ * Merge from Debian unstable (LP: #435524), remaining changes:
+ - build against xulrunner-dev instead of iceape-dev
+ - build against libx264-dev and install libx264 plugin
+ - add Xb-Npp header to vlc package
+ - recommend vlc-plugin-pulse for vlc
+ - backport patch "402_increase_pulseaudio_score.diff"
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 12 Nov 2009 15:29:11 +0100
+
vlc (1.0.3-1) unstable; urgency=low
* New upstream release
@@@ -45,22 -45,6 +76,22 @@@
-- Christophe Mutricy <xtophe at videolan.org> Thu, 05 Nov 2009 12:39:35 +0100
+vlc (1.0.2-1ubuntu2) karmic; urgency=low
+
+ * PulseAudio: higher priority than ALSA, LP: #402018
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 19 Oct 2009 21:19:26 +0200
+
+vlc (1.0.2-1ubuntu1) karmic; urgency=low
+
+ * Merge from Debian unstable (LP: #435524), remaining changes:
+ - build against xulrunner-dev instead of iceape-dev
+ - build against libx264-dev and install libx264 plugin
+ - add Xb-Npp header to vlc package
+ - recommend vlc-plugin-pulse for vlc
+
+ -- Benjamin Drung <bdrung at ubuntu.com> Fri, 25 Sep 2009 14:44:17 +0200
+
vlc (1.0.2-1) unstable; urgency=high
* New upstream release
@@@ -76,17 -60,6 +107,17 @@@
-- Christophe Mutricy <xtophe at videolan.org> Sun, 20 Sep 2009 01:08:41 +0200
+vlc (1.0.1-2ubuntu1) karmic; urgency=low
+
+ * Merge from Debian unstable (LP: #426693), remaining changes:
+ - build against xulrunner-dev instead of iceape-dev
+ - build against libx264-dev and install libx264 plugin
+ - add Xb-Npp header to vlc package
+ * Recommend vlc-plugin-pulse for vlc, so that pulse can be used as default
+ output.
+
+ -- Benjamin Drung <bdrung at ubuntu.com> Wed, 09 Sep 2009 10:24:09 +0200
+
vlc (1.0.1-2) unstable; urgency=low
* Fix typo in debian/changelog
@@@ -100,22 -73,6 +131,22 @@@
-- Christophe Mutricy <xtophe at videolan.org> Sun, 06 Sep 2009 19:07:24 +0200
+vlc (1.0.1-1ubuntu2) karmic; urgency=low
+
+ * No-change rebuild to pick up new ffmpeg shlibs file.
+
+ -- Stefan Potyra <sistpoty at ubuntu.com> Fri, 28 Aug 2009 22:02:06 +0200
+
+vlc (1.0.1-1ubuntu1) karmic; urgency=low
+
+ * Merge from Debian unstable (LP: #406602, #407570), remaining changes:
+ - build against xulrunner-dev instead of iceape-dev
+ - build against libass-dev and libx264-dev
+ - build against and install libx264 plugin
+ - add Xb-Npp header to vlc package
+
+ -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net> Sat, 01 Aug 2009 05:54:24 +0300
+
vlc (1.0.1-1) unstable; urgency=low
* New upstream bugfix version
@@@ -133,16 -90,6 +164,16 @@@
-- Christophe Mutricy <xtophe at videolan.org> Wed, 29 Jul 2009 00:21:39 +0200
+vlc (1.0.0-1ubuntu1) karmic; urgency=low
+
+ * Remaining changes to debian:
+ - build against libxul-dev instead of iceape-dev
+ - build against libass-dev and libx264-dev
+ - build against and install libx264 plugin
+ - add Xb-Npp header to vlc package
+
+ -- Reinhard Tartler <siretart at tauware.de> Fri, 10 Jul 2009 16:18:23 +0200
+
vlc (1.0.0-1) unstable; urgency=low
* New Upstream Release
@@@ -163,17 -110,6 +194,17 @@@
-- Christophe Mutricy <xtophe at videolan.org> Thu, 09 Jul 2009 13:04:20 +0000
+vlc (1.0.0~rc2-1ubuntu1) karmic; urgency=low
+
+ * New upstream version.
+ * tighten build-dependencies on libschroedinger-dev, fixes FTBFS.
+ * Following bugs have an associated and now closed upstream ticket in
+ Launchpad: LP: #281295, #73449, #282567, #117640, #172938, #260918,
+ #273685, #275043, #277834, #282394, #290753, #294136, #298925, #304265,
+ #309728, #311742, #314038
+
+ -- Reinhard Tartler <siretart at tauware.de> Fri, 05 Jun 2009 12:28:15 +0200
+
vlc (1.0.0~rc2-1) experimental; urgency=low
* New Upstream Release Candidate
@@@ -220,36 -156,6 +251,36 @@@ vlc (0.9.9a-3) unstable; urgency=mediu
-- Christophe Mutricy <xtophe at videolan.org> Sat, 06 Jun 2009 16:56:16 +0200
+vlc (0.9.9a-2ubuntu2) karmic; urgency=low
+
+ * Rebuild for libass1 -> libass3 transistion.
+
+ -- Steve Kowalik <stevenk at ubuntu.com> Mon, 25 May 2009 23:29:31 +1000
+
+vlc (0.9.9a-2ubuntu1) jaunty; urgency=low
+
+ * Merge from debian which includes a small security fix.
+ * Adjusted Vcs fields to point to pkg-multimedia's git branch. The
+ package is maintained in the 'jaunty' branch.
+ * Remaining changes to debian:
+ - build against libxul-dev instead of iceape-dev
+ - build against libass-dev and libx264-dev
+ - build against and install libx264 plugin
+ - add Xb-Npp header to vlc package
+ - debian/patches/301_DVD_media.diff: Change %U to %f
+ in VLC .desktop file, cf LP #275043
+ - Remove arts from dependencies. (LP: #320915)
+ - debian/control:
+ - Remove libarts1-dev from build depends
+ - Don't build package vlc-plugin-arts
+ - Remove all notions of vlc-plugin-arts from packages descriptions
+ - debian/rules:
+ - Remove --enable-arts from confflags
+ - Delete debian/vlc-plugin-arts.install
+ - Delete debian/vlc-plugin-arts.links
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 18 Apr 2009 19:52:57 +0200
+
vlc (0.9.9a-2) unstable; urgency=medium
* Security fix
@@@ -259,29 -165,6 +290,29 @@@
-- Christophe Mutricy <xtophe at videolan.org> Tue, 07 Apr 2009 23:06:48 +0200
+vlc (0.9.9a-1ubuntu1) jaunty; urgency=low
+
+ * Merge from Debian. (LP: #356310)
+ * Remaining changes:
+ - build against libxul-dev instead of iceape-dev
+ - build against libass-dev and libx264-dev
+ - build against and install libx264 plugin
+ - adjust Vcs-Bzr Headers in debian/control
+ - add Xb-Npp header to vlc package
+ - debian/patches/301_DVD_media.diff: Change %U to %f
+ in VLC .desktop file, cf LP #275043
+ - Remove arts from dependencies. (LP: #320915)
+ - debian/control:
+ - Remove libarts1-dev from build depends
+ - Don't build package vlc-plugin-arts
+ - Remove all notions of vlc-plugin-arts from packages descriptions
+ - debian/rules:
+ - Remove --enable-arts from confflags
+ - Delete debian/vlc-plugin-arts.install
+ - Delete debian/vlc-plugin-arts.links
+
+ -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net> Mon, 06 Apr 2009 13:58:06 +0200
+
vlc (0.9.9a-1) unstable; urgency=low
* New upstream version 0.9.9a
@@@ -333,50 -216,6 +364,50 @@@ vlc (0.9.8a-2) unstable; urgency=lo
-- Christophe Mutricy <xtophe at videolan.org> Tue, 24 Feb 2009 16:00:31 +0100
+vlc (0.9.8a-1ubuntu4) jaunty; urgency=low
+
+ [ Cody Russell ]
+ * Check whether the server allows actions before trying to send them.
+ (LP: #328605)
+
+ -- James Westby <james.westby at ubuntu.com> Wed, 25 Feb 2009 11:37:57 +0000
+
+vlc (0.9.8a-1ubuntu3) jaunty; urgency=low
+
+ [ Andreas Wenning ]
+ * Remove arts from dependencies. (LP: #320915)
+ - debian/control:
+ - Remove libarts1-dev from build depends
+ - Don't build package vlc-plugin-arts
+ - Remove all notions of vlc-plugin-arts from packages descriptions
+ - debian/rules:
+ - Remove --enable-arts from confflags
+ - Delete debian/vlc-plugin-arts.install
+ - Delete debian/vlc-plugin-arts.links
+
+ -- Mario Limonciello <mario_limonciello at dell.com> Thu, 12 Feb 2009 14:58:45 -0600
+
+vlc (0.9.8a-1ubuntu2) jaunty; urgency=low
+
+ * no change rebuild to pick up new libx264, LP: #325720
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 07 Feb 2009 20:40:56 +0100
+
+vlc (0.9.8a-1ubuntu1) jaunty; urgency=low
+
+ * merge from debian. LP: #300328, #305100, #289263
+ * Fixes CVE-2008-5276
+ * remaining changes
+ - build against libxul-dev instead of iceape-dev
+ - build against libdca-dev, libass-dev and libx264-dev
+ - build against and install libx264 plugin
+ - adjust Vcs-Bzr Headers in debian/control
+ - add Xb-Npp header to vlc package
+ - debian/patches/301_DVD_media.diff: Change %U to %f
+ in VLC .desktop file, cf LP #275043
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 07 Dec 2008 23:12:27 +0100
+
vlc (0.9.8a-1) experimental; urgency=low
* New upstream release
@@@ -387,20 -226,6 +418,20 @@@
-- Christophe Mutricy <xtophe at videolan.org> Wed, 03 Dec 2008 20:20:52 +0100
+vlc (0.9.6-1ubuntu1) jaunty; urgency=low
+
+ * merge from debian/experimental, fixes LP: #289263
+ remaining changes:
+ - build against libxul-dev instead of iceape-dev
+ - build against libdca-dev, libass-dev and libx264-dev
+ - build against and install libx264 plugin
+ - adjust Vcs-Bzr Headers in debian/control
+ - add Xb-Npp header to vlc package
+ - debian/patches/301_DVD_media.diff: Change %U to %f
+ in VLC .desktop file, cf LP #275043
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 15 Nov 2008 15:45:06 +0100
+
vlc (0.9.6-1) experimental; urgency=low
[ Reinhard Tartler ]
@@@ -430,38 -255,6 +461,38 @@@ vlc (0.9.4-2) experimental; urgency=lo
-- Christophe Mutricy <xtophe at videolan.org> Mon, 20 Oct 2008 23:23:46 +0200
+vlc (0.9.4-1ubuntu3) intrepid; urgency=low
+
+ * link vlc to unicode enabled curses library. Thanks to Rafaël Carré for
+ reporting.(LP: #282644)
+ * enable emedded video (LP: #282582)
+ * Autodetect screen while using Xinerama to toggle fullscreen (LP: #115419)
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 13 Oct 2008 21:47:13 +0200
+
+vlc (0.9.4-1ubuntu2) intrepid; urgency=low
+
+ * add new plugin database meta fields Xb-Npp-Description and Xb-Npp-File
+ - update debian/control
+ * link plugin binary to /usr/lib/xulrunner-addons/plugins/
+ - update debian/mozilla-plugin-vlc.links
+
+ -- Alexander Sack <asac at ubuntu.com> Mon, 13 Oct 2008 17:45:51 +0200
+
+vlc (0.9.4-1ubuntu1) intrepid; urgency=low
+
+ * merge from debian/experimental
+ * New upstream release fixes LP: #280081, #280378
+ * remaining changes:
+ - build against libxul-dev instead of iceape-dev
+ - build against libdca-dev, libass-dev and libx264-dev
+ - adjust Vcs-Bzr Headers in debian/control
+ - add Xb-Npp header to vlc package
+ - debian/patches/301_DVD_media.diff: Change %U to %f
+ in VLC .desktop file, cf LP #275043
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 12 Oct 2008 11:37:03 +0200
+
vlc (0.9.4-1) experimental; urgency=low
* New upstream bugfix version
@@@ -486,70 -279,6 +517,70 @@@ vlc (0.9.3-1) experimental; urgency=lo
-- Christophe Mutricy <xtophe at videolan.org> Fri, 26 Sep 2008 23:49:48 +0200
+vlc (0.9.3-0ubuntu1) intrepid; urgency=low
+
+ [ Reinhard Tartler ]
+ * new upstream bugfix only Releases LP: #274721
+
+ Relevant fixes from NEWS file:
+
+ Various bugfixes:
+ * Fixed DTS channel order on 5.1 systems
+ * Fixed pausing behavior for subtitles and for Audio-CD
+ * Multiple subtitles and podcast fixes
+ * Various crashes fixed in PS, SSA, mkv, xspf, freetype
+ * Fixed update system bugs
+ * Other bug fixes (dvd language selection, subtitle colours, HTTP keep-alive...)
+
+ Qt4 interface:
+ * Added Faster/Slower icons to the controller panel
+ * Fixed lost playlist columns when switching the playlist view
+ * Added needed options to Simple preferences (to avoid NVIDIA drivers issues)
+ * Fullscreen controller: added time label, remembering of last position
+ * Fixed drag'n drop behaviour on the playlist
+ * Multiple other fixes (Enter hotkey in preferences, Skins selection...)
+
+ [ Saïvann Carignan ]
+ * debian/patches/301_DVD_media.diff: Change %U to %f
+ in VLC .desktop file . (LP: #275043)
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 27 Sep 2008 09:30:04 +0200
+
+vlc (0.9.2-1ubuntu2) intrepid; urgency=low
+
+ * remove spurious conflicts on libvlc2. LP: #274614
+ * fix FTBFS on all archs other than i386/lpia and amd64. Patch from
+ pkg-multimedia svn, Closes: #499860
+
+ -- Reinhard Tartler <siretart at tauware.de> Fri, 26 Sep 2008 08:35:29 +0200
+
+vlc (0.9.2-1ubuntu1) intrepid; urgency=low
+
+ * New Upstream Release, exception granted by
+ - dktrkranz, norsetto, Hobbsee (via irc). LP: #270404
+
+ Changes done in ubuntu:
+
+ * add libxul-dev to build-depends
+ * make sure that vlc is build against libxul in configure. This doesn't
+ change anything in the package, but makes it more robust if building
+ in an 'unclean' chroot or when modifying the package.
+ * debian/control: make Vcs-* fields point to the motumedia branch
+ * add libx264-dev and libass-dev to build-depends
+ LP: #210354, #199870
+ * actually enable libass support by passing --enable-libass to configure
+ * enable libdca: add libdca-dev to build depends and --enable-libdca
+ * install the x264 plugin.
+
+ Changes already in the pkg-multimedia branch in debian:
+
+ * don't install usr/share/vlc/mozilla in debian/mozilla-plugin-vlc.install
+ * new upstream .desktop file now registers flash video mimetype LP: #261567
+ * add Xb-Npp-Applications to mozilla-plugin-vlc
+ * remove duplicate entries in debian/vlc-nox.install
+
+ -- Reinhard Tartler <siretart at tauware.de> Wed, 17 Sep 2008 21:56:14 +0200
+
vlc (0.9.2-1) experimental; urgency=low
[ Christophe Mutricy ]
diff --combined debian/control
index e51f88c,e86f031..f144cf5
--- a/debian/control
+++ b/debian/control
@@@ -1,8 -1,7 +1,8 @@@
Source: vlc
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: Sam Hocevar (Debian packages) <sam+deb at zoy.org>,
Clément Stenac <zorglub at debian.org>,
Loic Minier <lool at dooz.org>,
@@@ -14,12 -13,12 +14,12 @@@ Build-Depends: debhelper (>= 7)
quilt,
nasm,
yasm [amd64 kfreebsd-amd64],
- xulrunner-dev,
liba52-0.7.4-dev,
libaa1-dev,
libasound2-dev (>= 0.9.0beta10a) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libass-dev (>= 0.9.5-2),
libavahi-client-dev,
+ libavc1394-dev,
libavcodec-dev (>= 0.cvs20060823),
libavformat-dev (>= 0.cvs20060823),
libcaca-dev (>= 0.99.beta4),
@@@ -41,7 -40,7 +41,7 @@@
libid3tag0-dev,
libjack-dev,
liblircclient-dev,
- liblivemedia-dev (>= 2008.07.24),
+ liblivemedia-dev (>= 2009.11.27),
liblua5.1-0-dev,
libmad0-dev,
libmatroska-dev (>= 0.8.0),
@@@ -55,6 -54,8 +55,8 @@@
libpostproc-dev (>= 0.cvs20060823),
libpulse-dev,
libqt4-dev,
+ libraw1394-dev,
+ librsvg2-dev,
libschroedinger-dev (>= 1.0.7-1~),
libsdl-image1.2-dev,
libsdl1.2-dev (>= 1.2.7+1.2.8cvs20041007-5.3),
@@@ -74,7 -75,6 +76,7 @@@
libvcdinfo-dev,
libvorbis-dev,
libx11-dev,
+ libx264-dev,
libxcb-keysyms1-dev,
libxext-dev,
libxml2-dev,
@@@ -82,11 -82,12 +84,12 @@@
libxt-dev,
libxv-dev,
pkg-config,
+ xulrunner-dev,
zlib1g-dev
Standards-Version: 3.8.3
Homepage: http://www.videolan.org/vlc
Vcs-Git: git://git.debian.org/git/pkg-multimedia/vlc.git
-Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/vlc.git;a=shortlog;h=refs/heads/sid
+Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/vlc.git;a=shortlog;h=refs/heads/lucid
Package: vlc
Architecture: any
@@@ -97,8 -98,8 +100,8 @@@ Depends: vlc-nox (= ${binary:Version})
Recommends: vlc-plugin-pulse (= ${binary:Version})
Suggests: mozilla-plugin-vlc,
videolan-doc
- Replaces: vlc-nox (<< 0.9.2-1)
- Conflicts: vlc-nox (<< 0.9.2-1)
+ Replaces: vlc-nox (<< 1.0.3-1)
+ Conflicts: vlc-nox (<< 1.0.3-1)
Provides: mp3-decoder
Description: multimedia player and streamer
VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
@@@ -241,37 -242,6 +244,37 @@@ Description: GGI video output plugin fo
Package: mozilla-plugin-vlc
Architecture: any
Depends: vlc-nox (= ${binary:Version}), vlc, ${shlibs:Depends}, ${misc:Depends}
+Xb-Npp-Applications: ec8030f7-c20a-464f-9b0e-13a3a9e97384,
+ 92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a
+Xb-Npp-Name: VLC Multimedia Plugin
+Xb-Npp-Description: play video and audio in firefox using the VLC Multimedai Player
+Xb-Npp-File: libvlcplugin.so
+Xb-Npp-MimeType: audio/mpeg,
+ audio/x-mpeg,
+ video/mpeg,
+ video/x-mpeg,
+ video/mpeg-system,
+ video/x-mpeg-system,
+ video/mpeg4,
+ audio/mpeg4,
+ application/mpeg4-iod,
+ application/mpeg4-muxcodetable,
+ video/x-msvideo,
+ video/quicktime,
+ application/x-ogg,
+ application/ogg,
+ application/x-vlc-plugin,
+ video/x-ms-asf-plugin,
+ video/x-ms-asf,
+ application/x-mplayer2,
+ video/x-ms-wmv,
+ application/x-google-vlc-plugin,
+ audio/wav,
+ audio/x-wav,
+ audio/3gpp,
+ video/3gpp,
+ audio/3gpp2,
+ video/3gpp2
Description: multimedia plugin for web browsers based on VLC
This plugin adds support for MPEG, MPEG2, DVD, DivX, Ogg/Vorbis and many
more formats to your Gecko-based web browser (Firefox, Galeon, etc.). The
@@@ -325,6 -295,21 +328,21 @@@ Description: PulseAudio plugin for VL
DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
streams from various network sources.
+ Package: vlc-plugin-svg
+ Architecture: any
+ Depends: vlc-nox (= ${binary:Version}),
+ ${shlibs:Depends},
+ ${misc:Depends}
+ Description: SVG plugin for VLC
+ This plugin allows you to render SVG graphics on top of the video.It is a
+ text renderer, and must be activated through the '--text-renderer svg'
+ option. When sent non-SVG data, it will convert it to SVG using a template
+ that can be specified by the svg-template-file option.
+ .
+ VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
+ DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
+ streams from various network sources.
+
Package: vlc-data
Architecture: all
Conflicts: vlc-nox (<< 0.9.2-1), mozilla-plugin-vlc (<< 0.9.2-1)
diff --combined debian/patches/series
index c64f21f,5fb4fc7..df3735f
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -5,6 -5,5 +5,7 @@@
200_osdmenu_paths.diff
300_manpage_syntax.diff
401_i420_mmx_pic.diff
+402_increase_pulseaudio_score.diff
+403_ugly-hack-to-prevent-qt4-x11-from-using-alpha-channel.diff
501_decrease_alsa_buffer.diff
+ 502_fix_typo.patch
diff --combined debian/rules
index bd79e99,26a902a..3cd9e00
--- a/debian/rules
+++ b/debian/rules
@@@ -36,63 -36,69 +36,69 @@@ include /usr/share/quilt/quilt.mak
LDFLAGS = -Wl,--as-needed
# configure flags
- confflags += --disable-maintainer-mode --enable-release --prefix=/usr
confflags += \
--config-cache \
+ --disable-maintainer-mode \
+ --disable-update-check \
--enable-fast-install \
+ --enable-release \
+ --prefix=/usr \
--with-binary-version=$(DEBIAN_VERSION) \
- --disable-update-check \
- --enable-ggi \
- --enable-sdl \
- --enable-mad \
- --enable-jack \
- --enable-pulse \
- --enable-lirc \
+ $(NULL)
+ # configure features
+ confflags += \
+ --disable-atmo \
+ --disable-fluidsynth \
+ --disable-gnomevfs \
+ --disable-kate \
+ --disable-mtp \
- --disable-x264 \
++ --enable-x264 \
+ --disable-zvbi \
--enable-a52 \
--enable-aa \
- --enable-dvbpsi \
- --enable-mozilla \
- --with-mozilla-pkg=xulrunner-plugin \
+ --enable-bonjour \
+ --enable-caca \
+ --enable-dca \
+ --enable-dv \
--enable-dvb \
- --enable-ogg \
- --enable-vorbis \
- --enable-shout \
- --enable-qt4 \
+ --enable-dvbpsi \
+ --enable-dvdnav \
+ --enable-faad \
--enable-flac \
- --enable-skins2 \
--enable-freetype \
- --enable-mkv \
- --enable-speex \
- --enable-caca \
- --enable-live555 \
- --enable-libmpeg2 \
--enable-fribidi \
- --enable-mod \
- --enable-theora \
- --enable-dvdnav \
+ --enable-ggi \
--enable-gnutls \
+ --enable-jack \
+ --enable-libass \
+ --enable-libmpeg2 \
+ --enable-lirc \
+ --enable-live555 \
+ --enable-mad \
+ --enable-mkv \
+ --enable-mod \
+ --enable-mozilla \
+ --enable-mpc \
--enable-ncurses \
+ --enable-notify \
+ --enable-ogg \
+ --enable-pulse \
+ --enable-qt4 \
+ --enable-realrtsp \
+ --enable-sdl \
+ --enable-shout \
+ --enable-skins2 \
--enable-smb \
- --disable-gnomevfs \
- --enable-bonjour \
- --enable-mpc \
+ --enable-speex \
+ --enable-svg \
+ --enable-taglib \
+ --enable-telx \
+ --enable-theora \
+ --enable-twolame \
--enable-vcd \
--enable-vcdx \
- --enable-notify \
- --enable-twolame \
- --enable-faad \
- --disable-zvbi \
- --enable-telx \
- --enable-x264 \
- --disable-atmo \
- --enable-taglib \
- --enable-libass \
- --enable-dca \
- --enable-realrtsp \
- --disable-dv \
- --disable-fluidsynth \
- --disable-kate \
- --disable-mtp \
+ --enable-vorbis \
+ --with-mozilla-pkg=libxul \
$(NULL)
diff --combined debian/vlc.install
index 1705c5e,ef66b30..cabd18f
--- a/debian/vlc.install
+++ b/debian/vlc.install
@@@ -2,8 -2,8 +2,9 @@@ usr/bin/qvl
usr/bin/svlc
usr/lib/vlc/access/libx11_screen_plugin.so
usr/lib/vlc/codec/libsdl_image_plugin.so
+usr/lib/vlc/codec/libx264_plugin.so
usr/lib/vlc/control/libglobalhotkeys_plugin.so
+ usr/lib/vlc/control/libhotkeys_plugin.so
usr/lib/vlc/gui/libqt4_plugin.so
usr/lib/vlc/gui/libskins2_plugin.so
usr/lib/vlc/misc/libnotify_plugin.so
--
VLC media player packaging
More information about the pkg-multimedia-commits
mailing list