[SCM] vlc/master: Run wrap-and-sort
bdrung at users.alioth.debian.org
bdrung at users.alioth.debian.org
Tue Aug 19 22:49:39 UTC 2014
The following commit has been merged in the master branch:
commit 5a074e9b55fb157f77c0b925146d642226f66392
Author: Benjamin Drung <bdrung at debian.org>
Date: Wed Aug 20 00:49:35 2014 +0200
Run wrap-and-sort
diff --git a/debian/control b/debian/control
index f0c2a1b..7978a70 100644
--- a/debian/control
+++ b/debian/control
@@ -30,8 +30,8 @@ Build-Depends: autopoint,
libcdio-dev (>= 0.78.2),
libchromaprint-dev (>= 0.6.0),
libcrystalhd-dev [amd64 i386],
- libdc1394-22-dev (>= 2.1.0) [linux-any],
libdbus-1-dev,
+ libdc1394-22-dev (>= 2.1.0) [linux-any],
libdca-dev,
libdirac-dev,
libdirectfb-dev,
@@ -205,8 +205,7 @@ Package: vlc-data
Depends: ${misc:Depends}
Architecture: all
Breaks: vlc-nox (<< 2.0.1-3)
-Replaces: mozilla-plugin-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
.
@@ -331,9 +330,7 @@ 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}
+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.
.
@@ -343,8 +340,8 @@ Description: Samba plugin for VLC
Package: vlc-plugin-pulse
Architecture: all
-Depends: vlc-data (= ${source:Version}),
- vlc (>= ${source:Version}),
+Depends: vlc (>= ${source:Version}),
+ vlc-data (= ${source:Version}),
${misc:Depends}
Description: transitional dummy package for vlc
This is a transitional dummy package for vlc. It can safely be removed.
--
VLC media player packaging
More information about the pkg-multimedia-commits
mailing list