r13652 - in /desktop/unstable/gnome-panel/debian: applications.template changelog gnome-panel-data.install gnome-panel-data.menu-method gnome-panel-data.menu-method.experimental gnome-panel-data.postinst gnome-panel-data.postrm gnome-vfolder-user rules

[joss at users.alioth.debian.org]

Author: joss
Date: Wed Nov 28 00:20:03 2007
New Revision: 13652

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13652
Log:
* gnome-panel-data.post*: cleanup.
* Remove the menu methods and everything related. Closes: #447474.
* gnome-panel-data.postinst: remove these files upon upgrade, and
  purge /var/lib/gnome/Debian as well.

Removed:
    desktop/unstable/gnome-panel/debian/applications.template
    desktop/unstable/gnome-panel/debian/gnome-panel-data.menu-method
    desktop/unstable/gnome-panel/debian/gnome-panel-data.menu-method.experimental
    desktop/unstable/gnome-panel/debian/gnome-vfolder-user
Modified:
    desktop/unstable/gnome-panel/debian/changelog
    desktop/unstable/gnome-panel/debian/gnome-panel-data.install
    desktop/unstable/gnome-panel/debian/gnome-panel-data.postinst
    desktop/unstable/gnome-panel/debian/gnome-panel-data.postrm
    desktop/unstable/gnome-panel/debian/rules

Modified: desktop/unstable/gnome-panel/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/changelog?rev=13652&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/changelog (original)
+++ desktop/unstable/gnome-panel/debian/changelog Wed Nov 28 00:20:03 2007
@@ -1,3 +1,12 @@
+gnome-panel (2.20.1-2) UNRELEASED; urgency=low
+
+  * gnome-panel-data.post*: cleanup.
+  * Remove the menu methods and everything related. Closes: #447474.
+  * gnome-panel-data.postinst: remove these files upon upgrade, and
+    purge /var/lib/gnome/Debian as well.
+
+ -- Josselin Mouette <joss at debian.org>  Wed, 28 Nov 2007 01:02:54 +0100
+
 gnome-panel (2.20.1-1) unstable; urgency=low
 
   * New upstream bugfix release.

Modified: desktop/unstable/gnome-panel/debian/gnome-panel-data.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/gnome-panel-data.install?rev=13652&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/gnome-panel-data.install (original)
+++ desktop/unstable/gnome-panel/debian/gnome-panel-data.install Wed Nov 28 00:20:03 2007
@@ -8,5 +8,3 @@
 debian/tmp/usr/share/icons
 debian/tmp/usr/share/locale
 debian/tmp/usr/share/omf
-debian/applications.template etc/gnome-vfs-2.0/vfolders/
-debian/gnome-vfolder-user etc/menu-methods/

Modified: desktop/unstable/gnome-panel/debian/gnome-panel-data.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/gnome-panel-data.postinst?rev=13652&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/gnome-panel-data.postinst (original)
+++ desktop/unstable/gnome-panel/debian/gnome-panel-data.postinst Wed Nov 28 00:20:03 2007
@@ -1,20 +1,15 @@
 #!/bin/sh
-
 set -e
-
-self="$(basename "$0")"
-
-action="$1"
 
 #DEBHELPER#
 
-case "$action" in
-  configure)
-    update-gconf-defaults
-  ;;
-  abort-upgrade|abort-remove|abort-remove|abort-deconfigure)
-  ;;
-  *)
-    echo "$self: W: unknown action \`$action'" >&2
-  ;;
-esac
+update-gconf-defaults
+
+if [ "$1" = configure ] && [ -n "$2" ] && \
+	dpkg --compare-versions "$2" lt "2.20.1-2"; then
+    rm -f /etc/menu-methods/gnome-panel-data /etc/menu-methods/gnome-vfolder-user
+    rm -f /etc/gnome-vfs-2.0/vfolders/applications.template
+    rmdir --ignore-fail-on-non-empty /etc/gnome-vfs-2.0/vfolders
+    rm -rf /var/lib/gnome/Debian
+    rmdir --ignore-fail-on-non-empty /var/lib/gnome
+fi

Modified: desktop/unstable/gnome-panel/debian/gnome-panel-data.postrm
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/gnome-panel-data.postrm?rev=13652&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/gnome-panel-data.postrm (original)
+++ desktop/unstable/gnome-panel/debian/gnome-panel-data.postrm Wed Nov 28 00:20:03 2007
@@ -1,20 +1,8 @@
 #!/bin/sh
-
 set -e
 
-self="$(basename "$0")"
-
-action="$1"
-
-case "$action" in
-  remove)
-    [ -x /usr/sbin/update-gconf-defaults ] && update-gconf-defaults
-  ;;
-  upgrade|failed-upgrade|abort-install|abort-install|abort-upgrade|disappear|purge)
-  ;;
-  *)
-    echo "$self: W: unknown action \`$action'" >&2
-  ;;
-esac
+if [ "$1" = remove ] && [ -x /usr/sbin/update-gconf-defaults ]; then
+    update-gconf-defaults
+fi
 
 #DEBHELPER#

Modified: desktop/unstable/gnome-panel/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/rules?rev=13652&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/rules (original)
+++ desktop/unstable/gnome-panel/debian/rules Wed Nov 28 00:20:03 2007
@@ -26,7 +26,6 @@
 	chmod a+x debian/gnome-panel/usr/lib/gnome-panel/*
 
 binary-install/gnome-panel-data::
-	chmod a+x debian/gnome-panel-data/etc/menu-methods/gnome-panel-data
 	find debian/gnome-panel-data/usr/share -type f -exec chmod -R a-x {} \;
 	cd debian/gnome-panel-data/usr/share/gconf && \
 		mkdir defaults && \