[Pkg-octave-commit] [SCM] octave branch, master, updated. 30e53a40e341ea321ec99d8ed2bedc1b1c010965
Rafael Laboissiere
rafael at debian.org
Sat Jun 6 19:07:22 UTC 2009
The following commit has been merged in the master branch:
commit 190072a4da486e4a2926bbc876a53f2bf12f1d4c
Merge: 4fc3210c88957bd8d45cae41320a3c6db06aa5e9 f56902ec6d194c5620ea5a95ff82e54c61fb6511
Author: Rafael Laboissiere <rafael at debian.org>
Date: Sat Jun 6 13:43:45 2009 +0200
Merge octave3.2 branch into master
diff --combined debian/changelog
index 9a032da,758d878..01a628c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,53 +1,55 @@@
- octave3.0 (1:3.0.5-7) UNRELEASED; urgency=low
+ octave3.2 (3.2.0-1) UNRELEASED; urgency=low
+ * New upstream release
+ * debian/in/PACKAGE.postinst: Remove an old hack added in the code of
+ the package database rebuild. This was added for debugging purposes
+ on some autobuilders and is not necessary anymore.
+ * debian/copyright:
+ + Update the release years in the upstream copyright notice
+ + This file is moved from debian/in/copyright. There is no need for
+ keeping the file in debian/in/ because there is no version-specific
+ changes in it.
+ * debian/rules:
+ + Do not generate debian/copyright from the file in debian/in/
+ + In this new upstream version, doc/conf.texi is not distribute in the
+ tarball. Include it optionally in the savefiles list, accordingly.
+ * debian/in/control: Fix minimal version of octave-optiminterp in the
+ Breaks field
- -- Rafael Laboissiere <rafael at debian.org> Thu, 28 May 2009 19:24:56 +0200
+ -- Rafael Laboissiere <rafael at debian.org> Fri, 05 Jun 2009 22:29:11 +0200
+
+ octave3.2 (3.2.0~rc5-1) experimental; urgency=low
+
+ * New upstream release candidate
+
+ -- Rafael Laboissiere <rafael at debian.org> Tue, 02 Jun 2009 15:52:41 +0200
+
+ octave3.2 (3.2.0~rc4-2) experimental; urgency=low
+
+ * debian/in/control: Make the octave3.2* packages Conflict/
+ Replace/Provide the corresponding octave3.1* packages
+
+ -- Rafael Laboissiere <rafael at debian.org> Thu, 28 May 2009 20:18:08 +0200
+
+ octave3.2 (3.2.0~rc4-1) experimental; urgency=low
+
+ * New upstream release candidate
+ * debian/patches/termios-h-check-3.1.diff: Drop patch (applied upstream)
+
+ -- Rafael Laboissiere <rafael at debian.org> Wed, 27 May 2009 10:56:36 +0200
+
+ octave3.2 (3.2.0~rc3-1) experimental; urgency=low
+
+ * New upstream release candidate.
+ * debian/rules:
+ + (configure-stamp) Instead of calling autogen.sh, call explicitly
+ autoconf and autoheader, otherwise these autotools will be run inside
+ one of the directories under .pc, which contain a copy of configure.in
+ after "quilt push" is run.
+ + Set a value for the priority variable when version of Octave is 3.2
+ * debian/in/control: Include the Breaks field only for octave3.0
+
+ -- Rafael Laboissiere <rafael at debian.org> Mon, 25 May 2009 10:43:29 +0200
octave3.0 (1:3.0.5-6) unstable; urgency=low
diff --combined debian/in/control
index 395febb,3a87b28..64df21d
--- a/debian/in/control
+++ b/debian/in/control
@@@ -1,5 -1,5 +1,5 @@@
[EMACS: -*- debian-control -*- :]
- Source: octave[V_3_0:3.0:][V_3_1:3.1:]
+ Source: octave[V_3_0:3.0:][V_3_2:3.2:]
Section: math
Priority: optional
Maintainer: Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>
@@@ -12,7 -12,7 +12,7 @@@ Build-Depends: g++-4.1 [arm], gcc-4.1 [
libncurses5-dev, gperf, libhdf5-serial-dev (>= 1.6.6) |
libhdf5-lam-dev (>= 1.6.6) | libhdf5-mpich-dev (>= 1.6.6) | libhdf5-openmpi-dev (>= 1.6.6),
libblas-dev, liblapack-dev, gnuplot-nox, libfftw3-dev, texi2html,
- less, quilt, slice[V_3_1:[V_3_0:, libpcre3-dev, flex, libglpk-dev (>= 4.15),
+ less, quilt, slice[V_3_2:[V_3_0:, libpcre3-dev, flex, libglpk-dev (>= 4.15),
libsuitesparse-dev (>= 1:3.2.0), gawk, ghostscript, libcurl4-dev,
libqhull-dev, desktop-file-utils:], libfltk1.1-dev, libgl1-mesa-swx11-dev,
libglu1-mesa-dev, libgraphicsmagick++1-dev, libftgl-dev,
@@@ -22,18 -22,18 +22,18 @@@ Homepage: http://www.octave.org
Vcs-Git: git://git.debian.org/git/pkg-octave/octave.git
Vcs-Browser: http://git.debian.org/?p=pkg-octave/octave.git
- Package: octave[V_3_0:3.0:][V_3_1:3.1:]
+ Package: octave[V_3_0:3.0:][V_3_2:3.2:]
Architecture: any
- Depends: ${shlibs:Depends}, texinfo, octave[V_3_0:3.0:][V_3_1:3.1:]-common (= ${source:Version})
+ Depends: ${shlibs:Depends}, texinfo, octave[V_3_0:3.0:][V_3_2:3.2:]-common (= ${source:Version})
Recommends: gnuplot, libatlas3gf-base
- Suggests: octave[V_3_0:3.0:][V_3_1:3.1:]-info,
- octave[V_3_0:3.0:][V_3_1:3.1:]-doc,
- octave[V_3_0:3.0:][V_3_1:3.1:]-htmldoc,
- octave[V_3_0:3.0:][V_3_1:3.1:]-headers (= ${binary:Version}),
- octave[V_3_0:3.0:][V_3_1:3.1:]-emacsen
- Replaces: octave (<= 2.0.16-2)
- Conflicts: octave (<= 2.0.16-2)[V_3_0:, octave2.9 (<< 1:3):]
- Provides: octave
+ Suggests: octave[V_3_0:3.0:][V_3_2:3.2:]-info,
+ octave[V_3_0:3.0:][V_3_2:3.2:]-doc,
+ octave[V_3_0:3.0:][V_3_2:3.2:]-htmldoc,
+ octave[V_3_0:3.0:][V_3_2:3.2:]-headers (= ${binary:Version}),
+ octave[V_3_0:3.0:][V_3_2:3.2:]-emacsen
+ Replaces: octave (<= 2.0.16-2)[V_3_2:, octave3.1:]
+ Conflicts: octave (<= 2.0.16-2)[V_3_0:, octave2.9 (<< 1:3):][V_3_2:, octave3.1:]
+ Provides: octave[V_3_2:, octave3.1:][V_3_0:
Breaks: octave-ad (<< 1.0.4-2), octave-audio (<< 1.1.2-2),
octave-bioinfo (<< 0.1.1-2), octave-combinatorics (<< 1.0.7-2),
octave-communications (<< 1.0.8-2), octave-control (<< 1.0.7-2),
@@@ -48,7 -48,7 +48,7 @@@
octave-nan (<< 1.0.7-2), octave-nnet (<< 0.1.8-2),
octave-octcdf (<< 1.0.11-2), octave-octgpr (<< 1.1.4-3),
octave-odebvp (<< 1.0.5-2), octave-odepkg (<< 0.6.4-2),
- octave-optim (<< 1.0.4-2), octave-optiminterp (<< 0.3.2-2),
+ octave-optim (<< 1.0.4-2), octave-optiminterp (<< 0.3.2-1),
octave-outliers (<< 0.13.8-2), octave-parallel (<< 1.0.7-2),
octave-physicalconstants (<< 0.1.6-2), octave-plot (<< 1.0.6-2),
octave-signal (<< 1.0.8-2), octave-sockets (<< 1.0.5-2),
@@@ -56,8 -56,8 +56,8 @@@
octave-statistics (<< 1.0.7-1), octave-strings (<< 1.0.6-2),
octave-struct (<< 1.0.6-2), octave-symbolic (<< 1.0.7-2),
octave-time (<< 1.0.8-2), octave-tsa (<< 4.0.0-2), octave-vrml (<< 1.0.8-2),
- octave-zenity (<< 0.5.6-2)
- Description: GNU Octave language for numerical computations ([V_3_0:3.0:][V_3_1:3.1:] branch)
+ octave-zenity (<< 0.5.6-2):]
+ Description: GNU Octave language for numerical computations ([V_3_0:3.0:][V_3_2:3.2:] branch)
Octave is a (mostly Matlab (R) compatible) high-level language, primarily
intended for numerical computations. It provides a convenient command-line
interface for solving linear and nonlinear problems numerically.
@@@ -65,19 -65,16 +65,16 @@@
Octave uses some of the best and most respected numerical libraries as
balgen, dassl, eispack, fftpack, lapack, linpack, minpack, odepack,
ranlib, slatec-fn and villad. Octave can be dynamically extended with
- user-supplied C++ files.[V_3_1:
- .
- The recommended branch of Octave is 3.0. The 3.1 branch is
- experimental and is considered to be unstable.:]
+ user-supplied C++ files.
- Package: octave[V_3_0:3.0:][V_3_1:3.1:]-doc
+ Package: octave[V_3_0:3.0:][V_3_2:3.2:]-doc
Architecture: all
Section: doc
- Suggests: octave[V_3_0:3.0:][V_3_1:3.1:], xpdf | pdf-viewer
- Conflicts: octave-doc (<< 2.1)[V_3_0:, octave2.9-doc (<< 1:3):]
- Provides: octave-doc
- Replaces: octave-doc
- Description: PDF documentation on the GNU Octave language ([V_3_0:3.0:][V_3_1:3.1:] branch)
+ Suggests: octave[V_3_0:3.0:][V_3_2:3.2:], xpdf | pdf-viewer
+ Conflicts: octave-doc (<< 2.1)[V_3_0:, octave2.9-doc (<< 1:3):][V_3_2:, octave3.1-doc:]
+ Provides: octave-doc[V_3_2:, octave3.1-doc:]
+ Replaces: octave-doc[V_3_2:, octave3.1-doc:]
+ Description: PDF documentation on the GNU Octave language ([V_3_0:3.0:][V_3_2:3.2:] branch)
Octave is a (mostly Matlab (R) compatible) high-level language, primarily
intended for numerical computations. It provides a convenient command-line
interface for solving linear and nonlinear problems numerically.
@@@ -85,19 -82,16 +82,16 @@@
This package provides the following documentation in PDF format:
the FAQ, a reference card in a4, letter and legal formats, a document on the
C++ classes used by Octave, as well as the main octave documentation which
- is also included in info format in the octave[V_3_0:3.0:][V_3_1:3.1:]-info package.[V_3_1:
- .
- The recommended branch of Octave is 3.0. The 3.1 branch is
- experimental and is considered to be unstable.:]
+ is also included in info format in the octave[V_3_0:3.0:][V_3_2:3.2:]-info package.
- Package: octave[V_3_0:3.0:][V_3_1:3.1:]-htmldoc
+ Package: octave[V_3_0:3.0:][V_3_2:3.2:]-htmldoc
Architecture: all
Section: doc
- Suggests: octave[V_3_0:3.0:][V_3_1:3.1:], lynx | www-browser
- Conflicts: octave-htmldoc (<< 2.1), octave2.0-htmldoc[V_3_0:, octave2.9-htmldoc (<< 1:3):]
- Replaces: octave-htmldoc
- Provides: octave-htmldoc
- Description: HTML documentation on the GNU Octave language ([V_3_0:3.0:][V_3_1:3.1:] branch)
+ Suggests: octave[V_3_0:3.0:][V_3_2:3.2:], lynx | www-browser
+ Conflicts: octave-htmldoc (<< 2.1), octave2.0-htmldoc[V_3_0:, octave2.9-htmldoc (<< 1:3):][V_3_2:, octave3.1-htmldoc:]
+ Replaces: octave-htmldoc[V_3_2:, octave3.1-htmldoc:]
+ Provides: octave-htmldoc[V_3_2:, octave3.1-htmldoc:]
+ Description: HTML documentation on the GNU Octave language ([V_3_0:3.0:][V_3_2:3.2:] branch)
Octave is a (mostly Matlab (R) compatible) high-level language, primarily
intended for numerical computations. It provides a convenient command-line
interface for solving linear and nonlinear problems numerically.
@@@ -105,22 -99,19 +99,19 @@@
This package provides the following documentation in html format:
the FAQ, a document on the C++ classes used by Octave, as well as the main
octave documentation which is also included in info format in the main
- Octave package.[V_3_1:
- .
- The recommended branch of Octave is 3.0. The 3.1 branch is
- experimental and is considered to be unstable.:]
+ Octave package.
- Package: octave[V_3_0:3.0:][V_3_1:3.1:]-headers
+ Package: octave[V_3_0:3.0:][V_3_2:3.2:]-headers
Architecture: any
- Depends: octave[V_3_0:3.0:][V_3_1:3.1:] (= ${binary:Version}), ${gcc:Depends},
+ Depends: octave[V_3_0:3.0:][V_3_2:3.2:] (= ${binary:Version}), ${gcc:Depends},
libreadline5-dev, libncurses5-dev, libhdf5-serial-dev (>= 1.6.5)
| libhdf5-lam-dev (>= 1.6.5) | libhdf5-mpich-dev (>= 1.6.5) | libhdf5-openmpi-dev (>= 1.6.5),
libblas-dev, liblapack-dev, libfftw3-dev,
f2c [m68k]
- Conflicts: octave-headers (<< 2.1)[V_3_0:, octave2.9-headers (<< 1:3):]
- Provides: octave-headers
- Replaces: octave-headers
- Description: header files for the GNU Octave language ([V_3_0:3.0:][V_3_1:3.1:] branch)
+ Conflicts: octave-headers (<< 2.1)[V_3_0:, octave2.9-headers (<< 1:3):][V_3_2:, octave3.1-headers:]
+ Provides: octave-headers[V_3_2:, octave3.1-headers:]
+ Replaces: octave-headers[V_3_2:, octave3.1-headers:]
+ Description: header files for the GNU Octave language ([V_3_0:3.0:][V_3_2:3.2:] branch)
Octave is a (mostly Matlab (R) compatible) high-level language, primarily
intended for numerical computations. It provides a convenient command-line
interface for solving linear and nonlinear problems numerically.
@@@ -130,36 -121,30 +121,30 @@@
you do not need this package.
.
The package is architecture-specific as it contains machine-dependent
- compiler switches in the mkoctfile script.[V_3_1:
- .
- The recommended branch of Octave is 3.0. The 3.1 branch is
- experimental and is considered to be unstable.:]
+ compiler switches in the mkoctfile script.
- Package: octave[V_3_0:3.0:][V_3_1:3.1:]-emacsen
+ Package: octave[V_3_0:3.0:][V_3_2:3.2:]-emacsen
Architecture: all
- Depends: octave[V_3_0:3.0:][V_3_1:3.1:], emacs22 | xemacs21 | emacsen,
+ Depends: octave[V_3_0:3.0:][V_3_2:3.2:], emacs22 | xemacs21 | emacsen,
debianutils (>= 1.6)
- Conflicts: octave2.0-emacsen[V_3_0:, octave2.9-emacsen (<< 1:3):]
- Replaces: octave (<= 2.0.16-2)
- Provides: octave-emacsen
- Description: Emacs support for the GNU Octave language ([V_3_0:3.0:][V_3_1:3.1:] branch)
+ Conflicts: octave2.0-emacsen[V_3_0:, octave2.9-emacsen (<< 1:3):][V_3_2:, octave3.1-emacsen:]
+ Replaces: octave (<= 2.0.16-2)[V_3_2:, octave3.1-emacsen:]
+ Provides: octave-emacsen[V_3_2:, octave3.1-emacsen:]
+ Description: Emacs support for the GNU Octave language ([V_3_0:3.0:][V_3_2:3.2:] branch)
Octave is a (mostly Matlab (R) compatible) high-level language, primarily
intended for numerical computations. It provides a convenient command-line
interface for solving linear and nonlinear problems numerically.
.
This package provides the elisp files for the Octave modes for GNU Emacs
- and XEmacs.[V_3_1:
- .
- The recommended branch of Octave is 3.0. The 3.1 branch is
- experimental and is considered to be unstable.:]
+ and XEmacs.
- Package: octave[V_3_0:3.0:][V_3_1:3.1:]-info
+ Package: octave[V_3_0:3.0:][V_3_2:3.2:]-info
Architecture: all
- Depends: info (>= 3.12) | info-browser
- Conflicts: octave2.0-info[V_3_0:, octave2.9-info (<< 1:3):]
- Replaces: octave (<= 2.0.16-2)
- Provides: octave-info
- Description: GNU Info documentation on the GNU Octave language ([V_3_0:3.0:][V_3_1:3.1:] branch)
+ Depends: info (>= 3.22) | info-browser
+ Conflicts: octave2.0-info[V_3_0:, octave2.9-info (<< 1:3):][V_3_2:, octave3.1-info:]
+ Replaces: octave (<= 2.0.16-2)[V_3_2:, octave3.1-info:]
+ Provides: octave-info[V_3_2:, octave3.1-info:]
+ Description: GNU Info documentation on the GNU Octave language ([V_3_0:3.0:][V_3_2:3.2:] branch)
Octave is a (mostly Matlab (R) compatible) high-level language, primarily
intended for numerical computations. It provides a convenient command-line
interface for solving linear and nonlinear problems numerically.
@@@ -167,10 -152,7 +152,7 @@@
This package provides the following documentation in info format:
the FAQ, a document on the C++ classes used by Octave, as well as the main
octave documentation which is needed for the 'help -i foo' command within
- Octave.[V_3_1:
- .
- The recommended branch of Octave is 3.0. The 3.1 branch is
- experimental and is considered to be unstable.:]
+ Octave.
[V_3_0:
Package: octave2.9
@@@ -224,12 -206,12 +206,12 @@@ Description: GNU Info documentation on
can be removed.
:]
- Package: octave[V_3_0:3.0:][V_3_1:3.1:]-dbg
+ Package: octave[V_3_0:3.0:][V_3_2:3.2:]-dbg
Section: debug
Priority: extra
Architecture: any
- Depends: octave[V_3_0:3.0:][V_3_1:3.1:] (=${binary:Version})
- Description: Debug symbols for octave[V_3_0:3.0:][V_3_1:3.1:]
+ Depends: octave[V_3_0:3.0:][V_3_2:3.2:] (=${binary:Version})
+ Description: Debug symbols for octave[V_3_0:3.0:][V_3_2:3.2:]
Octave is a (mostly Matlab (R) compatible) high-level language, primarily
intended for numerical computations. It provides a convenient command-line
interface for solving linear and nonlinear problems numerically.
@@@ -241,11 -223,11 +223,11 @@@
.
This package provides the debug symbols.
- Package: octave[V_3_0:3.0:][V_3_1:3.1:]-common
+ Package: octave[V_3_0:3.0:][V_3_2:3.2:]-common
Section: devel
Priority: extra
Architecture: all
- Description: architecture-independent files for octave[V_3_0:3.0:][V_3_1:3.1:]
+ Description: architecture-independent files for octave[V_3_0:3.0:][V_3_2:3.2:]
Octave is a (mostly Matlab (R) compatible) high-level language, primarily
intended for numerical computations. It provides a convenient command-line
interface for solving linear and nonlinear problems numerically.
--
octave
More information about the Pkg-octave-commit
mailing list