diff -u totem-2.26.1/debian/control totem-2.26.1/debian/control --- totem-2.26.1/debian/control +++ totem-2.26.1/debian/control @@ -214,7 +214,7 @@ python-gconf, python-gtk2 (>= 2.13.0), python-gst0.10 (>= 0.10.12) -Replaces: totem-xine (<< 2.20.0-3), totem-gstreamer (<< 2.20.0-3) +Replaces: totem-xine (<< 2.20.0-3), totem-gstreamer (<< 2.20.0-3), totem-plugins (<< 2.26.1-0ubuntu3) Suggests: gromit Description: Plugins for the Totem media player Totem is a simple yet featureful media player for GNOME which can read @@ -242,10 +242,11 @@ Package: totem-plugins-extra Architecture: any Depends: totem-gstreamer (= ${binary:Version}) | totem-xine (= ${binary:Version}), + python-coherence, ${misc:Depends}, ${shlibs:Depends} Recommends: gromit -Replaces: totem-xine (<< 2.20.0-3), totem-gstreamer (<< 2.20.0-3), totem-plugins (<< 2.22.0-0ubuntu3) +Replaces: totem-xine (<< 2.20.0-3), totem-gstreamer (<< 2.20.0-3), totem-plugins (<< 2.22.0-0ubuntu3), totem-plugins-extra (<< 2.26.1-0ubuntu3) Description: Extra plugins for the Totem media player Totem is a simple yet featureful media player for GNOME which can read a large number of file formats. @@ -254,4 +255,5 @@ . * Annotate the screen with the Gromit tool + * Have a DLNA/UPnP client for Totem powered by Coherence . Additional plugins can be written in C, Python or Vala. diff -u totem-2.26.1/debian/rules totem-2.26.1/debian/rules --- totem-2.26.1/debian/rules +++ totem-2.26.1/debian/rules @@ -115,6 +115,7 @@ find debian/$(PLUGPKG) -name '*.py[co]' -delete mkdir -p debian/$(PLUGEXTRAPKG)/usr/lib/totem/plugins mv debian/$(PLUGPKG)/usr/lib/totem/plugins/gromit debian/$(PLUGEXTRAPKG)/usr/lib/totem/plugins + mv debian/$(PLUGPKG)/usr/lib/totem/plugins/coherence_upnp debian/$(PLUGEXTRAPKG)/usr/lib/totem/plugins find debian/$(PLUGEXTRAPKG) -name '*.py[co]' -delete cd debian/totem-xine && rm -rf etc usr/share usr/lib/totem/plugins # Make both totems installable together diff -u totem-2.26.1/debian/changelog totem-2.26.1/debian/changelog --- totem-2.26.1/debian/changelog +++ totem-2.26.1/debian/changelog @@ -1,3 +1,15 @@ +totem (2.26.1-0ubuntu3) jaunty; urgency=low + + * debian/control + - add Depends in totem-plugins-extra for python-coherence to make + the coherence-plugin work (LP: #338963) + - add Replaces for totem-plugins and totem-plugins-extra since the + coherence-plugin is moved to -extra + * debian/rules + - move the coherence-plugin from -plugins to -plugins-extra + + -- Andreas Moog Thu, 09 Apr 2009 01:00:09 +0200 + totem (2.26.1-0ubuntu2) jaunty; urgency=low * debian/patches/67_inverted_allow_screensaver_on_audio.patch: diff -u totem-2.26.1/debian/control.in totem-2.26.1/debian/control.in --- totem-2.26.1/debian/control.in +++ totem-2.26.1/debian/control.in @@ -214,7 +214,7 @@ python-gconf, python-gtk2 (>= 2.13.0), python-gst0.10 (>= 0.10.12) -Replaces: totem-xine (<< 2.20.0-3), totem-gstreamer (<< 2.20.0-3) +Replaces: totem-xine (<< 2.20.0-3), totem-gstreamer (<< 2.20.0-3), totem-plugins (<< 2.26.1-0ubuntu3) Suggests: gromit Description: Plugins for the Totem media player Totem is a simple yet featureful media player for GNOME which can read @@ -242,10 +242,11 @@ Package: totem-plugins-extra Architecture: any Depends: totem-gstreamer (= ${binary:Version}) | totem-xine (= ${binary:Version}), + python-coherence, ${misc:Depends}, ${shlibs:Depends} Recommends: gromit -Replaces: totem-xine (<< 2.20.0-3), totem-gstreamer (<< 2.20.0-3), totem-plugins (<< 2.22.0-0ubuntu3) +Replaces: totem-xine (<< 2.20.0-3), totem-gstreamer (<< 2.20.0-3), totem-plugins (<< 2.22.0-0ubuntu3), totem-plugins-extra (<< 2.26.1-0ubuntu3) Description: Extra plugins for the Totem media player Totem is a simple yet featureful media player for GNOME which can read a large number of file formats. @@ -254,4 +255,5 @@ . * Annotate the screen with the Gromit tool + * Have a DLNA/UPnP client for Totem powered by Coherence . Additional plugins can be written in C, Python or Vala.