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

[siretart at users.alioth.debian.org]

Author: siretart
Date: Fri Sep 26 06:36:37 2008
New Revision: 1507

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1507
Log:
remove spurious conflicts on libvlc2. LP: #274614

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=1507&op=diff
==============================================================================
--- experimental/vlc/debian/changelog (original)
+++ experimental/vlc/debian/changelog Fri Sep 26 06:36:37 2008
@@ -1,5 +1,6 @@
 vlc (0.9.3-1) UNRELEASED; urgency=low
 
+  [ Christophe Mutricy ]
   * New upstream release
   * Build-depends on libdca-dev
   * vlc-nox.install
@@ -7,7 +8,10 @@
       Fix a FTBFS on non-intel arch (Closes: #499860). 
   * Sort builddep list 
 
- -- Christophe Mutricy <xtophe at videolan.org>  Fri, 26 Sep 2008 01:04:51 +0200
+  [ Reinhard Tartler ]
+  * remove spurious conflicts on libvlc2. LP: #274614
+
+ -- Reinhard Tartler <siretart at tauware.de>  Fri, 26 Sep 2008 08:36:24 +0200
 
 vlc (0.9.2-1) experimental; urgency=low
 

Modified: experimental/vlc/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/control?rev=1507&op=diff
==============================================================================
--- experimental/vlc/debian/control (original)
+++ experimental/vlc/debian/control Fri Sep 26 06:36:37 2008
@@ -185,8 +185,8 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Replaces: vlc (<< 0.8.6.c-6), libvlc0, libvlc1
-Conflicts: vlc (<< 0.8.6.c-6), libvlc0, libvlc1
+Replaces: vlc (<< 0.8.6.c-6)
+Conflicts: vlc (<< 0.8.6.c-6)
 Description: multimedia player and streamer library
  This package contains the shared library required by applications using VLC
  features.