[SCM] vlc/master: wrap-and-sort --sort-binary-packages

bdrung-guest at users.alioth.debian.org bdrung-guest at users.alioth.debian.org
Sat Nov 27 12:19:01 UTC 2010


The following commit has been merged in the master branch:
commit 40ccfdfd6000c21abba6468dd48100154fb37d00
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Sat Nov 27 13:18:12 2010 +0100

    wrap-and-sort --sort-binary-packages
    
    Git-Dch: Ignore

diff --git a/debian/control b/debian/control
index b7be138..530c70e 100644
--- a/debian/control
+++ b/debian/control
@@ -100,20 +100,6 @@ Homepage: http://www.videolan.org/vlc/
 Vcs-Git: git://git.debian.org/git/pkg-multimedia/vlc.git
 Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/vlc.git;a=summary
 
-Package: libvlc5
-Section: libs
-Architecture: any
-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.
- .
- 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
- streams from various network sources.
-
 Package: libvlc-dev
 Section: libdevel
 Architecture: any
@@ -130,14 +116,15 @@ Description: development files for libvlc
  DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
  streams from various network sources.
 
-Package: libvlccore4
+Package: libvlc5
 Section: libs
 Architecture: any
-Depends: vlc-data (= ${source:Version}),
-         ${misc:Depends},
+Depends: ${misc:Depends},
          ${shlibs:Depends}
-Description: base library for VLC and its modules
- This package contains the shared library required by VLC modules and libvlc.
+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.
  .
  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
@@ -157,6 +144,19 @@ Description: development files for libvlccore
  DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
  streams from various network sources.
 
+Package: libvlccore4
+Section: libs
+Architecture: any
+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.
+ .
+ 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
+ streams from various network sources.
+
 Package: mozilla-plugin-vlc
 Architecture: any
 Depends: vlc,

-- 
VLC media player packaging



More information about the pkg-multimedia-commits mailing list