r12847 - in /desktop/unstable/totem/debian: changelog control control.in

[joss at users.alioth.debian.org]

Author: joss
Date: Tue Sep 25 22:42:28 2007
New Revision: 12847

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12847
Log:
* libtotem-plparser7-dbg conflicts with libtotem-plparser1-dbg.

Modified:
    desktop/unstable/totem/debian/changelog
    desktop/unstable/totem/debian/control
    desktop/unstable/totem/debian/control.in

Modified: desktop/unstable/totem/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/changelog?rev=12847&op=diff
==============================================================================
--- desktop/unstable/totem/debian/changelog (original)
+++ desktop/unstable/totem/debian/changelog Tue Sep 25 22:42:28 2007
@@ -1,10 +1,14 @@
 totem (2.20.0-2) unstable; urgency=low
 
+  [ Sebastian Dröge ]
   * Upload to unstable.
   * debian/control.in:
     + Remove duplicated liblircclient-dev build dependency.
 
- -- Sebastian Dröge <slomo at debian.org>  Tue, 25 Sep 2007 23:38:40 +0200
+  [ Josselin Mouette ]
+  * libtotem-plparser7-dbg conflicts with libtotem-plparser1-dbg.
+
+ -- Josselin Mouette <joss at debian.org>  Wed, 26 Sep 2007 00:41:46 +0200
 
 totem (2.20.0-1) experimental; urgency=low
 

Modified: desktop/unstable/totem/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/control?rev=12847&op=diff
==============================================================================
--- desktop/unstable/totem/debian/control (original)
+++ desktop/unstable/totem/debian/control Tue Sep 25 22:42:28 2007
@@ -242,8 +242,8 @@
 Priority: extra
 Depends: libtotem-plparser7 (= ${binary:Version}),
          ${misc:Depends}
+Conflicts: libtotem-plparser1-dbg
 Description: Totem Playlist Parser library - debugging version
  A library to parse playlists.
  .
  This package contains unstripped shared libraries.
-

Modified: desktop/unstable/totem/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/control.in?rev=12847&op=diff
==============================================================================
--- desktop/unstable/totem/debian/control.in (original)
+++ desktop/unstable/totem/debian/control.in Tue Sep 25 22:42:28 2007
@@ -242,8 +242,8 @@
 Priority: extra
 Depends: libtotem-plparser7 (= ${binary:Version}),
          ${misc:Depends}
+Conflicts: libtotem-plparser1-dbg
 Description: Totem Playlist Parser library - debugging version
  A library to parse playlists.
  .
  This package contains unstripped shared libraries.
-