r11355 - in /desktop/unstable/deskbar-applet/debian: changelog deskbar-applet.postinst rules

[rfrancoise at users.alioth.debian.org]

Author: rfrancoise
Date: Thu Jun  7 18:55:12 2007
New Revision: 11355

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11355
Log:
* debian/rules: Pass --without-scrollkeeper to avoid shipping
  scrollkeeper files in the package.
* debian/deskbar-applet.postinst: Rebuild scrollkeeper database if
  upgrading from a broken version.

Added:
    desktop/unstable/deskbar-applet/debian/deskbar-applet.postinst   (with props)
Modified:
    desktop/unstable/deskbar-applet/debian/changelog
    desktop/unstable/deskbar-applet/debian/rules

Modified: desktop/unstable/deskbar-applet/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/deskbar-applet/debian/changelog?rev=11355&op=diff
==============================================================================
--- desktop/unstable/deskbar-applet/debian/changelog (original)
+++ desktop/unstable/deskbar-applet/debian/changelog Thu Jun  7 18:55:12 2007
@@ -1,11 +1,16 @@
-deskbar-applet (2.18.1-2) UNRELEASED; urgency=low
+deskbar-applet (2.18.1-2) unstable; urgency=low
 
   * debian/patches/100-gpm-methods.patch: New patch stolen from Ubuntu,
     fixes the gnome-power-manager dbus calls in the gdm handler.
   * debian/patches/100-fix-pythonlib.patch: New patch stolen from Ubuntu,
     avoids hardcoding the Python version in deskbar-applet.py.
 
- -- Romain Francoise <rfrancoise at debian.org>  Thu, 07 Jun 2007 18:30:57 +0200
+  * debian/rules: Pass --without-scrollkeeper to avoid shipping
+    scrollkeeper files in the package.
+  * debian/deskbar-applet.postinst: Rebuild scrollkeeper database if
+    upgrading from a broken version.
+
+ -- Romain Francoise <rfrancoise at debian.org>  Thu, 07 Jun 2007 20:54:19 +0200
 
 deskbar-applet (2.18.1-1) unstable; urgency=low
 

Added: desktop/unstable/deskbar-applet/debian/deskbar-applet.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/deskbar-applet/debian/deskbar-applet.postinst?rev=11355&op=file
==============================================================================
--- desktop/unstable/deskbar-applet/debian/deskbar-applet.postinst (added)
+++ desktop/unstable/deskbar-applet/debian/deskbar-applet.postinst Thu Jun  7 18:55:12 2007
@@ -1,0 +1,15 @@
+#!/bin/sh -e
+
+# Version 2.18.1-1 started shipping /var/lib/scrollkeeper erroneously,
+# hence the database was overwritten and needs a full rebuild.
+if [ "$1" = "configure" ] \
+    && dpkg --compare-versions "$2" ge "2.18.1-1" \
+    && dpkg --compare-versions "$2" lt "2.18.1-2" \
+    && which scrollkeeper-rebuilddb >/dev/null 2>&1; then
+    echo "Upgrade from broken deskbar-applet version detected, running scrollkeeper-rebuilddb..."
+    scrollkeeper-rebuilddb -q
+fi
+
+#DEBHELPER#
+
+exit 0

Propchange: desktop/unstable/deskbar-applet/debian/deskbar-applet.postinst
------------------------------------------------------------------------------
    svn:executable = *

Modified: desktop/unstable/deskbar-applet/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/deskbar-applet/debian/rules?rev=11355&op=diff
==============================================================================
--- desktop/unstable/deskbar-applet/debian/rules (original)
+++ desktop/unstable/deskbar-applet/debian/rules Thu Jun  7 18:55:12 2007
@@ -11,7 +11,9 @@
 # deskbar/defs.py contains the line
 #   DATADIR = "${prefix}/share"
 # which obviously won't work in Python code. See also bug #378080.
-DEB_CONFIGURE_EXTRA_FLAGS := --datadir=/usr/share
+DEB_CONFIGURE_EXTRA_FLAGS += \
+			--datadir=/usr/share \
+			--disable-scrollkeeper
 
 # New python policy
 binary-install/deskbar-applet::