[Pkg-octave-commit] [octave] 01/01: No longer set pkg prefix in /etc/octave.conf.

[Sébastien Villemot]

This is an automated email from the git hooks/post-receive script.

sebastien pushed a commit to branch master
in repository octave.

commit b730fe0b2270476753e6875ab7b89334c2329bf5
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Wed Feb 12 18:52:47 2014 +0100

    No longer set pkg prefix in /etc/octave.conf.
    
    This breaks pkg install -local. And it is no more needed since we stopped
    providing several versions of octave in parallel.
    
    Closes: #536839
---
 debian/README.Debian | 11 ++++-------
 debian/octave.conf   | 11 -----------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 08783cb..e7d0439 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -32,12 +32,9 @@ If you want to install packages from the Octave-Forge project
 (http://octave.sourceforge.net/), the recommended way is to use the packages
 distributed by Debian. Most Octave-Forge packages are available in Debian under
 the name octave-<pkgname> (for example, the statistics package from
-Octave-Forge is available as the octave-statistics package in Debian).
-
-The use of the `pkg' command at the Octave prompt is therefore discouraged and
-not supported by Debian. If you still want to install packages using the `pkg'
-command and you know what you are doing, you should comment out the `pkg
-prefix' line in /etc/octave.conf.
+Octave-Forge is available as the octave-statistics package in Debian). The use
+of the `pkg' command at the Octave prompt is therefore discouraged and not
+supported by Debian.
 
 
 Why is mkoctfile not in octave, but in liboctave-dev?
@@ -51,5 +48,5 @@ these packages, so one can use mkoctfile then.
 pkg.m is not part of liboctave-dev as it's used to find already installed
 packages (via /etc/octave.conf).
 
- -- Sébastien Villemot <sebastien at debian.org>, Fri, 20 Dec 2013 20:39:48 +0100
+ -- Sébastien Villemot <sebastien at debian.org>, Wed, 12 Feb 2014 18:52:32 +0100
 
diff --git a/debian/octave.conf b/debian/octave.conf
index b5dfe14..4902f32 100644
--- a/debian/octave.conf
+++ b/debian/octave.conf
@@ -16,17 +16,6 @@ if (strcmp (PAGER (), "less") && isempty (getenv ("LESS")))
   PAGER_FLAGS ('-e -X -P"-- less ?pB(%pB\\%):--. (f)orward, (b)ack, (q)uit$"');
 endif
 
-## Use the global list of packages in the versioned directory
-
-pkg global_list /usr/share/octave/octave_packages;
-
-## Adjust pkg prefix
-
-suffix = "/octave/packages";
-pkg ("prefix", sprintf ("%s%s", octave_config_info ("datadir"), suffix),
-               sprintf ("%s%s", octave_config_info ("libdir"), suffix));
-clear suffix;
-
 ## This appears here instead of in the pkg/PKG_ADD file so that --norc
 ## will also skip automatic loading of packages.
 

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave.git