r36464 - in /desktop/experimental/totem/debian: changelog control control.in

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Dec 12 18:43:18 2012
New Revision: 36464

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36464
Log:
Drop old Conflicts which are no longer necessary.

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

Modified: desktop/experimental/totem/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/changelog?rev=36464&op=diff
==============================================================================
--- desktop/experimental/totem/debian/changelog [utf-8] (original)
+++ desktop/experimental/totem/debian/changelog [utf-8] Wed Dec 12 18:43:18 2012
@@ -8,6 +8,7 @@
     implementations and is not ready for prime time yet. Closes: #673667
   * Drop explicit Build-Depends on gir packages, they are pulled in by the
     corresponding -dev package.
+  * Drop old Conflicts which are no longer necessary.
 
  -- Andreas Henriksson <andreas at fatal.se>  Thu, 06 Dec 2012 22:26:10 +0100
 

Modified: desktop/experimental/totem/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/control?rev=36464&op=diff
==============================================================================
--- desktop/experimental/totem/debian/control [utf-8] (original)
+++ desktop/experimental/totem/debian/control [utf-8] Wed Dec 12 18:43:18 2012
@@ -86,10 +86,6 @@
          gnome-icon-theme-symbolic,
          gsettings-desktop-schemas,
          totem-common (= ${source:Version})
-Conflicts: totem (<< 0.99.12-2),
-           gnome-control-center (<< 2.15.90),
-           totem-mozilla (<< 2.20.0-3),
-           totem-gstreamer (<< 2.27.1)
 Recommends: totem-plugins,
             gstreamer1.0-pulseaudio,
             gstreamer1.0-plugins-ugly,
@@ -149,7 +145,6 @@
 Priority: extra
 Depends: totem (= ${binary:Version}),
          ${misc:Depends}
-Conflicts: libtotem-plparser1-dbg, libtotem-plparser7-dbg
 Description: Debugging symbols 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/experimental/totem/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/control.in?rev=36464&op=diff
==============================================================================
--- desktop/experimental/totem/debian/control.in [utf-8] (original)
+++ desktop/experimental/totem/debian/control.in [utf-8] Wed Dec 12 18:43:18 2012
@@ -81,10 +81,6 @@
          gnome-icon-theme-symbolic,
          gsettings-desktop-schemas,
          totem-common (= ${source:Version})
-Conflicts: totem (<< 0.99.12-2),
-           gnome-control-center (<< 2.15.90),
-           totem-mozilla (<< 2.20.0-3),
-           totem-gstreamer (<< 2.27.1)
 Recommends: totem-plugins,
             gstreamer1.0-pulseaudio,
             gstreamer1.0-plugins-ugly,
@@ -144,7 +140,6 @@
 Priority: extra
 Depends: totem (= ${binary:Version}),
          ${misc:Depends}
-Conflicts: libtotem-plparser1-dbg, libtotem-plparser7-dbg
 Description: Debugging symbols for the Totem media player
  Totem is a simple yet featureful media player for GNOME which can read
  a large number of file formats.