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

[joss at users.alioth.debian.org]

Author: joss
Date: Tue Oct 30 09:37:25 2007
New Revision: 13309

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13309
Log:
* Conflict against totem-mozilla (<< 2.20.0-3). Closes: #448554.

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=13309&op=diff
==============================================================================
--- desktop/unstable/totem/debian/changelog (original)
+++ desktop/unstable/totem/debian/changelog Tue Oct 30 09:37:25 2007
@@ -1,3 +1,9 @@
+totem (2.20.1-2) UNRELEASED; urgency=low
+
+  * Conflict against totem-mozilla (<< 2.20.0-3). Closes: #448554.
+
+ -- Josselin Mouette <joss at debian.org>  Tue, 30 Oct 2007 10:37:41 +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=13309&op=diff
==============================================================================
--- desktop/unstable/totem/debian/control (original)
+++ desktop/unstable/totem/debian/control Tue Oct 30 09:37:25 2007
@@ -77,7 +77,8 @@
 Recommends: totem-mozilla (= ${source:Version}),
             totem-plugins,
             libxine1-ffmpeg
-Conflicts: totem (<< 0.99.12-2)
+Conflicts: totem (<< 0.99.12-2),
+           totem-mozilla (<< 2.20.0-3)
 Description: A simple media player for the Gnome desktop based on xine
  Totem is a simple yet featureful media player for GNOME which can read
  a large number of file formats. It features :
@@ -118,7 +119,8 @@
          totem-common (>= ${gnome:Version}),
          totem-common (<< ${gnome:NextVersion})
 Conflicts: totem (<< 0.99.12-2),
-           gnome-control-center (<< 2.15.90)
+           gnome-control-center (<< 2.15.90),
+           totem-mozilla (<< 2.20.0-3)
 Recommends: totem-mozilla (= ${source:Version}),
             totem-plugins,
             gstreamer0.10-plugins-ugly,

Modified: desktop/unstable/totem/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/control.in?rev=13309&op=diff
==============================================================================
--- desktop/unstable/totem/debian/control.in (original)
+++ desktop/unstable/totem/debian/control.in Tue Oct 30 09:37:25 2007
@@ -77,7 +77,8 @@
 Recommends: totem-mozilla (= ${source:Version}),
             totem-plugins,
             libxine1-ffmpeg
-Conflicts: totem (<< 0.99.12-2)
+Conflicts: totem (<< 0.99.12-2),
+           totem-mozilla (<< 2.20.0-3)
 Description: A simple media player for the Gnome desktop based on xine
  Totem is a simple yet featureful media player for GNOME which can read
  a large number of file formats. It features :
@@ -118,7 +119,8 @@
          totem-common (>= ${gnome:Version}),
          totem-common (<< ${gnome:NextVersion})
 Conflicts: totem (<< 0.99.12-2),
-           gnome-control-center (<< 2.15.90)
+           gnome-control-center (<< 2.15.90),
+           totem-mozilla (<< 2.20.0-3)
 Recommends: totem-mozilla (= ${source:Version}),
             totem-plugins,
             gstreamer0.10-plugins-ugly,