r22281 - in /desktop/unstable/totem/debian: control control.in

[joss at users.alioth.debian.org]

Author: joss
Date: Wed Nov 11 16:11:59 2009
New Revision: 22281

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22281
Log:
Add missing conflict.

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

Modified: desktop/unstable/totem/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/control?rev=22281&op=diff
==============================================================================
--- desktop/unstable/totem/debian/control [utf-8] (original)
+++ desktop/unstable/totem/debian/control [utf-8] Wed Nov 11 16:11:59 2009
@@ -81,12 +81,12 @@
           totem-gstreamer
 Recommends: totem-mozilla (>= ${source:Version}),
             totem-plugins (>= ${source:Version}),
-            totem-coherence (>= ${source:Version}),
             gstreamer0.10-plugins-ugly,
             gstreamer0.10-plugins-bad,
             gstreamer0.10-ffmpeg
 Suggests: gnome-codec-install,
-          gstreamer0.10-pulseaudio (>= 0.10.16-5)
+          gstreamer0.10-pulseaudio (>= 0.10.16-5),
+          totem-coherence
 Description: A simple media player for the GNOME desktop based on GStreamer
  Totem is a simple yet featureful media player for GNOME which can read
  a large number of file formats. It features :
@@ -164,7 +164,8 @@
          python-httplib2,
          python-feedparser,
          python-beautifulsoup
-Recommends: gnome-settings-daemon
+Recommends: gnome-settings-daemon,
+            totem-coherence
 Replaces: totem-xine (<< 2.20.0-3), totem-gstreamer (<< 2.20.0-3)
 Suggests: gromit
 Description: Plugins for the Totem media player
@@ -197,6 +198,7 @@
          totem-common (<< ${gnome:NextVersion}),
          python-gtk2 (>= 2.13),
          python-coherence
+Conflicts: totem-plugins (<< 2.28.2-4)
 Description: Coherence UPnP/DLNA plugin for totem
  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=22281&op=diff
==============================================================================
--- desktop/unstable/totem/debian/control.in [utf-8] (original)
+++ desktop/unstable/totem/debian/control.in [utf-8] Wed Nov 11 16:11:59 2009
@@ -81,12 +81,12 @@
           totem-gstreamer
 Recommends: totem-mozilla (>= ${source:Version}),
             totem-plugins (>= ${source:Version}),
-            totem-coherence (>= ${source:Version}),
             gstreamer0.10-plugins-ugly,
             gstreamer0.10-plugins-bad,
             gstreamer0.10-ffmpeg
 Suggests: gnome-codec-install,
-          gstreamer0.10-pulseaudio (>= 0.10.16-5)
+          gstreamer0.10-pulseaudio (>= 0.10.16-5),
+          totem-coherence
 Description: A simple media player for the GNOME desktop based on GStreamer
  Totem is a simple yet featureful media player for GNOME which can read
  a large number of file formats. It features :
@@ -164,7 +164,8 @@
          python-httplib2,
          python-feedparser,
          python-beautifulsoup
-Recommends: gnome-settings-daemon
+Recommends: gnome-settings-daemon,
+            totem-coherence
 Replaces: totem-xine (<< 2.20.0-3), totem-gstreamer (<< 2.20.0-3)
 Suggests: gromit
 Description: Plugins for the Totem media player
@@ -197,6 +198,7 @@
          totem-common (<< ${gnome:NextVersion}),
          python-gtk2 (>= 2.13),
          python-coherence
+Conflicts: totem-plugins (<< 2.28.2-4)
 Description: Coherence UPnP/DLNA plugin for totem
  Totem is a simple yet featureful media player for GNOME which can read
  a large number of file formats.