r20258 - in /desktop/experimental/totem/debian: changelog control control.in patches/20_use_alternatives.patch totem.postinst totem.preinst

[slomo at users.alioth.debian.org]

Author: slomo
Date: Thu Jun  4 18:17:35 2009
New Revision: 20258

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20258
Log:
* debian/patches/20_use_alternatives.patch:
  + Dropped, there are no alternatives anymore.
* debian/totem.{pre,post}inst:
  + Remove alternatives in preinst, otherwise the totem binary will
    be removed (Closes: #531704). Thanks to Martin Pitt for the fix.

Added:
    desktop/experimental/totem/debian/totem.preinst
      - copied, changed from r20257, desktop/experimental/totem/debian/totem.postinst
Removed:
    desktop/experimental/totem/debian/patches/20_use_alternatives.patch
    desktop/experimental/totem/debian/totem.postinst
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=20258&op=diff
==============================================================================
--- desktop/experimental/totem/debian/changelog (original)
+++ desktop/experimental/totem/debian/changelog Thu Jun  4 18:17:35 2009
@@ -1,4 +1,4 @@
-totem (2.27.1-2) UNRELEASED; urgency=low
+totem (2.27.1-2) experimental; urgency=low
 
   [ Sebastian Dröge ]
   * Some minor changes from the Ubuntu package:
@@ -14,10 +14,13 @@
     Closes: #530663.
 
   [ Sebastian Dröge ]
-  * debian/control.in:
-    + Add build dependency on libgdata-dev to enable the youtube plugin again.
-
- -- Sebastian Dröge <slomo at debian.org>  Tue, 02 Jun 2009 11:03:01 +0200
+  * debian/patches/20_use_alternatives.patch:
+    + Dropped, there are no alternatives anymore.
+  * debian/totem.{pre,post}inst:
+    + Remove alternatives in preinst, otherwise the totem binary will
+      be removed (Closes: #531704). Thanks to Martin Pitt for the fix.
+
+ -- Sebastian Dröge <slomo at debian.org>  Thu, 04 Jun 2009 20:15:57 +0200
 
 totem (2.27.1-1) experimental; urgency=low
 

Modified: desktop/experimental/totem/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/control?rev=20258&op=diff
==============================================================================
--- desktop/experimental/totem/debian/control (original)
+++ desktop/experimental/totem/debian/control Thu Jun  4 18:17:35 2009
@@ -53,7 +53,6 @@
                python-xdg,
                python-rdflib,
                libbluetooth-dev [!kfreebsd-i386 !kfreebsd-amd64],
-               libgdata-dev,
                libgalago-dev (>= 0.5.2)
 Standards-Version: 3.8.1
 Homepage: http://www.gnome.org/projects/totem/

Modified: desktop/experimental/totem/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/control.in?rev=20258&op=diff
==============================================================================
--- desktop/experimental/totem/debian/control.in (original)
+++ desktop/experimental/totem/debian/control.in Thu Jun  4 18:17:35 2009
@@ -53,7 +53,6 @@
                python-xdg,
                python-rdflib,
                libbluetooth-dev [!kfreebsd-i386 !kfreebsd-amd64],
-               libgdata-dev,
                libgalago-dev (>= 0.5.2)
 Standards-Version: 3.8.1
 Homepage: http://www.gnome.org/projects/totem/

Copied: desktop/experimental/totem/debian/totem.preinst (from r20257, desktop/experimental/totem/debian/totem.postinst)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/totem.preinst?rev=20258&op=diff
==============================================================================
--- desktop/experimental/totem/debian/totem.postinst (original)
+++ desktop/experimental/totem/debian/totem.preinst Thu Jun  4 18:17:35 2009
@@ -1,9 +1,9 @@
 #! /bin/sh
 set -e
 
-if [ "$1" = configure ] && dpkg --compare-versions "$2" lt "2.27.1-1" ; then
-        update-alternatives --quiet --remove-all gnome-video-thumbnailer
-        update-alternatives --quiet --remove-all totem
+if [ "$1" = configure ] && dpkg --compare-versions "$2" lt "2.27.1-2" ; then
+        update-alternatives --quiet --remove-all gnome-video-thumbnailer || true
+        update-alternatives --quiet --remove-all totem || true
 fi
 
 #DEBHELPER#