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

[slomo at users.alioth.debian.org]

Author: slomo
Date: Tue Sep 29 15:32:11 2009
New Revision: 21680

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21680
Log:
  debian/totem-common.install,
  debian/control.in:

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=21680&op=diff
==============================================================================
--- desktop/unstable/totem/debian/changelog [utf-8] (original)
+++ desktop/unstable/totem/debian/changelog [utf-8] Tue Sep 29 15:32:11 2009
@@ -5,7 +5,8 @@
       useless circular dependency (Closes: #548891). There's no reason
       why totem should depend on totem-plugins and the other way around.
   * debian/totem.install,
-    debian/totem-common.install:
+    debian/totem-common.install,
+    debian/control.in:
     + Move the desktop file into the same package as the binaries.
   * New upstream bugfix release:
     + debian/patches/90_autotools.patch:

Modified: desktop/unstable/totem/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/control?rev=21680&op=diff
==============================================================================
--- desktop/unstable/totem/debian/control [utf-8] (original)
+++ desktop/unstable/totem/debian/control [utf-8] Tue Sep 29 15:32:11 2009
@@ -75,7 +75,8 @@
            totem-gstreamer (<< 2.27.1),
            totem-xine (<< 2.27.1)
 Replaces: totem-xine (<< 2.27.1),
-          totem-gstreamer (<< 2.27.1)
+          totem-gstreamer (<< 2.27.1),
+          totem-common (<< 2.28.1-1)
 Provides: totem-xine,
           totem-gstreamer
 Recommends: totem-mozilla (>= ${source:Version}),

Modified: desktop/unstable/totem/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/control.in?rev=21680&op=diff
==============================================================================
--- desktop/unstable/totem/debian/control.in [utf-8] (original)
+++ desktop/unstable/totem/debian/control.in [utf-8] Tue Sep 29 15:32:11 2009
@@ -75,7 +75,8 @@
            totem-gstreamer (<< 2.27.1),
            totem-xine (<< 2.27.1)
 Replaces: totem-xine (<< 2.27.1),
-          totem-gstreamer (<< 2.27.1)
+          totem-gstreamer (<< 2.27.1),
+          totem-common (<< 2.28.1-1)
 Provides: totem-xine,
           totem-gstreamer
 Recommends: totem-mozilla (>= ${source:Version}),