[Pkg-octave-commit] r2635 - in octave/trunk/debian: . in

[Rafael Laboissiere]

Author: rafael
Date: 2009-02-09 09:41:59 +0000 (Mon, 09 Feb 2009)
New Revision: 2635

Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/in/PACKAGE.postinst
   octave/trunk/debian/in/PACKAGE.prerm
   octave/trunk/debian/rules
Log:
Drop code for dealing with the ls-R kpathsea database

Octave does not use the ls-R database anymore, so that its generation is
not need in the postinst script.  We still keep removing the file in the
prerm script for cleaning old installations of the package.  In
debian/rules, we still have to remove it after install, because the
upstream Makefile is not yet changed.  This is already changed upstream,
see
http://www-old.cae.wisc.edu/pipermail/octave-maintainers/2009-February/010708.html.


Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2009-02-08 17:27:26 UTC (rev 2634)
+++ octave/trunk/debian/changelog	2009-02-09 09:41:59 UTC (rev 2635)
@@ -1,3 +1,13 @@
+octave3.0 (1:3.0.4~rc3-2) UNRELEASED; urgency=low
+
+  * debian/rules:
+    + In the binary-indep rule, remove the ls-R file installed in the
+      /usr/share directory.
+  * debian/in/PACKAGE.postinst: Do not generate the ls-R kpathsea database
+    file.  It is not used by Octave anymore.
+
+ -- Rafael Laboissiere <rafael at debian.org>  Fri, 06 Feb 2009 11:23:15 +0100
+
 octave3.0 (1:3.0.1-7) unstable; urgency=low
 
   * Upload to unstable, such that the package will have a higher version

Modified: octave/trunk/debian/in/PACKAGE.postinst
===================================================================
--- octave/trunk/debian/in/PACKAGE.postinst	2009-02-08 17:27:26 UTC (rev 2634)
+++ octave/trunk/debian/in/PACKAGE.postinst	2009-02-09 09:41:59 UTC (rev 2635)
@@ -18,15 +18,6 @@
 	install -d /usr/local/share/octave/site-m \
 	        -m 2775 -o root -g staff             2>/dev/null || true
 	#
-	# if it exists, update the ls-R database for kpathsea
-	if [ -d /usr/local/share/octave/ ]
-	then
-	    ls -R /usr/lib/octave/ /usr/share/octave \
-		    /usr/local/share/octave > /usr/share/octave/ls-R
-	else
-	    ls -R /usr/lib/octave/ /usr/share/octave > /usr/share/octave/ls-R
-	fi
-	#
 	# update-alternatives for multiple Octave versions
 	for f in octave octave-bug ; do
 		update-alternatives					\

Modified: octave/trunk/debian/in/PACKAGE.prerm
===================================================================
--- octave/trunk/debian/in/PACKAGE.prerm	2009-02-08 17:27:26 UTC (rev 2634)
+++ octave/trunk/debian/in/PACKAGE.prerm	2009-02-09 09:41:59 UTC (rev 2635)
@@ -19,7 +19,7 @@
 	    rmdir /usr/local/share/octave        2>/dev/null || true
 	fi
 	#
-	# remove the ls-R database for kpathsea
+	# This is for old installations of the octave package
 	if [ -f /usr/share/octave/ls-R ]
 	then
 	    rm -f /usr/share/octave/ls-R

Modified: octave/trunk/debian/rules
===================================================================
--- octave/trunk/debian/rules	2009-02-08 17:27:26 UTC (rev 2634)
+++ octave/trunk/debian/rules	2009-02-09 09:41:59 UTC (rev 2635)
@@ -343,6 +343,9 @@
         ## link the conf.file back from /etc over the version.spec. rc
 	ln -sf /etc/$(PACKAGE).conf 		$(debini)/octaverc
 
+        # The ls-R database is not needed anymore
+	rm -vf $(debbase)/$(common_package)/usr/share/octave/ls-R
+
         # install lintian overrride
 	dh_lintian -p$(common_package)
 
@@ -397,10 +400,10 @@
 						NEWS* PROJECTS THANKS	\
 						BUGS SENDING-PATCHES
 	dh_installdocs -p$(PACKAGE) 		debian/README.Atlas
-        # recreated in postinst in share/, not needed in lib
-	rm -vf	$(debtmp)/usr/lib/octave/ls-R \
-		$(debtmp)/usr/share/octave/ls-R
 
+        # The ls-R database is not needed anymore
+	rm -vf $(debtmp)/usr/lib/octave/ls-R
+
 	## Rename the desktop file
 	-[ -e $(debapp)/www.octave.org-octave.desktop ]		\
 		&& mv $(debapp)/www.octave.org-octave.desktop	\