[SCM] vlc/master: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-multimedia/vlc
sramacher at users.alioth.debian.org
sramacher at users.alioth.debian.org
Sat Oct 15 16:50:39 UTC 2016
Add Breaks for vlc-plugin-rdp
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: f68a463eb08585b4ab2195705003221f04627695
X-Git-Newrev: 37db4030f9fd1747c7677eb309176b074e34c59f
The following commit has been merged in the master branch:
commit 1d278c932637ea569695eae80708f55a94e96ee5
Merge: 512b44fe9494a46b7312e8f161bc3b64075b4817 f68a463eb08585b4ab2195705003221f04627695
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Sat Oct 15 18:04:16 2016 +0200
Merge branch 'master' of git+ssh://git.debian.org/git/pkg-multimedia/vlc
diff --combined debian/control
index b74a3db,8762993..8804c3f
--- a/debian/control
+++ b/debian/control
@@@ -142,7 -142,8 +142,7 @@@ Vcs-Browser: https://anonscm.debian.org
Package: vlc
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
-Depends: fonts-freefont-ttf,
- vlc-plugin-base (= ${binary:Version}),
+Depends: vlc-plugin-base (= ${binary:Version}),
vlc-plugin-qt (= ${binary:Version}),
vlc-l10n (= ${source:Version}),
${misc:Depends},
@@@ -176,7 -177,6 +176,7 @@@ Description: multimedia player and stre
Package: libvlc-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: libvlc5 (= ${binary:Version}), pkg-config, ${misc:Depends}
Description: development files for libvlc
@@@ -190,7 -190,6 +190,7 @@@
Package: libvlc5
Section: libs
Architecture: any
+Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Recommends: libvlc-bin (= ${binary:Version})
@@@ -205,7 -204,6 +205,7 @@@ Description: multimedia player and stre
Package: libvlccore-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: libvlccore8 (= ${binary:Version}), pkg-config, ${misc:Depends}
Description: development files for libvlccore
@@@ -218,12 -216,11 +218,12 @@@
Package: libvlccore8
Section: libs
+Multi-Arch: same
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
-Depends: libproxy-tools,
${misc:Depends},
${shlibs:Depends}
+Recommends: libproxy-tools
Description: base library for VLC and its modules
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,
@@@ -233,7 -230,6 +233,7 @@@
Package: libvlc-bin
Architecture: any
+Multi-Arch: same
Depends: ${misc:Depends},
${shlibs:Depends}
Breaks: vlc-nox (<< 2.2.4-7~)
@@@ -287,7 -283,6 +287,7 @@@ Description: Translations for VL
Package: vlc-plugin-base
Architecture: any
+Multi-Arch: same
Depends: ${misc:Depends},
${shlibs:Depends},
vlc-data (= ${source:Version})
@@@ -302,12 -297,11 +302,12 @@@ Description: multimedia player and stre
Package: vlc-plugin-access-extra
Architecture: any
+Multi-Arch: same
Depends: ${misc:Depends},
${shlibs:Depends}
Enhances: vlc
- Breaks: vlc (<< 2.2.4-7~)
- Replaces: vlc (<< 2.2.4-7~)
+ Breaks: vlc (<< 2.2.4-7~), vlc-plugin-rdp (<< 2.2.4-6+rpi1~)
+ Replaces: vlc (<< 2.2.4-7~), vlc-plugin-rdp (<< 2.2.4-6+rpi1~)
Description: multimedia player and streamer (extra access plugins)
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,
@@@ -317,7 -311,6 +317,7 @@@
Package: vlc-plugin-video-splitter
Architecture: any
+Multi-Arch: same
Depends: ${misc:Depends},
${shlibs:Depends}
Enhances: vlc
@@@ -332,7 -325,6 +332,7 @@@ Description: multimedia player and stre
Package: vlc-plugin-visualization
Architecture: any
+Multi-Arch: same
Depends: ${misc:Depends},
${shlibs:Depends}
Enhances: vlc
@@@ -347,7 -339,6 +347,7 @@@ Description: multimedia player and stre
Package: vlc-plugin-skins2
Architecture: any
+Multi-Arch: same
Depends: ${misc:Depends},
${shlibs:Depends},
fonts-freefont-ttf
@@@ -365,9 -356,9 +365,9 @@@ Description: multimedia player and stre
Package: vlc-plugin-qt
Architecture: any
+Multi-Arch: same
Depends: ${misc:Depends},
${shlibs:Depends},
-Enhances: vlc
Breaks: vlc (<< 2.2.4-7~)
Replaces: vlc (<< 2.2.4-7~)
Description: multimedia player and streamer (Qt plugin)
@@@ -379,7 -370,6 +379,7 @@@
Package: vlc-plugin-fluidsynth
Architecture: any
+Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: fluid-soundfont-gm | musescore-soundfont-gm,
${misc:Depends},
@@@ -395,7 -385,6 +395,7 @@@ Description: FluidSynth plugin for VL
Package: vlc-plugin-jack
Architecture: any
+Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Enhances: vlc
@@@ -411,7 -400,6 +411,7 @@@ Description: Jack audio plugins for VL
Package: vlc-plugin-notify
Architecture: any
+Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Enhances: vlc
@@@ -425,7 -413,6 +425,7 @@@ Description: LibNotify plugin for VL
Package: vlc-plugin-sdl
Architecture: any
+Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Enhances: vlc
@@@ -441,7 -428,6 +441,7 @@@ Description: SDL video and audio outpu
Package: vlc-plugin-svg
Architecture: any
+Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Enhances: vlc
@@@ -457,7 -443,6 +457,7 @@@ Description: SVG plugin for VL
Package: vlc-plugin-zvbi
Architecture: any
+Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Enhances: vlc
@@@ -470,7 -455,6 +470,7 @@@ Description: VBI teletext plugin for VL
Package: vlc-plugin-samba
Architecture: linux-any kfreebsd-any
+Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Breaks: vlc-nox (<< 2.2.0~pre2-2~)
--
VLC media player packaging
More information about the pkg-multimedia-commits
mailing list