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

[lool at users.alioth.debian.org]

Author: lool
Date: Mon Nov 26 16:04:04 2007
New Revision: 13595

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13595
Log:
* Let totem-common replace totem-xine and -gstreamer.

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=13595&op=diff
==============================================================================
--- desktop/unstable/totem/debian/changelog (original)
+++ desktop/unstable/totem/debian/changelog Mon Nov 26 16:04:04 2007
@@ -1,3 +1,9 @@
+totem (2.20.1-1ubuntu1) UNRELEASED; urgency=low
+
+  * Let totem-common replace totem-xine and -gstreamer.
+
+ -- Loic Minier <lool at dooz.org>  Mon, 26 Nov 2007 17:00:37 +0100
+
 totem (2.20.1-1) unstable; urgency=low
 
   [ Loic Minier ]

Modified: desktop/unstable/totem/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/control?rev=13595&op=diff
==============================================================================
--- desktop/unstable/totem/debian/control (original)
+++ desktop/unstable/totem/debian/control Mon Nov 26 16:04:04 2007
@@ -193,7 +193,7 @@
 Package: totem-common
 Architecture: all
 Depends: ${misc:Depends}
-Conflicts: totem-xine (<< 2.20.0-3), totem-gstreamer (<< 2.20.0-3)
+Replaces: totem-xine (<< 2.20.0-3), totem-gstreamer (<< 2.20.0-3)
 Description: Data files for the Totem media player
  Totem is a simple yet featureful media player for GNOME which can read
  a large number of file formats.

Modified: desktop/unstable/totem/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/control.in?rev=13595&op=diff
==============================================================================
--- desktop/unstable/totem/debian/control.in (original)
+++ desktop/unstable/totem/debian/control.in Mon Nov 26 16:04:04 2007
@@ -193,7 +193,7 @@
 Package: totem-common
 Architecture: all
 Depends: ${misc:Depends}
-Conflicts: totem-xine (<< 2.20.0-3), totem-gstreamer (<< 2.20.0-3)
+Replaces: totem-xine (<< 2.20.0-3), totem-gstreamer (<< 2.20.0-3)
 Description: Data files for the Totem media player
  Totem is a simple yet featureful media player for GNOME which can read
  a large number of file formats.