[SCM] VLC media player packaging branch, master, updated. debian/1.1.2-1+exp1-24-gc3f3821
bdrung-guest at users.alioth.debian.org
bdrung-guest at users.alioth.debian.org
Fri Aug 20 09:49:39 UTC 2010
The following commit has been merged in the master branch:
commit c3f3821ec5d5ec8c22539cc0b024f31892965ef8
Merge: 5fbcc5e9f43f801bd85571fc3b0ef4268bc50d0d 8251306c181b584c5cad37b9a32322eceaa148f8
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Fri Aug 20 11:47:43 2010 +0200
Merge branch 'squeeze'
diff --combined debian/changelog
index 45c5749,8c46885..69ace66
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,6 +1,22 @@@
+vlc (1.1.3-1+exp1) experimental; urgency=low
+
+ [ Christophe Mutricy ]
+ * Depends on xulrunner-dev >= 1.9.2
+ * Activate VA-API (Closes: #587792, LP: #539406)
+
+ [ Benjamin Drung ]
+ * Switch to dh7.
+ * Move libavcodec plugin from vlc-nox to vlc.
+ * Add Xb-Npp header to mozilla-plugin-vlc package. (Not doing anything
+ on Debian at the moment, see #484010)
+ * Add apport hook to include more VLC dependencies in bug reports and
+ install it on Ubuntu.
+
+ -- Benjamin Drung <bdrung at ubuntu.com> Thu, 19 Aug 2010 22:27:45 +0200
+
vlc (1.1.3-1) unstable; urgency=medium
+ [ Benjamin Drung ]
* New upstream release.
+ Fix insufficient input validation in TagLib plugin.
(VideoLAN-SA-1004, CVE-2010-2937) (Closes: #592669, LP: #616510)
@@@ -28,7 -13,10 +29,10 @@@
a higher priority than the ALSA output plugin and should be used on
pulseaudio systems.
- -- Benjamin Drung <bdrung at ubuntu.com> Thu, 19 Aug 2010 13:33:09 +0200
+ [ Reinhard Tartler ]
+ * add DM-Upload-Allowed field to debian/control
+
+ -- Reinhard Tartler <siretart at tauware.de> Fri, 20 Aug 2010 06:59:17 +0200
vlc (1.1.2-1) unstable; urgency=low
diff --combined debian/control
index 20a84a0,320d4b9..48037d8
--- a/debian/control
+++ b/debian/control
@@@ -8,6 -8,7 +8,7 @@@ Uploaders: Sam Hocevar (Debian packages
Christophe Mutricy <xtophe at videolan.org>,
Mohammed Adnène Trojette <adn+deb at diwi.org>,
Benjamin Drung <bdrung at ubuntu.com>
+ DM-Upload-Allowed: yes
Build-Depends: debhelper (>= 7.2.3~),
dh-buildinfo,
gettext,
@@@ -17,12 -18,12 +18,12 @@@
libass-dev (>= 0.9.5-2),
libavahi-client-dev,
libavc1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libavcodec-dev (>= 0.cvs20060823),
- libavformat-dev (>= 0.cvs20060823),
+ libavcodec-dev (>= 4:0.6),
+ libavformat-dev (>= 4:0.6),
libcaca-dev (>= 0.99.beta4),
libcddb2-dev,
libcdio-dev,
- libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libdca-dev,
libdirac-dev,
libdvbpsi-dev | libdvbpsi5-dev,
@@@ -52,7 -53,7 +53,7 @@@
libnotify-dev,
libogg-dev,
libpng12-dev,
- libpostproc-dev (>= 0.cvs20060823),
+ libpostproc-dev (>= 4:0.6),
libproxy-dev,
libpulse-dev,
libqt4-dev,
@@@ -65,7 -66,7 +66,7 @@@
libsmbclient-dev,
libspeex-dev,
libsvga1-dev [amd64 i386],
- libswscale-dev,
+ libswscale-dev (>= 4:0.6),
libtag1-dev,
libtar-dev,
libtheora-dev,
@@@ -73,16 -74,15 +74,16 @@@
libudev-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libupnp3-dev,
libv4l-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libva-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libvcdinfo-dev,
libvorbis-dev,
libx11-dev,
libx11-xcb-dev,
- libxcb1-dev,
libxcb-keysyms1-dev,
libxcb-randr0-dev,
libxcb-shm0-dev,
libxcb-xv0-dev,
+ libxcb1-dev,
libxext-dev,
libxml2-dev,
libxpm-dev,
@@@ -91,7 -91,7 +92,7 @@@
lua5.1,
nasm,
pkg-config,
- xulrunner-dev,
+ xulrunner-dev (>= 1.9.2),
yasm [amd64 kfreebsd-amd64],
zlib1g-dev
Standards-Version: 3.9.1
@@@ -162,37 -162,6 +163,37 @@@ Depends: vlc
vlc-nox (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
+Xb-Npp-Applications: 92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a,
+ ec8030f7-c20a-464f-9b0e-13a3a9e97384
+Xb-Npp-Name: VLC Multimedia Plugin
+Xb-Npp-Description: play video and audio in Firefox using the VLC Multimedia Player
+Xb-Npp-File: libvlcplugin.so
+Xb-Npp-MimeType: application/mpeg4-iod,
+ application/mpeg4-muxcodetable,
+ application/ogg,
+ application/x-google-vlc-plugin,
+ application/x-mplayer2,
+ application/x-ogg,
+ application/x-vlc-plugin,
+ audio/3gpp,
+ audio/3gpp2,
+ audio/mpeg,
+ audio/mpeg4,
+ audio/wav,
+ audio/x-mpeg,
+ audio/x-wav,
+ video/3gpp,
+ video/3gpp2,
+ video/mpeg,
+ video/mpeg-system,
+ video/mpeg4,
+ video/quicktime,
+ video/x-mpeg,
+ video/x-mpeg-system,
+ video/x-ms-asf,
+ video/x-ms-asf-plugin,
+ video/x-ms-wmv,
+ video/x-msvideo
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
@@@ -214,8 -183,8 +215,8 @@@ Recommends: vlc-plugin-notify (= ${bina
vlc-plugin-pulse (= ${binary:Version})
Suggests: mozilla-plugin-vlc,
videolan-doc
-Breaks: vlc-nox (<< 1.1.2)
-Replaces: vlc-nox (<< 1.1.2)
+Breaks: vlc-nox (<< 1.1.2-1+exp1)
+Replaces: vlc-nox (<< 1.1.2-1+exp1)
Provides: mp3-decoder
Description: multimedia player and streamer
VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
@@@ -263,7 -232,7 +264,7 @@@ Package: vlc-no
Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends}
-Replaces: vlc (<< 1.0.4-2)
+Replaces: vlc (<< 1.1.0)
Provides: mp3-decoder
Description: multimedia player and streamer (without X support)
VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
--
VLC media player packaging
More information about the pkg-multimedia-commits
mailing list