[Pkg-octave-commit] [SCM] Debian packaging for octave branch, master, updated. debian/3.6.1-4-3-gfd27027

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit fd2702784224913ee75d1ad0e6b65357c9cf3828
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Wed May 2 19:33:23 2012 +0200

    Delete /usr/share/octave/octave_packages in octave's prerm instead of postrm
    
    prerm is the right place for the deletion since the package file is created in
    postinst. Also, simplify the logics of prerm since the failed-upgrade case must
    also be handled.

diff --git a/debian/octave.postrm b/debian/octave.postrm
deleted file mode 100644
index 4ba9181..0000000
--- a/debian/octave.postrm
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh -e
-#
-# postrm script for the Debian GNU/Linux octave package
-
-#DEBHELPER#
-
-if [ "$1" = purge ] ; then
-	# Remove the packages database file
-        rm -f /usr/share/octave/octave_packages
-        # Remove the directories, if we can
-	rmdir /usr/share/octave/packages/ 2>/dev/null || true
-	rmdir /usr/share/octave/ 2>/dev/null || true
-fi
-
diff --git a/debian/octave.prerm b/debian/octave.prerm
index c089523..6580d61 100644
--- a/debian/octave.prerm
+++ b/debian/octave.prerm
@@ -6,20 +6,11 @@
 
 #DEBHELPER#
 
-case "$1" in
-    remove|upgrade|deconfigure)
-	# This is for old installations of the octave package
-	if [ -f /usr/share/octave/ls-R ]
-	then
-	    rm -f /usr/share/octave/ls-R
-	fi
-
-	;;
-    failed-upgrade)
-	;;
-    *)
-        echo "prerm called with unknown argument \`$1'" >&2
-        exit 0
-    ;;
-esac
+# Remove the packages database file
+rm -f /usr/share/octave/octave_packages
 
+# This is for old installations of the octave package
+if [ -f /usr/share/octave/ls-R ]
+then
+    rm -f /usr/share/octave/ls-R
+fi

-- 
Debian packaging for octave