[SCM] vlc/squeeze-backports: Merge tag 'debian/2.0.3-5'
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Thu Apr 18 05:53:47 UTC 2013
Release 2.0.3-5 to Debian testing.
vlc-plugin-*: Break vlc-nox (<< 2.0.0) to workaround running an outdated vlc-cache-gen.
Release 2.0.3-4 to Debian testing.
gbp.conf: Set debian branch to wheezy.
SECURITY UPDATE: denial of service via crafted PNG file
Release 2.0.3-3 to Debian unstable.
Cherry-pick fix for VLC hang caused by the notify plugin.
debian/vlc.postinst: Fix directory to symlink upgrade in postinst.
Revert "Enable and build sftp plugin and add it to vlc-nox."
Drop alternative dependency on transitional ttf-freefont.
Enable and build sftp plugin and add it to vlc-nox.
Release 2.0.3-2 to Debian unstable.
Add bug number to Lintian override.
Add Pre-Depends on dpkg (>= 1.15.6~) for xz compression.
Add version to vlc-nox dependency of vlc-plugin-sdl (consistent with other plug-ins).
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/squeeze-backports
X-Git-Reftype: branch
X-Git-Oldrev: e3d5e20575863d79c1100d28d16b3fa62f8cd28c
X-Git-Newrev: df885cec3a9db426d4c7c51cc5443e3faff5509c
The following commit has been merged in the squeeze-backports branch:
commit df885cec3a9db426d4c7c51cc5443e3faff5509c
Merge: 0fa96e3e4c53be34f195813026d10f60a681f900 437d08f53198e953e805d405163dfd2ed036dfae
Author: Reinhard Tartler <siretart at tauware.de>
Date: Fri Apr 12 17:46:17 2013 +0200
Merge tag 'debian/2.0.3-5'
Debian release 2.0.3-5
Conflicts:
debian/changelog
debian/gbp.conf
debian/patches/series
diff --combined debian/changelog
index 9acc07a,5218396..4e9dd6f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,38 +1,55 @@@
++vlc (2.0.3-5~bpo60+1) squeeze-backports; urgency=low
++
++ * Rebuild for squeeze-backports.
++
++ -- Reinhard Tartler <siretart at tauware.de> Fri, 12 Apr 2013 17:45:33 +0200
++
+ vlc (2.0.3-5) testing; urgency=low
+
+ * vlc-plugin-*: Break vlc-nox (<< 2.0.0) to workaround running an outdated
+ vlc-cache-gen. (Closes: #685243)
+
+ -- Benjamin Drung <bdrung at debian.org> Mon, 04 Mar 2013 16:15:02 +0100
+
+ vlc (2.0.3-4) testing; urgency=low
+
+ * SECURITY UPDATE: denial of service via crafted PNG file (Closes: #692130)
+ - CVE-2012-5470
+
+ -- Benjamin Drung <bdrung at debian.org> Thu, 06 Dec 2012 21:55:05 +0100
+
+ vlc (2.0.3-3) unstable; urgency=low
+
+ * debian/vlc.postinst: Fix directory to symlink upgrade in postinst.
+ Thanks to David Prévot <taffit at debian.org> (Closes: #687657)
+ * debian/vlc.preinst: Remove insufficient fix to #613121 (similar issue).
+ Thanks to David Prévot for the patch.
+ * Cherry-pick fix for VLC hang caused by the notify plugin. (Closes: #662628,
+ LP: #970447)
+ * Drop alternative dependency on transitional ttf-freefont.
+
+ -- Benjamin Drung <bdrung at debian.org> Thu, 04 Oct 2012 20:59:21 +0200
+
+ vlc (2.0.3-2) unstable; urgency=low
+
+ * debian/rules: Use xz compression for binary packages.
+ Thanks to Ansgar Burchardt <ansgar at debian.org> (Closes: #683836)
+ * Add version to vlc-nox dependency of vlc-plugin-sdl (consistent with other
+ plug-ins).
+
+ -- Benjamin Drung <bdrung at debian.org> Sat, 18 Aug 2012 17:45:01 +0200
+
+vlc (2.0.3-1~bpo60+1) squeeze-backports; urgency=low
+
+ [ Edward Wang ]
+ * New upstream release.
+ * Disable omxil and crystalhd as they are not found in Squeeze.
+
+ [ Reinhard Tartler ]
+ * Add debian/patches/unbreak-with-gcc-4.4.patch to fix mkv playback with gcc-4.4
+
+ -- Reinhard Tartler <siretart at tauware.de> Fri, 10 Aug 2012 13:18:02 +0200
+
vlc (2.0.3-1) unstable; urgency=low
* New upstream release.
@@@ -49,14 -73,6 +90,14 @@@ vlc (2.0.2-1) unstable; urgency=mediu
-- Benjamin Drung <bdrung at debian.org> Sat, 30 Jun 2012 18:39:41 +0200
+vlc (2.0.1-4~bpo60+1) squeeze-backports; urgency=low
+
+ * Rebuild for squeeze-backports.
+ * Disable dirac support as libschroedinger is too old in squeeze. It
+ will be re-enabled as soon as an updated package reaches squeeze-backports
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 19 May 2012 19:47:34 +0200
+
vlc (2.0.1-4) unstable; urgency=high
* Add missing Breaks and Replaces for moving the documentation from vlc-data
diff --combined debian/control
index bca1fe3,e264be1..2e4d691
--- a/debian/control
+++ b/debian/control
@@@ -26,6 -26,7 +26,6 @@@ Build-Depends: autopoint
libcaca-dev (>= 0.99.beta4),
libcddb2-dev,
libcdio-dev (>= 0.78.2),
- libcrystalhd-dev [amd64 i386],
libdc1394-22-dev (>= 2.1.0) [linux-any],
libdca-dev,
libdirac-dev,
@@@ -57,6 -58,7 +57,6 @@@
libncursesw5-dev,
libnotify-dev,
libogg-dev (>= 1.0),
- libomxil-bellagio-dev [linux-any],
libpng-dev,
libpostproc-dev (>= 4:0.6),
libproxy-dev,
@@@ -66,6 -68,7 +66,6 @@@
libresid-builder-dev,
librsvg2-dev,
libsamplerate0-dev,
- libschroedinger-dev (>= 1.0.10),
libsdl-image1.2-dev,
libsdl1.2-dev (>= 1.2.10),
libshout3-dev,
@@@ -111,6 -114,7 +111,7 @@@ Vcs-Browser: http://git.debian.org/?p=p
Package: libvlc-dev
Section: libdevel
Architecture: any
+ Pre-Depends: dpkg (>= 1.15.6~)
Depends: libvlc5 (= ${binary:Version}),
libvlccore-dev,
pkg-config,
@@@ -127,6 -131,7 +128,7 @@@ Description: development files for libv
Package: libvlc5
Section: libs
Architecture: any
+ Pre-Depends: dpkg (>= 1.15.6~)
Depends: ${misc:Depends}, ${shlibs:Depends}
Replaces: vlc (<< 0.8.6.c-6)
Description: multimedia player and streamer library
@@@ -140,6 -145,7 +142,7 @@@
Package: libvlccore-dev
Section: libdevel
Architecture: any
+ Pre-Depends: dpkg (>= 1.15.6~)
Depends: libvlccore5 (= ${binary:Version}), pkg-config, ${misc:Depends}
Description: development files for libvlccore
This package contains headers and a static library required to build plugins
@@@ -152,6 -158,7 +155,7 @@@
Package: libvlccore5
Section: libs
Architecture: any
+ Pre-Depends: dpkg (>= 1.15.6~)
Depends: vlc-data (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
Description: base library for VLC and its modules
This package contains the shared library required by VLC modules and libvlc.
@@@ -162,7 -169,8 +166,8 @@@
Package: vlc
Architecture: any
- Depends: fonts-freefont-ttf | ttf-freefont,
+ Pre-Depends: dpkg (>= 1.15.6~)
+ Depends: fonts-freefont-ttf,
vlc-nox (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
@@@ -189,6 -197,7 +194,7 @@@ Description: multimedia player and stre
or video plugins (vlc-plugin-sdl).
Package: vlc-data
+ Pre-Depends: dpkg (>= 1.15.6~)
Depends: ${misc:Depends}
Architecture: all
Breaks: vlc-nox (<< 2.0.1-3)
@@@ -206,6 -215,7 +212,7 @@@ Package: vlc-db
Section: debug
Priority: extra
Architecture: any
+ Pre-Depends: dpkg (>= 1.15.6~)
Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}
Description: debugging symbols for vlc
VLC is the VideoLAN project's media player. It plays MPEG, MPEG-2, MPEG-4,
@@@ -216,6 -226,7 +223,7 @@@
Package: vlc-nox
Architecture: any
+ Pre-Depends: dpkg (>= 1.15.6~)
Depends: ${misc:Depends}, ${shlibs:Depends}
Replaces: vlc (<< 1.1.0)
Provides: mp3-decoder
@@@ -239,10 -250,12 +247,12 @@@ Description: multimedia player and stre
Package: vlc-plugin-fluidsynth
Architecture: any
+ Pre-Depends: dpkg (>= 1.15.6~)
Depends: fluid-soundfont-gm | musescore-soundfont-gm,
vlc-nox (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
+ Breaks: vlc-nox (<< 2.0.0)
Description: FluidSynth plugin for VLC
This plugin adds support for playing MIDI file via the FluidSynth software
synthesizer to the VLC media player.
@@@ -253,7 -266,9 +263,9 @@@
Package: vlc-plugin-jack
Architecture: any
+ Pre-Depends: dpkg (>= 1.15.6~)
Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+ Breaks: vlc-nox (<< 2.0.0)
Description: Jack audio plugins for VLC
These plugins add support for JACK to the VLC media player. To
activate the audio output module, use the `--aout jack' flag or
@@@ -266,8 -281,9 +278,9 @@@
Package: vlc-plugin-notify
Architecture: any
+ Pre-Depends: dpkg (>= 1.15.6~)
Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
- Breaks: vlc-nox (<< 1.1.2)
+ Breaks: vlc-nox (<< 2.0.0)
Replaces: vlc-nox (<< 1.1.2)
Description: LibNotify plugin for VLC
This plugin adds support for libnotify track change notification to the
@@@ -279,7 -295,9 +292,9 @@@
Package: vlc-plugin-pulse
Architecture: any
+ Pre-Depends: dpkg (>= 1.15.6~)
Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+ Breaks: vlc-nox (<< 2.0.0)
Description: PulseAudio plugin for VLC
This plugin adds support for PulseAudio to the VLC media player. To
activate the audio output module, use the `--aout pulse' flag or
@@@ -291,7 -309,9 +306,9 @@@
Package: vlc-plugin-sdl
Architecture: any
- Depends: vlc-nox, ${misc:Depends}, ${shlibs:Depends}
+ Pre-Depends: dpkg (>= 1.15.6~)
+ Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+ Breaks: vlc-nox (<< 2.0.0)
Description: SDL video and audio output plugin for VLC
This plugin adds support for the Simple DirectMedia Layer library to
the VLC media player. To activate it, use the `--vout sdl' or
@@@ -304,7 -324,9 +321,9 @@@
Package: vlc-plugin-svg
Architecture: any
+ Pre-Depends: dpkg (>= 1.15.6~)
Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+ Breaks: vlc-nox (<< 2.0.0)
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
@@@ -317,7 -339,9 +336,9 @@@
Package: vlc-plugin-zvbi
Architecture: any
+ Pre-Depends: dpkg (>= 1.15.6~)
Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+ Breaks: vlc-nox (<< 2.0.0)
Description: VBI teletext plugin for VLC
This plugin adds support for VBI teletext to the VLC media player.
.
diff --combined debian/patches/series
index 8c33a45,b69d913..bef58ff
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,5 +1,6 @@@
v4l-kfreebsd.patch
link-vlc-cache-gen-with-c++.patch
link-vlc-with-c++.patch
+unbreak-with-gcc-4.4.patch
+ bp-fix-hang-caused-by-notify.patch
+ CVE-2012-5470.patch
--
VLC media player packaging
More information about the pkg-multimedia-commits
mailing list