[Pkg-octave-commit] rev 342 - in trunk/packages/octave/debian: . in

[Rafael Laboissiere]

Author: rafael
Date: 2005-11-21 11:57:45 +0000 (Mon, 21 Nov 2005)
New Revision: 342

Modified:
   trunk/packages/octave/debian/changelog
   trunk/packages/octave/debian/in/PACKAGE-info.postinst
   trunk/packages/octave/debian/in/PACKAGE-info.prerm
Log:
Debian release octave2.1_2.1.72-4


Modified: trunk/packages/octave/debian/changelog
===================================================================
--- trunk/packages/octave/debian/changelog	2005-11-17 08:52:53 UTC (rev 341)
+++ trunk/packages/octave/debian/changelog	2005-11-21 11:57:45 UTC (rev 342)
@@ -1,3 +1,12 @@
+octave2.1 (2.1.72-4) unstable; urgency=low
+
+   +++ Changes by Rafael Laboissiere
+
+  * debian/in/PACKAGE-info.prerm: Remove alternatives to the info files
+    (closes: #339959)
+
+ -- Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>  Sun, 20 Nov 2005 18:46:56 +0100
+
 octave2.9 (2.9.4-4) unstable; urgency=low
 
    +++ Changes by Rafael Laboissiere

Modified: trunk/packages/octave/debian/in/PACKAGE-info.postinst
===================================================================
--- trunk/packages/octave/debian/in/PACKAGE-info.postinst	2005-11-17 08:52:53 UTC (rev 341)
+++ trunk/packages/octave/debian/in/PACKAGE-info.postinst	2005-11-21 11:57:45 UTC (rev 342)
@@ -25,11 +25,13 @@
 	   --description="The GNU Octave ($MAJOR) FAQ."\
 	   /usr/share/info/Octave$MAJOR-FAQ.info.gz
 
-	for f in octave liboctave Octave-FAQ ; do			\
+	for f in octave at v liboctave at v Octave at v-FAQ ; do
+		g=`echo $f | sed s/@v//`
+		h=`echo $f | sed s/@v/$MAJOR/`
 		update-alternatives --install				\
-			/usr/share/info/$f.info.gz			\
-			$f.info.gz					\
-			/usr/share/info/$f$MAJOR.info.gz $PRIORITY
+			/usr/share/info/$g.info.gz			\
+			$g.info.gz					\
+			/usr/share/info/$h.info.gz $PRIORITY
 	done
 
        ;;

Modified: trunk/packages/octave/debian/in/PACKAGE-info.prerm
===================================================================
--- trunk/packages/octave/debian/in/PACKAGE-info.prerm	2005-11-17 08:52:53 UTC (rev 341)
+++ trunk/packages/octave/debian/in/PACKAGE-info.prerm	2005-11-21 11:57:45 UTC (rev 342)
@@ -3,27 +3,31 @@
 # prerm script for the Debian GNU/Linux octave2.0-info package
 #
 # Initial version written by Andrew D. Fernandes <adfernan at cnd.mcgill.ca>
-# This version written by Dirk Eddelbuettel <edd at debian.org>   
+# This version written by Dirk Eddelbuettel <edd at debian.org>
 
 set -e
 
+MAJOR=@MAJOR@
+
 #DEBHELPER#
 
 case "$1" in
-    remove|purge)
-	install-info --quiet --remove octave
-	install-info --quiet --remove liboctave
-	install-info --quiet --remove Octave-FAQ
-    ;;
+    remove|upgrade|deconfigure)
+	for f in octave at v liboctave at v Octave at v-FAQ ; do
+		g=`echo $f | sed s/@v//`
+		h=`echo $f | sed s/@v/$MAJOR/`
+		install-info --quiet --remove $g
+		update-alternatives --remove $g.info.gz	\
+			/usr/share/info/$h.info.gz
+	done
 
-    upgrade)
     ;;
 
-    failed-upgrade|abort-install|abort-upgrade|disappear)
+    failed-upgrade)
     ;;
 
     *)
         echo "prerm called with unknown argument \`$1'" >&2
         exit 0
     ;;
-esac                 
+esac