[Pkg-octave-commit] [SCM] Debian packaging for octave branch, master, updated. 3.2.2-2-102-g2b393c2

[Thomas Weber]

The following commit has been merged in the master branch:
commit 7e13df70f970213c7c8d5f359c3d76305b2090cf
Author: Thomas Weber <tweber at debian.org>
Date:   Sat Dec 3 17:04:09 2011 +0100

    Modify octave.conf for paths without the major Octave version
    
    Git-Dch: Ignore

diff --git a/debian/octave.conf b/debian/octave.conf
index 5a80b7e..20ed595 100644
--- a/debian/octave.conf
+++ b/debian/octave.conf
@@ -3,12 +3,8 @@
 ### This file should contain any commands that should be executed each
 ### time Octave starts for every user at this site.
 
-### On a Debian GNU/Linux system, Octave also searches for local files and
-### directories below /usr/local/share/octave/site-m/.  Please see the Octave
-### documentation for other variables you might want to set here.
-
-[V_3_2:
-[V_3_0:
+## This file is an extended copy of Octave's startup file at
+# /usr/share/octave/3.4.3/m/startup/octaverc
 ## Configure readline using the file inputrc in the Octave startup
 ## directory.
 
@@ -22,43 +18,15 @@ endif
 
 ## Use the global list of packages in the versioned directory
 
-pkg global_list /usr/share/octave/packages/@MAJOR@/octave_packages;
+pkg global_list /usr/share/octave/octave_packages;
 
 ## Adjust pkg prefix for each branch of Octave
 
-pkg prefix /usr/share/octave/packages/@MAJOR@ /usr/lib/octave/packages/@MAJOR@;
+pkg prefix /usr/share/octave/packages /usr/lib/octave/packages/;
 
 ## This appears here instead of in the pkg/PKG_ADD file so that --norc
 ## will also skip automatic loading of packages.
 
-pkg load auto;
-
-### Use new style of path generation
-
-addpath (genpath ("/usr/local/share/octave/site-m"), "-begin");
-
-### We use a function below to avoid polutting the user space with ###
-### Debian start-up specific variables.  Also, the function itself is
-### cleared after being called.
-
-function debian_remove_octave_forge
-:]:][V_3_0:
-  p = split (path (), ":");
-  for i = 1 : rows (p)
-    if ! isempty (findstr (p (i, :), "octave-forge"))
-      rmpath (deblank (p (i, :)));
-:][V_3_2:
-  p = strsplit (path (), ":");
-  for i = 1 : rows (p)
-    if ! isempty (findstr (p{i}, "octave-forge"))
-      rmpath (deblank (p{i}));
-:][V_3_2:[V_3_0:
-    endif
-  endfor
-endfunction
-
-debian_remove_octave_forge ();
-
-clear debian_remove_octave_forge;
-:]:]
+pkg ("load", "auto");
 
+atexit ("__finish__");

-- 
Debian packaging for octave