[SCM] vlc/master: wrap-and-sort
bdrung-guest at users.alioth.debian.org
bdrung-guest at users.alioth.debian.org
Wed Dec 29 21:20:16 UTC 2010
The following commit has been merged in the master branch:
commit 365082430409c615c562fe4d1a6f01f12b46feb1
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Wed Dec 29 22:20:03 2010 +0100
wrap-and-sort
Git-Dch: Ignore
diff --git a/debian/control b/debian/control
index 0ec93d3..a5a0ffb 100644
--- a/debian/control
+++ b/debian/control
@@ -118,8 +118,7 @@ Description: development files for libvlc
Package: libvlc5
Section: libs
Architecture: any
-Depends: ${misc:Depends},
- ${shlibs:Depends}
+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
@@ -132,9 +131,7 @@ Description: multimedia player and streamer library
Package: libvlccore-dev
Section: libdevel
Architecture: any
-Depends: libvlccore4 (= ${binary:Version}),
- pkg-config,
- ${misc:Depends}
+Depends: libvlccore4 (= ${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.
@@ -146,9 +143,7 @@ Description: development files for libvlccore
Package: libvlccore4
Section: libs
Architecture: any
-Depends: vlc-data (= ${source:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
+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.
.
@@ -158,10 +153,7 @@ Description: base library for VLC and its modules
Package: mozilla-plugin-vlc
Architecture: any
-Depends: vlc,
- vlc-nox (= ${binary:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
+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
@@ -213,8 +205,7 @@ Depends: ttf-freefont,
Recommends: vlc-plugin-notify (= ${binary:Version}),
vlc-plugin-pulse (= ${binary:Version}),
xdg-utils
-Suggests: mozilla-plugin-vlc,
- videolan-doc
+Suggests: mozilla-plugin-vlc, videolan-doc
Breaks: vlc-nox (<< 1.1.5-1)
Replaces: vlc-nox (<< 1.1.5-1)
Provides: mp3-decoder
@@ -251,8 +242,7 @@ Package: vlc-dbg
Section: debug
Priority: extra
Architecture: any
-Depends: vlc-nox (= ${binary:Version}),
- ${misc:Depends}
+Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}
Description: debugging symbols for vlc
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
@@ -262,8 +252,7 @@ Description: debugging symbols for vlc
Package: vlc-nox
Architecture: any
-Depends: ${misc:Depends},
- ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Replaces: vlc (<< 1.1.0)
Provides: mp3-decoder
Description: multimedia player and streamer (without X support)
@@ -288,9 +277,7 @@ Description: multimedia player and streamer (without X support)
Package: vlc-plugin-fluidsynth
Architecture: any
-Depends: vlc-nox (= ${binary:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
+Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
Description: FluidSynth plugin for VLC
This plugin adds support for playing MIDI file via the FluidSynth software
synthesizer to the VLC media player.
@@ -301,9 +288,7 @@ Description: FluidSynth plugin for VLC
Package: vlc-plugin-ggi
Architecture: any
-Depends: vlc-nox,
- ${misc:Depends},
- ${shlibs:Depends}
+Depends: vlc-nox, ${misc:Depends}, ${shlibs:Depends}
Description: GGI video output plugin for VLC
This is a GGI plugin for the VLC media player. To activate it, use
the `--vout ggi' flag or select the `ggi' video output plugin from the
@@ -315,9 +300,7 @@ Description: GGI video output plugin for VLC
Package: vlc-plugin-jack
Architecture: any
-Depends: vlc-nox (= ${binary:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
+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
activate the audio output module, use the `--aout jack' flag or
@@ -330,9 +313,7 @@ Description: Jack audio plugins for VLC
Package: vlc-plugin-notify
Architecture: any
-Depends: vlc-nox (= ${binary:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
+Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
Breaks: vlc-nox (<< 1.1.2)
Replaces: vlc-nox (<< 1.1.2)
Description: LibNotify plugin for VLC
@@ -345,9 +326,7 @@ Description: LibNotify plugin for VLC
Package: vlc-plugin-pulse
Architecture: any
-Depends: vlc-nox (= ${binary:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
+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
@@ -359,9 +338,7 @@ Description: PulseAudio plugin for VLC
Package: vlc-plugin-sdl
Architecture: any
-Depends: vlc-nox,
- ${misc:Depends},
- ${shlibs:Depends}
+Depends: vlc-nox, ${misc:Depends}, ${shlibs:Depends}
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
@@ -374,9 +351,7 @@ Description: SDL video and audio output plugin for VLC
Package: vlc-plugin-svg
Architecture: any
-Depends: vlc-nox (= ${binary:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
+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
renderer, and must be activated through the '--text-renderer svg' option. When
@@ -389,9 +364,7 @@ Description: SVG plugin for VLC
Package: vlc-plugin-svgalib
Architecture: amd64 i386
-Depends: vlc-nox (= ${binary:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
+Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
Description: SVGAlib video output plugin for VLC
This plugin adds support for SVGAlib to the VLC media player. To
activate it, use the `--vout svgalib' flag or select the `svgalib' video
@@ -404,9 +377,7 @@ Description: SVGAlib video output plugin for VLC
Package: vlc-plugin-zvbi
Architecture: any
-Depends: vlc-nox (= ${binary:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
+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.
.
--
VLC media player packaging
More information about the pkg-multimedia-commits
mailing list