r10509 - in /desktop/unstable/metacity/debian: changelog metacity-common.postinst metacity.postinst metacity.prerm

[lool at users.alioth.debian.org]

Author: lool
Date: Fri Apr 27 09:51:52 2007
New Revision: 10509

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10509
Log:
* Drop metacity-common postinst as it was scheduled to be dropped post-etch.
* Rewrite metacity postinst and prerm to use safer individual if tests
  instead of trying to list all possible args in a case; reported by
  Lior Kaplan; closes: #421206.

Removed:
    desktop/unstable/metacity/debian/metacity-common.postinst
Modified:
    desktop/unstable/metacity/debian/changelog
    desktop/unstable/metacity/debian/metacity.postinst
    desktop/unstable/metacity/debian/metacity.prerm

Modified: desktop/unstable/metacity/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/changelog?rev=10509&op=diff
==============================================================================
--- desktop/unstable/metacity/debian/changelog (original)
+++ desktop/unstable/metacity/debian/changelog Fri Apr 27 09:51:52 2007
@@ -1,3 +1,12 @@
+metacity (1:2.18.2-4) UNRELEASED; urgency=low
+
+  * Drop metacity-common postinst as it was scheduled to be dropped post-etch.
+  * Rewrite metacity postinst and prerm to use safer individual if tests
+    instead of trying to list all possible args in a case; reported by
+    Lior Kaplan; closes: #421206.
+
+ -- Loic Minier <lool at dooz.org>  Fri, 27 Apr 2007 11:49:14 +0200
+
 metacity (1:2.18.2-3) unstable; urgency=low
 
   * New patch 02_fix_crash_on_session_saving.patch, taken from Ubuntu.

Modified: desktop/unstable/metacity/debian/metacity.postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/metacity.postinst?rev=10509&op=diff
==============================================================================
--- desktop/unstable/metacity/debian/metacity.postinst (original)
+++ desktop/unstable/metacity/debian/metacity.postinst Fri Apr 27 09:51:52 2007
@@ -2,22 +2,15 @@
 
 set -e
 
-case "$1" in
-  configure)
+action="$1"
+
+if [ "$action" = configure ]; then
     # register the alternatives of x-window-manager manually
     # because dh_installwm doesn't register manpage as slave yet.
     update-alternatives --install /usr/bin/x-window-manager \
         x-window-manager /usr/bin/metacity 60 \
         --slave /usr/share/man/man1/x-window-manager.1.gz \
         x-window-manager.1.gz /usr/share/man/man1/metacity.1.gz
-    ;;
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-    *)
-      echo "postinst called with unknown argument \`$1'" >&2
-      exit 1
-    ;;
-esac
+fi
 
 #DEBHELPER#
-

Modified: desktop/unstable/metacity/debian/metacity.prerm
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/metacity.prerm?rev=10509&op=diff
==============================================================================
--- desktop/unstable/metacity/debian/metacity.prerm (original)
+++ desktop/unstable/metacity/debian/metacity.prerm Fri Apr 27 09:51:52 2007
@@ -2,18 +2,11 @@
 
 set -e
 
-case "$1" in
-  remove)
+action="$1"
+
+if [ "$action" = remove ]; then
     update-alternatives --remove x-window-manager \
         /usr/bin/metacity
-  ;;
-  failed-upgrade)
-  ;;
-  *)
-    echo "prerm called with unknown argument \`$1'" >&2
-    exit 1
-  ;;
-esac
+fi
 
 #DEBHELPER#
-