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

[Rafael Laboissiere]

Author: rafael
Date: 2009-02-11 09:52:46 +0000 (Wed, 11 Feb 2009)
New Revision: 2642

Modified:
   octave/trunk/debian/changelog
   octave/trunk/debian/in/PACKAGE.conf
   octave/trunk/debian/rules
Log:
Use versioned prefixes for the Octave packages directory


Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog	2009-02-11 09:36:50 UTC (rev 2641)
+++ octave/trunk/debian/changelog	2009-02-11 09:52:46 UTC (rev 2642)
@@ -19,8 +19,11 @@
     + Do not install the documentation file THANKS for octave3.1 since
       this file is not distributed anymore
     + Set api_version equal to 34 for octave3.1
+    + Use versioned prefixes for the Octave packages directory
   * debian/in/PACKAGE.postinst: Do not generate the ls-R kpathsea database
     file.  It is not used by Octave anymore.
+  * debian/in/PACKAGE.conf: Use versioned prefixes for the Octave packages
+    directory
 
  -- Rafael Laboissiere <rafael at debian.org>  Fri, 06 Feb 2009 11:23:15 +0100
 

Modified: octave/trunk/debian/in/PACKAGE.conf
===================================================================
--- octave/trunk/debian/in/PACKAGE.conf	2009-02-11 09:36:50 UTC (rev 2641)
+++ octave/trunk/debian/in/PACKAGE.conf	2009-02-11 09:52:46 UTC (rev 2642)
@@ -29,7 +29,9 @@
 
 pkg ("load", "auto");
 
+## Adjust pkg prefix for each branch of Octave
 
+pkg prefix /usr/share/octave/packages/@MAJOR@ /usr/lib/octave/packages/@MAJOR@
 
 ### Use new style of path generation
 

Modified: octave/trunk/debian/rules
===================================================================
--- octave/trunk/debian/rules	2009-02-11 09:36:50 UTC (rev 2641)
+++ octave/trunk/debian/rules	2009-02-11 09:52:46 UTC (rev 2642)
@@ -334,7 +334,7 @@
 	     $(debbase)/$(emacs_package)/usr/share/man/man1/octave-tags-$(version).1
 
 	# install the directory for Octave packages
-	install -d $(debbase)/$(common_package)/usr/share/octave/packages
+	install -d $(debbase)/$(common_package)/usr/share/octave/packages/$(major)
 
         ## link the conf.file back from /etc over the version.spec. rc
 	ln -sf /etc/$(PACKAGE).conf 		$(debini)/octaverc