r1469 - /experimental/vlc/debian/control

[xtophe-guest at users.alioth.debian.org]

Author: xtophe-guest
Date: Mon Sep 15 21:15:28 2008
New Revision: 1469

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1469
Log:
vlc-data is taking some files from vlc-nox. add conflicts and replace
Fix typo
Thanks to Fathi Boudra for testing

Modified:
    experimental/vlc/debian/control

Modified: experimental/vlc/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/control?rev=1469&op=diff
==============================================================================
--- experimental/vlc/debian/control (original)
+++ experimental/vlc/debian/control Mon Sep 15 21:15:28 2008
@@ -1,7 +1,7 @@
 Source: vlc
 Section: graphics
 Priority: optional
-Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at ists.alioth.debian.org>
+Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>,
            Clément Stenac <zorglub at debian.org>,
            Loic Minier <lool at dooz.org>,
@@ -327,6 +327,8 @@
 
 Package: vlc-data
 Architecture: all
+Conflicts: vlc-nox (<< 0.9.2-1)
+Replaces: vlc-nox (<< 0.9.2-1)
 Description: Common data for VLC
  Localisations, HTTP interface files, Lua scripts for VLC media player 
  .