[SCM] vlc/experimental: Merge branch 'master' into experimental
sramacher at users.alioth.debian.org
sramacher at users.alioth.debian.org
Sat Dec 20 23:50:06 UTC 2014
Finalize changelog
TODO: Wait for approval of #767971
Prepare changelog
Correctly install sftp plugin
New upstream release
Merge tag 'upstream/2.2.0_rc1'
Imported Upstream version 2.2.0~rc1
Finalize changelog
Update changelog
Revert "Disable freerdp plugin"
Start new revision
Finalize changelog
Mention bugs closed by new upstream release
New upstream release
Merge tag 'upstream/2.2.0_pre4'
Imported Upstream version 2.2.0~pre4
Finalize changelog
Bump Standards-Version to 3.9.6
Disable freerdp plugin
Update changelog
Update changelog
Remove libdirac-dev from Build-Depends
debian/rules: Merge common configure flags groups.
Merge tag 'upstream/2.2.0_pre3'
Imported Upstream version 2.2.0~pre3
Disable OSS on Linux (use ALSA instead).
Update changelog
Revert "Link vlc-cache-gen against gobject to prevent gobject related crashes"
Update changelog
Link vlc-cache-gen against gobject to prevent gobject related crashes
Remove hurd.patch, because this is a bug in Hurd and not in VLC.
Disable vpx plugin (not needed when having libavcodec)
Fix typo in changelog
Finalize changelog
Update changelog
Lower Recommends: libdvdcss2 to Suggests to comply with §2.2.1
Sort
Enable vpx plugin
Explicitely disable libtar support
Enable shine plugin
libi420_yuy2_altivec_plugin.so moved to video_chroma
Start new revision
Finalize changelog
Combine some changelog entries and correctly wrap them.
Update changelog
Fix broken symlink
Thighten more dependencies according to configure
Also install the OpenGL ES plugins
Disable svgdec until libcairo2-dev >= 1.13 is in Debian
Tighten libvncserver-dev dependency to >= 0.9.9.
Mention that the PA plugins is now in vlc
Merge branch 'master' of git+ssh://git.debian.org/git/pkg-multimedia/vlc
Enable vnc support again
Fix --enable-glesvX to --enable-glesX.
Run wrap-and-sort
Bump required versions of libbluray-dev and libopus-dev (according to configure).
Rename some configure switches and drop old ones
Enable OpenGL ES v1 and v2
Add explicit B-D on libegl1-mesa-dev
Fix post{inst,rm}-has-useless-call-to-ldconfig lintian warning
Fix description of the transitional package
Make Breaks and Replaces backport friendly
Bump libavcodec-dev to >= 6:9 to make sure VDPAU decoding is available
Start new revision
Finalize changelog
Escape $ properly
Update changelog
Explicitly list libdbus-1-dev in Build-Depends
Remove obsolete Pre-Depends
Remove obsolete Replaces
Update changelog
Recommend vlc-plugin-samba
Add myself to Uploaders
Mention all plugin packages in the Description
Remove obsolete Replaces
Set LD_LIBRARY_PATH properly
Sort entries
Use << instead of <=
Also install other PulseAudio plugins
Better check if vlc-nox contains a plugin linked against libX11 or libxcb
Move PulseAudio plugin to vlc instead
Add Breaks, Replaces for vlc-plugin-pulse
Fix link and dependency
Add vlc-plugin-samba package
Start new revision
Move PulseAudio plugin to vlc-nox
update debian/changelog
avoid installing plugins twice to avoid file conflicts
Follow upstream SONAME bump libvlccore7 -> libvlccore8
Merge tag 'upstream/2.2.0-pre2'
Imported Upstream version 2.2.0-pre2
update debian/changelog
install libvlc_vdpau.so into the vlc package
Cleanup vlc-nox.install.in and vlc.install.in systematically
update debian/changelog
install all splitter plugins in 'vlc', all filter in 'vlc-nox'
Disable libtar support (Closes: #737534)
Install all control plugins in vlc-nox
libvaapi and libvdpau were split into several modules
libdirac_plugin was removed upstream
Drop patches that were merged upstream
Bump requirements on libdvdnav and libdvdread
Merge tag 'upstream/2.2.0_pre1'
Imported Upstream version 2.2.0~pre1
Update changelog
Add upstream patch to support FreeRDP 1.1.0-beta2 API
Start new revision
Release 2.1.5-1 to Debian unstable.
Merge tag 'upstream/2.1.5'
Imported Upstream version 2.1.5
Fix FTBFS on hurd. (Closes: #742183)
Enable VDPAU hardware decoder support.
Add FFmpeg libraries as alternative build dependencies to libav.
Release vlc 2.1.4-1 to Debian unstable.
Update debian/changelog.
Merge tag 'upstream/2.1.4'
Imported Upstream version 2.1.4
Update debian/changelog.
Merge tag 'upstream/2.1.3'
Imported Upstream version 2.1.3
Rename upstream signing key.
Release 2.1.2-2 to unstable
Update changelog
Check if directories exist before removing them
Start new revision
Release vlc 2.1.2-1 to Debian unstable.
Add gpg signature check to watch file.
Drop ftbfs_freetype.patch (applied upstream).
Merge tag 'upstream/2.1.2'
Imported Upstream version 2.1.2
Bump Standards-Version to 3.9.5 (no changes needed).
Refresh ftbfs_freetype.patch from upstream version
Add patch fix FTBFS with freetype 2.5.1 (Closes: #731513)
Add myself to uploaders
Release vlc 2.1.1-1 to Debian unstable.
Remove obsolete conffiles.
Drop altivec patch (fixed upstream).
Merge tag 'upstream/2.1.1'
Imported Upstream version 2.1.1
Release 2.1.0-2 to Debian unstable.
Enable libva on kFreeBSD.
The libdvb plugin in Linux specific.
The libaccess_dv plugin was renamed to libdv1394.
Remove the libvaapi plugin from vlc if libva is disabled.
Drop link-binaries-with-c++.patch.
Fix build failure on powerpc by correcting the detection of compiler flags for altivec.
Disable Video4Linux2 on kFreeBSD due to a build failure.
Correct reason to disable the libvnc plugin.
Disable more plugins that we do not build.
Explicitly disable plugins that we do not build.
Update minimum version of build dependencies.
Switch to debhelper 9.
Sort configure flags.
The 3dn and mmxext plugins are gone.
Revert "Memcpy plugins are gone"
Fixed in 2.1.0
Correct minimum version of gnutls to 3.0.20.
Update changelog again
Add myself to Uploaders
Update debian/copyright
Bump to lua 5.2
Disable opencv by default
Add libidn11-dev to build depends
Fix configure warning
Disable building a static library.
Add missing Breaks & Replaces for the move of libavcodec_plugin.so from vlc to vlc-nox.
Refresh patch with quilt refresh -p ab --no-index --no-timestamps.
Run wrap-and-sort.
debian/rules: Terminate confflags list.
Update changelog
Add grammar patch from upstream
Update libvlc5 symbols
libvlccore5 is now libvlccore7
Update file lists for VLC 2.1.0
.hosts was removed in 2.1.0
Memcpy plugins are gone
Update new build dependencies
Update for removed and renamed modules
Remove static dependency on libproxy
Refresh patches
Remove un-needed patch
--with-tuning was removed in 2.1.0
Merge tag 'upstream/2.1.0'
Imported Upstream version 2.1.0
Run distclean after building the static libraries.
Release 2.0.8-1 to Debian unstable.
Drop fix-ftbfs-flac-1.3.patch (applied upstream).
Merge tag 'upstream/2.0.8'
Imported Upstream version 2.0.8
Release 2.0.7-4
Prepare changelog
Prevent m4 errors in dh_autoreconf
Backport patches from upstream to allow building with libdvbpsi 1.0.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/experimental
X-Git-Reftype: branch
X-Git-Oldrev: af0feb803a1071f519eabb920c855733fbdb543a
X-Git-Newrev: de1b13f8ee9883e65a850f05a69f1edd5d3b3150
The following commit has been merged in the experimental branch:
commit 74a6eb56a66f4f7a4e3c761ff035e4b692f80e28
Merge: af0feb803a1071f519eabb920c855733fbdb543a 63c302448dfaadeeb285a880ad9f8268b8cb09dd
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Sat Nov 15 22:33:55 2014 +0100
Merge branch 'master' into experimental
diff --combined debian/control
index 3565364,8c0615b..814311c
--- a/debian/control
+++ b/debian/control
@@@ -7,48 -7,57 +7,57 @@@ Uploaders: Clément Stenac <zorglub at deb
Christophe Mutricy <xtophe at videolan.org>,
Mohammed Adnène Trojette <adn+deb at diwi.org>,
Reinhard Tartler <siretart at tauware.de>,
- Benjamin Drung <bdrung at debian.org>
+ Benjamin Drung <bdrung at debian.org>,
+ Edward Wang <edward.c.wang at compdigitec.com>,
+ Mateusz Åukasik <mati75 at linuxmint.pl>,
+ Sebastian Ramacher <sramacher at debian.org>
Build-Depends: autopoint,
- debhelper (>= 8),
+ debhelper (>= 9),
dh-autoreconf,
dh-buildinfo,
gettext,
liba52-0.7.4-dev,
libaa1-dev,
- libasound2-dev (>= 1.0.16) [linux-any],
+ libasound2-dev (>= 1.0.24) [linux-any],
libass-dev (>= 0.9.8),
libavahi-client-dev,
- libavc1394-dev [linux-any],
- libavcodec-dev (>= 6:9),
- libavformat-dev (>= 6:9),
- libbluray-dev (>= 1:0.2.1),
+ libavc1394-dev (>= 0.5.3) [linux-any],
+ libavcodec-dev (>= 6:9) | libavcodec-ffmpeg-dev,
+ libavformat-dev (>= 4:0.6) | libavformat-ffmpeg-dev,
+ libbluray-dev (>= 1:0.3.0),
libcaca-dev (>= 0.99.beta4),
libcddb2-dev,
libcdio-dev (>= 0.78.2),
+ libchromaprint-dev (>= 0.6.0),
libcrystalhd-dev [amd64 i386],
+ libdbus-1-dev (>= 1.6.0),
libdc1394-22-dev (>= 2.1.0) [linux-any],
libdca-dev,
- libdirac-dev,
libdirectfb-dev,
libdvbpsi-dev | libdvbpsi5-dev,
- libdvdnav-dev,
- libdvdread-dev (>= 0.9.5),
+ libdvdnav-dev (>> 4.9.0),
+ libdvdread-dev (>> 4.9.0),
+ libegl1-mesa-dev,
libfaad-dev,
libflac-dev (>= 1.1.2-3),
- libfluidsynth-dev,
+ libfluidsynth-dev (>= 1.1.2),
+ libfreerdp-dev (>= 1.0.1),
libfreetype6-dev,
libfribidi-dev,
libgl1-mesa-dev,
- libgnutls-dev (>= 2.0.0),
+ libgles1-mesa-dev,
+ libgles2-mesa-dev,
+ libgnutls28-dev (>= 3.0.20),
libgtk2.0-dev,
+ libidn11-dev,
libiso9660-dev (>= 0.72),
libjack-dev,
libkate-dev (>= 0.3.0),
liblircclient-dev,
liblivemedia-dev (>= 2011.12.23),
- liblua5.1-0-dev,
+ liblua5.2-dev,
libmad0-dev,
- libmatroska-dev (>= 1.0.0),
+ libmatroska-dev (>= 1.4.0),
libmodplug-dev (>= 1:0.8.8.1),
libmpcdec-dev,
libmpeg2-4-dev,
@@@ -57,11 -66,10 +66,10 @@@
libnotify-dev,
libogg-dev (>= 1.0),
libomxil-bellagio-dev [linux-any],
- libopus-dev,
+ libopus-dev (>= 1.0.3),
libpng-dev,
- libpostproc-dev (>= 6:9),
- libproxy-dev,
- libpulse-dev (>= 0.9.11),
+ libpostproc-dev (>= 4:0.6),
+ libpulse-dev (>= 1.0),
libqt4-dev (>= 4:4.6.0),
libraw1394-dev (>= 2.0.1) [linux-any],
libresid-builder-dev,
@@@ -70,22 -78,24 +78,24 @@@
libschroedinger-dev (>= 1.0.10),
libsdl-image1.2-dev,
libsdl1.2-dev (>= 1.2.10),
+ libshine-dev (>= 3.0.0),
libshout3-dev,
libsidplay2-dev,
libsmbclient-dev,
libspeex-dev (>= 1.0.5),
libspeexdsp-dev (>= 1.0.5),
libssh2-1-dev,
- libswscale-dev (>= 6:9),
- libtag1-dev (>= 1.5),
- libtar-dev,
+ libswscale-dev (>= 4:0.6) | libswscale-ffmpeg-dev,
+ libtag1-dev (>= 1.9),
libtheora-dev (>= 1.0),
libtwolame-dev (>= 0.3.8),
libudev-dev [linux-any],
libupnp-dev,
- libv4l-dev [kfreebsd-any linux-any],
- libva-dev [linux-any],
+ libv4l-dev [linux-any],
+ libva-dev [kfreebsd-any linux-any],
libvcdinfo-dev (>= 0.7.22),
+ libvdpau-dev,
+ libvncserver-dev (>= 0.9.9),
libvorbis-dev,
libx11-dev,
libx264-dev (>= 2:0.86),
@@@ -100,10 -110,11 +110,11 @@@
libxml2-dev,
libxpm-dev,
libzvbi-dev (>= 0.2.28),
- lua5.1,
+ lua5.2,
+ oss4-dev [kfreebsd-any],
pkg-config,
zlib1g-dev
- Standards-Version: 3.9.4
+ Standards-Version: 3.9.6
Homepage: http://www.videolan.org/vlc/
Vcs-Git: git://anonscm.debian.org/pkg-multimedia/vlc.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/vlc.git
@@@ -111,9 -122,7 +122,7 @@@
Package: libvlc-dev
Section: libdevel
Architecture: any
- Pre-Depends: dpkg (>= 1.15.6~)
Depends: libvlc5 (= ${binary:Version}), pkg-config, ${misc:Depends}
- Replaces: libvlc0-dev
Description: development files for libvlc
This package contains headers and a static library required to build
standalone applications that use VLC features.
@@@ -125,9 -134,7 +134,7 @@@
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
This package contains the shared library required by applications using VLC
features.
@@@ -139,8 -146,7 +146,7 @@@
Package: libvlccore-dev
Section: libdevel
Architecture: any
- Pre-Depends: dpkg (>= 1.15.6~)
- Depends: libvlccore5 (= ${binary:Version}), pkg-config, ${misc:Depends}
+ Depends: libvlccore8 (= ${binary:Version}), pkg-config, ${misc:Depends}
Description: development files for libvlccore
This package contains headers and a static library required to build plugins
for VLC.
@@@ -149,11 -155,13 +155,13 @@@
DivX, MOV, WMV, QuickTime, WebM, FLAC, MP3, Ogg/Vorbis files, DVDs, VCDs,
podcasts, and multimedia streams from various network sources.
- Package: libvlccore5
+ Package: libvlccore8
Section: libs
Architecture: any
- Pre-Depends: dpkg (>= 1.15.6~)
- Depends: vlc-data (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
+ Depends: libproxy-tools,
+ 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.
.
@@@ -163,17 -171,20 +171,20 @@@
Package: vlc
Architecture: any
- Pre-Depends: dpkg (>= 1.15.6~)
Depends: fonts-freefont-ttf,
vlc-nox (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Recommends: vlc-plugin-notify (= ${binary:Version}),
- vlc-plugin-pulse (= ${binary:Version}),
+ vlc-plugin-samba (= ${binary:Version}),
xdg-utils
Suggests: videolan-doc
- Breaks: vlc-data (<< 1.1.5), vlc-nox (<< 2.0.2)
- Replaces: vlc-data (<< 1.1.5), vlc-nox (<< 2.0.2)
+ Breaks: vlc-data (<< 1.1.5),
+ vlc-nox (<< 2.2.0~pre2-2~),
+ vlc-plugin-pulse (<< 2.2.0~pre2-2~)
+ Replaces: vlc-data (<< 1.1.5),
+ vlc-nox (<< 2.2.0~pre2-2~),
+ vlc-plugin-pulse (<< 2.2.0~pre2-2~)
Provides: mp3-decoder
Description: multimedia player and streamer
VLC is the VideoLAN project's media player. It plays MPEG, MPEG-2, MPEG-4,
@@@ -186,18 -197,16 +197,16 @@@
.
VLC has support for on-the-fly transcoding of audio and video formats, either
for broadcasting purposes or for movie format transformations. Support for
- most output methods is provided by this package, but features can be added
- by installing additional audio plugins (vlc-plugin-pulse, vlc-plugin-sdl)
- or video plugins (vlc-plugin-sdl).
+ most output methods is provided by this package, but features can be added by
+ installing additional plugins (vlc-plugin-fluidsynth, vlc-plugin-jack,
+ vlc-plugin-notify, vlc-plugin-samba, vlc-plugin-sdl, vlc-plugin-svg,
+ vlc-plugin-zvbi).
Package: vlc-data
- Pre-Depends: dpkg (>= 1.15.6~)
Depends: ${misc:Depends}
Architecture: all
Breaks: vlc-nox (<< 2.0.1-3)
- Replaces: mozilla-plugin-vlc (<< 0.9.2-1),
- vlc (<< 0.9.2-1),
- vlc-nox (<< 2.0.1-3)
+ Replaces: mozilla-plugin-vlc (<< 0.9.2-1), vlc-nox (<< 2.0.1-3)
Description: Common data for VLC
Localisations, HTTP interface files, Lua scripts for VLC media player
.
@@@ -209,7 -218,6 +218,6 @@@ 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,
@@@ -220,9 -228,10 +228,10 @@@
Package: vlc-nox
Architecture: any
- Pre-Depends: dpkg (>= 1.15.6~)
Depends: ${misc:Depends}, ${shlibs:Depends}
- Replaces: vlc (<< 1.1.0)
+ Suggests: libdvdcss2
+ Breaks: vlc (<< 2.1.0)
+ Replaces: vlc (<< 2.1.0)
Provides: mp3-decoder
Description: multimedia player and streamer (without X support)
VLC is the VideoLAN project's media player. It plays MPEG, MPEG-2, MPEG-4,
@@@ -244,7 -253,6 +253,6 @@@
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},
@@@ -259,7 -267,6 +267,6 @@@ Description: FluidSynth plugin for VL
Package: vlc-plugin-jack
Architecture: any
- Pre-Depends: dpkg (>= 1.15.6~)
Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
Description: Jack audio plugins for VLC
These plugins add support for JACK to the VLC media player. To
@@@ -273,7 -280,6 +280,6 @@@
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)
Replaces: vlc-nox (<< 1.1.2)
@@@ -285,22 -291,8 +291,8 @@@ Description: LibNotify plugin for VL
DivX, MOV, WMV, QuickTime, WebM, FLAC, MP3, Ogg/Vorbis files, DVDs, VCDs,
podcasts, and multimedia streams from various network sources.
- Package: vlc-plugin-pulse
- Architecture: any
- Pre-Depends: dpkg (>= 1.15.6~)
- Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
- 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
- select the `pulse' audio output plugin from the preferences menu.
- .
- VLC is the VideoLAN project's media player. It plays MPEG, MPEG-2, MPEG-4,
- DivX, MOV, WMV, QuickTime, WebM, FLAC, MP3, Ogg/Vorbis files, DVDs, VCDs,
- podcasts, and multimedia streams from various network sources.
-
Package: vlc-plugin-sdl
Architecture: any
- Pre-Depends: dpkg (>= 1.15.6~)
Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
Description: SDL video and audio output plugin for VLC
This plugin adds support for the Simple DirectMedia Layer library to
@@@ -314,7 -306,6 +306,6 @@@
Package: vlc-plugin-svg
Architecture: any
- Pre-Depends: dpkg (>= 1.15.6~)
Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
Description: SVG plugin for VLC
This plugin allows you to render SVG graphics on top of the video. It is a text
@@@ -328,7 -319,6 +319,6 @@@
Package: vlc-plugin-zvbi
Architecture: any
- Pre-Depends: dpkg (>= 1.15.6~)
Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
Description: VBI teletext plugin for VLC
This plugin adds support for VBI teletext to the VLC media player.
@@@ -336,3 -326,24 +326,24 @@@
VLC is the VideoLAN project's media player. It plays MPEG, MPEG-2, MPEG-4,
DivX, MOV, WMV, QuickTime, WebM, FLAC, MP3, Ogg/Vorbis files, DVDs, VCDs,
podcasts, and multimedia streams from various network sources.
+
+ Package: vlc-plugin-samba
+ Architecture: any
+ Breaks: vlc-nox (<< 2.2.0~pre2-2~)
+ Replaces: vlc-nox (<< 2.2.0~pre2-2~)
+ Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+ Description: Samba plugin for VLC
+ This plugin adds support to access Samba shares from the VLC media player.
+ .
+ VLC is the VideoLAN project's media player. It plays MPEG, MPEG-2, MPEG-4,
+ DivX, MOV, WMV, QuickTime, WebM, FLAC, MP3, Ogg/Vorbis files, DVDs, VCDs,
+ podcasts, and multimedia streams from various network sources.
+
+ Package: vlc-plugin-pulse
+ Architecture: all
+ Depends: vlc (>= ${source:Version}),
+ vlc-data (= ${source:Version}),
+ ${misc:Depends}
+ Description: transitional dummy package for vlc
+ This is a transitional dummy package for vlc. The PulseAudio plugin is now
+ included in vlc. This package can safely be removed.
--
VLC media player packaging
More information about the pkg-multimedia-commits
mailing list