r20039 - in /desktop/experimental/totem/debian: control control.in

[slomo at users.alioth.debian.org]

Author: slomo
Date: Mon May 18 20:57:59 2009
New Revision: 20039

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20039
Log:
fix conflicts/replaces

Modified:
    desktop/experimental/totem/debian/control
    desktop/experimental/totem/debian/control.in

Modified: desktop/experimental/totem/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/control?rev=20039&op=diff
==============================================================================
--- desktop/experimental/totem/debian/control (original)
+++ desktop/experimental/totem/debian/control Mon May 18 20:57:59 2009
@@ -80,10 +80,11 @@
            gnome-control-center (<< 2.15.90),
            totem-mozilla (<< 2.20.0-3),
            totem-gstreamer,
-Replaces: totem-xine
-          totem-gstreamer,
-Provides: totem-xine
-          totem-gstreamer,
+           totem-xine
+Replaces: totem-xine,
+          totem-gstreamer
+Provides: totem-xine,
+          totem-gstreamer
 Recommends: totem-mozilla (= ${source:Version}),
             totem-plugins,
             gstreamer0.10-plugins-ugly,

Modified: desktop/experimental/totem/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/control.in?rev=20039&op=diff
==============================================================================
--- desktop/experimental/totem/debian/control.in (original)
+++ desktop/experimental/totem/debian/control.in Mon May 18 20:57:59 2009
@@ -80,10 +80,11 @@
            gnome-control-center (<< 2.15.90),
            totem-mozilla (<< 2.20.0-3),
            totem-gstreamer,
-Replaces: totem-xine
-          totem-gstreamer,
-Provides: totem-xine
-          totem-gstreamer,
+           totem-xine
+Replaces: totem-xine,
+          totem-gstreamer
+Provides: totem-xine,
+          totem-gstreamer
 Recommends: totem-mozilla (= ${source:Version}),
             totem-plugins,
             gstreamer0.10-plugins-ugly,