[Pkg-octave-commit] [SCM] Debian packaging for octave branch, master, updated. debian/3.6.1-6-8-g8b29c98

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit dd089a1f834e946d742fdf951ca24b0582d6145d
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Fri Jun 1 14:31:19 2012 +0200

    README.Debian: discourage the use of pkg.m; other minor improvements
    
    Closes: #672651

diff --git a/debian/README.Debian b/debian/README.Debian
index 5b13c99..0b628fd 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,23 +1,11 @@
-Why is mkoctfile not in octave3.0, but in octave3.0-headers?
-============================================================
-
-In order to use mkoctfile, one needs the development packages (headers, .a
-libraries) of the libraries used by Octave (fftw, blas, ...). These sum up to
-a lot of space; an installation of octave3.0-headers will trigger the
-installation of these packages, so one can use mkoctfile then.
-
-pkg.m is not part of octave3.0-headers as it's used to find already installed
-packages (via /etc/octave3.0.conf).
-
-  -- Thomas Weber <thomas.weber.mail at gmail.com>  Mon, 30 Jun 2008 10:05:05 +0200
-
-
 General information
 ===================
 
-The octave-doc package contains extra documentation in PDF form which
-can be found in the directory /usr/share/doc/octave-doc once this supplementary
-package is installed. 
+The octave-doc package contains extra documentation in PDF form which can be
+found in the directory /usr/share/doc/octave-doc once this supplementary
+package is installed. Similarly, documentation in HTML format is available in
+the octave-htmldoc package, and documentation in Info format is in the
+octave-info package.
 
 Further information on Octave, the Octave mailing-lists and the Octave 
 source archive can be found at http://www.octave.org
@@ -25,5 +13,32 @@ source archive can be found at http://www.octave.org
 The Debian Octave-related packages are collectively maintained by the Debian
 Octave Group (http://pkg-octave.alioth.debian.org).
 
- -- Thomas Weber <thomas.weber.mail at gmail.com>, Mon, 30 Jun 2008 10:05:36 +0200
+
+About Octave-Forge packages
+===========================
+
+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.
+
+
+Why is mkoctfile not in octave, but in liboctave-dev?
+=====================================================
+
+In order to use mkoctfile, one needs the development packages (headers, .a
+libraries) of the libraries used by Octave (fftw, blas, ...). These sum up to a
+lot of space; an installation of liboctave-dev will trigger the installation of
+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.villemot at ens.fr>, Fri,  1 Jun 2012 14:30:32 +0200
 

-- 
Debian packaging for octave