r1472 - in /experimental/vlc/debian: changelog control

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

Author: xtophe-guest
Date: Tue Sep 16 21:24:14 2008
New Revision: 1472

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1472
Log:

ome files have moved from mozilla-plugin-vlc to vlc-data  by adn

M    debian/control
M    debian/changelog

Modified:
    experimental/vlc/debian/changelog
    experimental/vlc/debian/control

Modified: experimental/vlc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/changelog?rev=1472&op=diff
==============================================================================
--- experimental/vlc/debian/changelog (original)
+++ experimental/vlc/debian/changelog Tue Sep 16 21:24:14 2008
@@ -1,5 +1,6 @@
 vlc (0.9.2-1~videolan1) experimental; urgency=low
 
+  [ Christophe Mutricy ]
   * New upstream release
     + Soname changed
     + Bugs fixed upstream: Closes: #487646,  #298150, #325069, #392292, 
@@ -39,7 +40,12 @@
   * Add a vlc-data package for /usr/share  (13 MB)
   * Add a vlc-dbg package (Closes: #491564)
 
- -- Christophe Mutricy <xtophe at videolan.org>  Sun, 14 Sep 2008 17:58:19 +0200
+  [ Mohammed Adnène Trojette ]
+  * Add myself to Uploaders.
+  * debian/control:
+    + Add proper conflicts/replaces to vlc-data with mozilla-plugin-vlc
+
+ -- Mohammed Adnène Trojette <adn+deb at diwi.org>  Tue, 16 Sep 2008 23:12:55 +0200
 
 vlc (0.8.6.i-2) experimental; urgency=high
 

Modified: experimental/vlc/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/control?rev=1472&op=diff
==============================================================================
--- experimental/vlc/debian/control (original)
+++ experimental/vlc/debian/control Tue Sep 16 21:24:14 2008
@@ -5,7 +5,8 @@
 Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>,
            Clément Stenac <zorglub at debian.org>,
            Loic Minier <lool at dooz.org>,
-           Christophe Mutricy <xtophe at videolan.org>
+           Christophe Mutricy <xtophe at videolan.org>,
+           Mohammed Adnène Trojette <adn+deb at diwi.org>
 Build-Depends: debhelper (>= 6),
                dh-buildinfo,
                quilt,
@@ -327,8 +328,8 @@
 
 Package: vlc-data
 Architecture: all
-Conflicts: vlc-nox (<< 0.9.2-1)
-Replaces: vlc-nox (<< 0.9.2-1)
+Conflicts: vlc-nox (<< 0.9.2-1), mozilla-plugin-vlc (<< 0.9.2-1)
+Replaces: vlc-nox (<< 0.9.2-1), mozilla-plugin-vlc (<< 0.9.2-1)
 Description: Common data for VLC
  Localisations, HTTP interface files, Lua scripts for VLC media player 
  .