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

[Rafael Laboissiere]

Author: rafael
Date: 2005-09-13 08:49:06 +0000 (Tue, 13 Sep 2005)
New Revision: 238

Modified:
   trunk/packages/octave/debian/changelog
   trunk/packages/octave/debian/in/PACKAGE-headers.postinst
   trunk/packages/octave/debian/in/PACKAGE.postinst
   trunk/packages/octave/debian/rules
Log:
Moved octave-config script form octave package to octave-headers package.
Still in preparation for 2.1.71-3.





Modified: trunk/packages/octave/debian/changelog
===================================================================
--- trunk/packages/octave/debian/changelog	2005-09-13 07:17:56 UTC (rev 237)
+++ trunk/packages/octave/debian/changelog	2005-09-13 08:49:06 UTC (rev 238)
@@ -34,8 +34,14 @@
   * debian/octave-config.1: Removed this file, since there is another one
     upstream which is up-to-date (in doc/interpreter).
 
- -- 
+  * debian/rules: The octave-config script is now part of the
+    octave($version)-headers package.
+  * debian/in/PACKAGE.postinst, debian/in/PACKAGE-headers.postinst: Update
+    alternatives for octave-config and octave-config.1 in
+    octave($version)-headers package instead of octave($version).
 
+ --
+
 octave2.1 (2.1.71-2) unstable; urgency=low
 
   +++ Changes by Rafael Laboissiere

Modified: trunk/packages/octave/debian/in/PACKAGE-headers.postinst
===================================================================
--- trunk/packages/octave/debian/in/PACKAGE-headers.postinst	2005-09-13 07:17:56 UTC (rev 237)
+++ trunk/packages/octave/debian/in/PACKAGE-headers.postinst	2005-09-13 08:49:06 UTC (rev 238)
@@ -2,7 +2,7 @@
 #
 # postinst script for the Debian GNU/Linux octave2.0-headers package
 #
-# This version written by Dirk Eddelbuettel <edd at debian.org>   
+# This version written by Dirk Eddelbuettel <edd at debian.org>
 
 #DEBHELPER#
 
@@ -10,18 +10,25 @@
 VERSION=@VERSION@
 
 case "$1" in
-    configure)     
+    configure)
 	#
 	# update-alternatives for multiple Octave versions
-	update-alternatives --install /usr/bin/mkoctfile  mkoctfile  \
-				    /usr/bin/mkoctfile-$VERSION 15 \
-# 	update-alternatives --install /usr/bin/mkoctfile  mkoctfile  \
-# 				    /usr/bin/mkoctfile-$VERSION 15 \
-# 			    --slave /usr/share/man/man1/mkoctfile.1.gz \
-# 				    mkoctfile.1.gz \
-# 				    /usr/share/man/man1/mkoctfile-$VERSION.1.gz
-	update-alternatives --install /usr/include/octave octave-include  \
-				    /usr/include/octave-$VERSION 15 \
+
+ 	update-alternatives --install /usr/bin/mkoctfile mkoctfile	\
+ 				/usr/bin/mkoctfile-$VERSION 15		\
+ 			    --slave /usr/share/man/man1/mkoctfile.1.gz	\
+ 				mkoctfile.1.gz				\
+ 				/usr/share/man/man1/mkoctfile-$VERSION.1.gz
+
+	update-alternatives --install /usr/bin/octave-config octave-config \
+				/usr/bin/octave-config-$VERSION 30	\
+			    --slave /usr/share/man/man1/octave-config.1.gz \
+				octave-config.1.gz			\
+				/usr/share/man/man1/octave-config-$VERSION.1.gz
+
+	update-alternatives --install /usr/include/octave octave-include\
+				    /usr/include/octave-$VERSION 15	\
+
        ;;
     abort-upgrade|abort-remove|abort-deconfigure)
         ;;
@@ -30,4 +37,4 @@
         ;;
 esac
 
-exit 0                 
+exit 0

Modified: trunk/packages/octave/debian/in/PACKAGE.postinst
===================================================================
--- trunk/packages/octave/debian/in/PACKAGE.postinst	2005-09-13 07:17:56 UTC (rev 237)
+++ trunk/packages/octave/debian/in/PACKAGE.postinst	2005-09-13 08:49:06 UTC (rev 238)
@@ -3,7 +3,7 @@
 # postinst script for the Debian GNU/Linux octave2.0 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>
 
 #DEBHELPER#
 
@@ -11,7 +11,7 @@
 VERSION=@VERSION@
 
 case "$1" in
-    configure)     
+    configure)
 	#
 	# create /usr/local/ directory, if we may
 	install -d /usr/local/share/octave/site-m \
@@ -19,12 +19,12 @@
 	#
 	# if it exists, update the ls-R database for kpathsea
 	if [ -d /usr/local/share/octave/ ]
-	then 
+	then
 	    ls -LR /usr/lib/octave/ /usr/share/octave \
 		    /usr/local/share/octave > /usr/share/octave/ls-R
 	else
 	    ls -LR /usr/lib/octave/ /usr/share/octave > /usr/share/octave/ls-R
-	fi 
+	fi
 	#
 	# update-alternatives for multiple Octave versions
 	update-alternatives --install /usr/bin/octave  octave  \
@@ -42,11 +42,6 @@
 			    --slave /usr/share/man/man1/octave-bug.1.gz \
 				    octave-bug.1.gz \
 				    /usr/share/man/man1/octave-bug-$VERSION.1.gz
-	update-alternatives --install /usr/bin/octave-config  octave-config  \
-				    /usr/bin/octave-config-$VERSION 30 \
-			    --slave /usr/share/man/man1/octave-config.1.gz \
-				    octave-config.1.gz \
-				    /usr/share/man/man1/octave-config-$VERSION.1.gz
 	;;
     abort-upgrade|abort-remove|abort-deconfigure)
         ;;
@@ -55,4 +50,4 @@
         ;;
 esac
 
-exit 0                 
+exit 0

Modified: trunk/packages/octave/debian/rules
===================================================================
--- trunk/packages/octave/debian/rules	2005-09-13 07:17:56 UTC (rev 237)
+++ trunk/packages/octave/debian/rules	2005-09-13 08:49:06 UTC (rev 238)
@@ -254,8 +254,10 @@
 	dh_movefiles -p$(dev_package) --sourcedir=debian/octave2.1	\
 			usr/include/		 			\
 			usr/bin/mkoctfile-$(version) 			\
+			usr/bin/octave-config-$(version)		\
 			usr/bin/octave-depends		 		\
 			usr/share/man/man1/mkoctfile-$(version).1	\
+			usr/share/man/man1/octave-config-$(version).1	\
 			usr/share/man/man1/octave-depends.1		\
 			usr/share/octave/debian/defs.make
 	rm -r $(debtmp)/usr/include