[Pkg-octave-commit] r2677 - in octave/trunk/debian: . in patches
Rafael Laboissiere
rafael at alioth.debian.org
Mon Feb 16 15:36:59 UTC 2009
Author: rafael
Date: 2009-02-16 15:36:59 +0000 (Mon, 16 Feb 2009)
New Revision: 2677
Removed:
octave/trunk/debian/patches/50_OCTAVEHOME-texi.dpatch
octave/trunk/debian/patches/50_automatic-replot-docstring.dpatch
octave/trunk/debian/patches/50_build-octave-faq.dpatch
octave/trunk/debian/patches/50_clean-pdf-docs.dpatch
octave/trunk/debian/patches/50_compile-with-g++-4.3.dpatch
octave/trunk/debian/patches/50_drop-lo-manpages.dpatch
octave/trunk/debian/patches/50_fixed-freqz.dpatch
octave/trunk/debian/patches/50_g++4.1-fixes.dpatch
octave/trunk/debian/patches/50_incomplete_gamma.dpatch
octave/trunk/debian/patches/50_lgamma_doc.dpatch
octave/trunk/debian/patches/50_rename-octave-tags.dpatch
octave/trunk/debian/patches/50_return-deffn.dpatch
octave/trunk/debian/patches/50_syscalls-test-sleep.dpatch
octave/trunk/debian/patches/imshow_only_handles_octave_images.dpatch
octave/trunk/debian/patches/sane-file-stat-return.dpatch
Modified:
octave/trunk/debian/changelog
octave/trunk/debian/in/00list
octave/trunk/debian/in/NEWS
octave/trunk/debian/in/PACKAGE-htmldoc.doc-base.faq
octave/trunk/debian/in/PACKAGE.conf
octave/trunk/debian/in/control
octave/trunk/debian/in/copyright
octave/trunk/debian/in/watch
Log:
Drop all traces of octave2.1, which will be removed from squeeze
Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog 2009-02-13 21:37:16 UTC (rev 2676)
+++ octave/trunk/debian/changelog 2009-02-16 15:36:59 UTC (rev 2677)
@@ -6,6 +6,18 @@
* debian/patches/real-no-history.dpatch: Add patch for only reading and
saving history if Vsaving_history is true. Thanks to John Eaton for
the patch and the suggestions. Closes: #514802.
+ * The removal of octave2.1 from squeeze has been requested. The
+ following files are affected:
+ + debian/rules, debian/in/00list, debian/in/NEWS,
+ debian/in/PACKAGE-htmldoc.doc-base.faq, debian/in/PACKAGE.conf,
+ debian/in/control, debian/in/copyright, debian/in/watch: Remove all
+ inclusions conditional on 2.1
+ + Dropped patches: 50_OCTAVEHOME-texi, 50_automatic-replot-docstring,
+ 50_build-octave-faq, 50_clean-pdf-docs, 50_compile-with-g++-4.3,
+ 50_drop-lo-manpages, 50_fixed-freqz, 50_g++4.1-fixes,
+ 50_incomplete_gamma, 50_lgamma_doc, 50_rename-octave-tags,
+ 50_return-deffn, 50_syscalls-test-sleep,
+ imshow_only_handles_octave_images, sane-file-stat-return
-- Rafael Laboissiere <rafael at debian.org> Fri, 13 Feb 2009 19:52:37 +0100
Modified: octave/trunk/debian/in/00list
===================================================================
--- octave/trunk/debian/in/00list 2009-02-13 21:37:16 UTC (rev 2676)
+++ octave/trunk/debian/in/00list 2009-02-16 15:36:59 UTC (rev 2677)
@@ -1,19 +1,5 @@
-[V_2_1:
-50_lgamma_doc.dpatch
-50_incomplete_gamma.dpatch
-50_g++4.1-fixes.dpatch
-50_automatic-replot-docstring
-50_return-deffn
-50_fixed-freqz
-50_OCTAVEHOME-texi.dpatch
+[V_3_0:
50_octave-bug-tempfile
-50_clean-pdf-docs
-50_rename-octave-tags
-50_drop-lo-manpages
-50_compile-with-g++-4.3
-50_build-octave-faq
-:][V_3_0:
-50_octave-bug-tempfile
50_fix_handle_for_plotyy.dpatch
no_pdf_in_print.dpatch
dont_set_helvetica.dpatch
Modified: octave/trunk/debian/in/NEWS
===================================================================
--- octave/trunk/debian/in/NEWS 2009-02-13 21:37:16 UTC (rev 2676)
+++ octave/trunk/debian/in/NEWS 2009-02-16 15:36:59 UTC (rev 2677)
@@ -1,13 +1,5 @@
-[V_2_1:octave2.1 (1:2.1.73-18) unstable; urgency=low
+[V_3_0:octave3.0 (3.0.0-1) unstable; urgency=low
- The recommended branch of Octave is 3.0. The 2.1 branch is now
- deprecated and the octave2.1* packages will be dropped from Debian
- after the release of Lenny. Users should migrate all their scripts to
- Octave 3.0.*. See /usr/share/doc/octave3.0/NEWS.gz for details.
-
- -- Rafael Laboissiere <rafael at debian.org> Thu, 06 Mar 2008 15:25:45 +0100
-:][V_3_0:octave3.0 (3.0.0-1) unstable; urgency=low
-
This is the real 3.0 release of Octave.
-- Rafael Laboissiere <rafael at debian.org> Sat, 22 Dec 2007 13:40:25 +0100
Modified: octave/trunk/debian/in/PACKAGE-htmldoc.doc-base.faq
===================================================================
--- octave/trunk/debian/in/PACKAGE-htmldoc.doc-base.faq 2009-02-13 21:37:16 UTC (rev 2676)
+++ octave/trunk/debian/in/PACKAGE-htmldoc.doc-base.faq 2009-02-16 15:36:59 UTC (rev 2677)
@@ -9,5 +9,5 @@
Section: Science/Mathematics
Format: HTML
-Index: /usr/share/doc/@PACKAGE at -htmldoc/faq/[V_2_1:index:][V_3_0:[V_3_1:Octave-FAQ:]:].html
+Index: /usr/share/doc/@PACKAGE at -htmldoc/faq/Octave-FAQ.html
Files: /usr/share/doc/@PACKAGE at -htmldoc/faq/*.html
\ No newline at end of file
Modified: octave/trunk/debian/in/PACKAGE.conf
===================================================================
--- octave/trunk/debian/in/PACKAGE.conf 2009-02-13 21:37:16 UTC (rev 2676)
+++ octave/trunk/debian/in/PACKAGE.conf 2009-02-16 15:36:59 UTC (rev 2677)
@@ -7,10 +7,6 @@
### directories below /usr/local/share/octave/site-m/. Please see the Octave
### documentation for other variables you might want to set here.
-[V_2_1:
-LOADPATH = [ ":/usr/local/share/octave/site-m//", LOADPATH ];
-:]
-
[V_3_1:
[V_3_0:
## Configure readline using the file inputrc in the Octave startup
Modified: octave/trunk/debian/in/control
===================================================================
--- octave/trunk/debian/in/control 2009-02-13 21:37:16 UTC (rev 2676)
+++ octave/trunk/debian/in/control 2009-02-16 15:36:59 UTC (rev 2677)
@@ -1,5 +1,5 @@
[EMACS: -*- debian-control -*- :]
-Source: octave[V_2_1:2.1:][V_3_0:3.0:][V_3_1:3.1:]
+Source: octave[V_3_0:3.0:][V_3_1:3.1:]
Section: math
Priority: optional
Maintainer: Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>
@@ -15,25 +15,25 @@
less, dpatch, slice[V_3_1:[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:][V_2_1:, dejagnu:]
+ libglu1-mesa-dev, libgraphicsmagick++1-dev, libftgl-dev:]
Standards-Version: 3.8.0
Homepage: http://www.octave.org/
Vcs-Svn: svn://svn.debian.org/svn/pkg-octave/octave/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-octave/octave/
-Package: octave[V_2_1:2.1:][V_3_0:3.0:][V_3_1:3.1:]
+Package: octave[V_3_0:3.0:][V_3_1:3.1:]
Architecture: any
-Depends: ${shlibs:Depends}, texinfo, octave[V_2_1:2.1:][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_1:3.1:]-common (= ${source:Version})
Recommends: gnuplot, libatlas3gf-base
-Suggests: octave[V_2_1:2.1:][V_3_0:3.0:][V_3_1:3.1:]-info,
- octave[V_2_1:2.1:][V_3_0:3.0:][V_3_1:3.1:]-doc,
- octave[V_2_1:2.1:][V_3_0:3.0:][V_3_1:3.1:]-htmldoc,
- octave[V_2_1:2.1:][V_3_0:3.0:][V_3_1:3.1:]-headers (= ${binary:Version}),
- octave[V_2_1:2.1:][V_3_0:3.0:][V_3_1:3.1:]-emacsen
+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
-Description: GNU Octave language for numerical computations ([V_2_1:2.1:][V_3_0:3.0:][V_3_1:3.1:] branch)
+Description: GNU Octave language for numerical computations ([V_3_0:3.0:][V_3_1:3.1:] 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.
@@ -41,23 +41,19 @@
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_2_1:
+ user-supplied C++ files.[V_3_1:
.
- The recommended branch of Octave is 3.0. Please, use the octave3.0
- package instead of this one, since it will be dropped after the Debian
- lenny release.:][V_3_1:
- .
The recommended branch of Octave is 3.0. The 3.1 branch is
experimental and is considered to be unstable.:]
-Package: octave[V_2_1:2.1:][V_3_0:3.0:][V_3_1:3.1:]-doc
+Package: octave[V_3_0:3.0:][V_3_1:3.1:]-doc
Architecture: all
Section: doc
-Suggests: octave[V_2_1:2.1:][V_3_0:3.0:][V_3_1:3.1:], xpdf | pdf-viewer
+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_2_1:2.1:][V_3_0:3.0:][V_3_1:3.1:] branch)
+Description: PDF documentation on the GNU Octave language ([V_3_0:3.0:][V_3_1:3.1:] 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,24 +61,20 @@
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_2_1:2.1:][V_3_0:3.0:][V_3_1:3.1:]-info package.[V_2_1:
+ 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. Please, use the octave3.0-doc
- package instead of this one, since it will be dropped after the Debian
- lenny release.:][V_3_1:
- .
The recommended branch of Octave is 3.0. The 3.1 branch is
experimental and is considered to be unstable.:]
-Package: octave[V_2_1:2.1:][V_3_0:3.0:][V_3_1:3.1:]-htmldoc
+Package: octave[V_3_0:3.0:][V_3_1:3.1:]-htmldoc
Architecture: all
Section: doc
-Suggests: octave[V_2_1:2.1:][V_3_0:3.0:][V_3_1:3.1:], lynx | www-browser
+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_2_1:2.1:][V_3_0:3.0:][V_3_1:3.1:] branch)
+Description: HTML documentation on the GNU Octave language ([V_3_0:3.0:][V_3_1:3.1:] 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.
@@ -90,18 +82,14 @@
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_2_1:
+ Octave package.[V_3_1:
.
- The recommended branch of Octave is 3.0. Please, use the octave3.0-htmldoc
- package instead of this one, since it will be dropped after the Debian
- lenny release.:][V_3_1:
- .
The recommended branch of Octave is 3.0. The 3.1 branch is
experimental and is considered to be unstable.:]
-Package: octave[V_2_1:2.1:][V_3_0:3.0:][V_3_1:3.1:]-headers
+Package: octave[V_3_0:3.0:][V_3_1:3.1:]-headers
Architecture: any
-Depends: octave[V_2_1:2.1:][V_3_0:3.0:][V_3_1:3.1:] (= ${binary:Version}), gfortran,
+Depends: octave[V_3_0:3.0:][V_3_1:3.1:] (= ${binary:Version}), gfortran,
gcc [!arm], gcc-4.1 [arm], g++ [!arm], g++-4.1 [arm],
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),
@@ -110,7 +98,7 @@
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_2_1:2.1:][V_3_0:3.0:][V_3_1:3.1:] branch)
+Description: header files for the GNU Octave language ([V_3_0:3.0:][V_3_1:3.1:] 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.
@@ -120,44 +108,36 @@
you do not need this package.
.
The package is architecture-specific as it contains machine-dependent
- compiler switches in the mkoctfile script.[V_2_1:
+ compiler switches in the mkoctfile script.[V_3_1:
.
- The recommended branch of Octave is 3.0. Please, use the octave3.0-headers
- package instead of this one, since it will be dropped after the Debian
- lenny release.:][V_3_1:
- .
The recommended branch of Octave is 3.0. The 3.1 branch is
experimental and is considered to be unstable.:]
-Package: octave[V_2_1:2.1:][V_3_0:3.0:][V_3_1:3.1:]-emacsen
+Package: octave[V_3_0:3.0:][V_3_1:3.1:]-emacsen
Architecture: all
-Depends: octave[V_2_1:2.1:][V_3_0:3.0:][V_3_1:3.1:], emacs22 | xemacs21 | emacsen,
+Depends: octave[V_3_0:3.0:][V_3_1:3.1:], 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_2_1:2.1:][V_3_0:3.0:][V_3_1:3.1:] branch)
+Description: Emacs support for the GNU Octave language ([V_3_0:3.0:][V_3_1:3.1:] 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_2_1:
+ and XEmacs.[V_3_1:
.
- The recommended branch of Octave is 3.0. Please, use the octave3.0-emacsen
- package instead of this one, since it will be dropped after the Debian
- lenny release.:][V_3_1:
- .
The recommended branch of Octave is 3.0. The 3.1 branch is
experimental and is considered to be unstable.:]
-Package: octave[V_2_1:2.1:][V_3_0:3.0:][V_3_1:3.1:]-info
+Package: octave[V_3_0:3.0:][V_3_1:3.1:]-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_2_1:2.1:][V_3_0:3.0:][V_3_1:3.1:] branch)
+Description: GNU Info documentation on the GNU Octave language ([V_3_0:3.0:][V_3_1:3.1:] 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.
@@ -165,12 +145,8 @@
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_2_1:
+ Octave.[V_3_1:
.
- The recommended branch of Octave is 3.0. Please, use the octave3.0-info
- package instead of this one, since it will be dropped after the Debian
- lenny release.:][V_3_1:
- .
The recommended branch of Octave is 3.0. The 3.1 branch is
experimental and is considered to be unstable.:]
@@ -226,12 +202,12 @@
can be removed.
:]
-Package: octave[V_2_1:2.1:][V_3_0:3.0:][V_3_1:3.1:]-dbg
+Package: octave[V_3_0:3.0:][V_3_1:3.1:]-dbg
Section: devel
Priority: extra
Architecture: any
-Depends: octave[V_2_1:2.1:][V_3_0:3.0:][V_3_1:3.1:] (=${binary:Version})
-Description: Debug symbols for octave[V_2_1:2.1:][V_3_0:3.0:][V_3_1:3.1:]
+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:]
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.
@@ -243,12 +219,12 @@
.
This package provides the debug symbols.
-Package: octave[V_2_1:2.1:][V_3_0:3.0:][V_3_1:3.1:]-common
+Package: octave[V_3_0:3.0:][V_3_1:3.1:]-common
Section: devel
Priority: extra
Architecture: all
-Depends: octave[V_2_1:2.1:][V_3_0:3.0:][V_3_1:3.1:] (>= ${source:Version})
-Description: architecture-independent files for octave[V_2_1:2.1:][V_3_0:3.0:][V_3_1:3.1:]
+Depends: octave[V_3_0:3.0:][V_3_1:3.1:] (>= ${source:Version})
+Description: architecture-independent files for octave[V_3_0:3.0:][V_3_1:3.1:]
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.
Modified: octave/trunk/debian/in/copyright
===================================================================
--- octave/trunk/debian/in/copyright 2009-02-13 21:37:16 UTC (rev 2676)
+++ octave/trunk/debian/in/copyright 2009-02-16 15:36:59 UTC (rev 2677)
@@ -19,7 +19,7 @@
Octave is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
- Software Foundation; either version [V_2_1:2:][V_3_0:3:][V_3_1:3:], or (at your option) any later
+ Software Foundation; either version 3, or (at your option) any later
version.
Octave is distributed in the hope that it will be useful, but WITHOUT
@@ -33,4 +33,4 @@
02110-1301, USA.
On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-[V_2_1:2:][V_3_0:3:][V_3_1:3:]'.
+Public License can be found in `/usr/share/common-licenses/GPL-3'.
Modified: octave/trunk/debian/in/watch
===================================================================
--- octave/trunk/debian/in/watch 2009-02-13 21:37:16 UTC (rev 2676)
+++ octave/trunk/debian/in/watch 2009-02-16 15:36:59 UTC (rev 2677)
@@ -1,3 +1,3 @@
version=3
opts=pasv \
-ftp://ftp.octave.org/pub/octave/[V_2_1:obsolete/:][V_3_1:bleeding-edge/:]octave-([\d\.]+)\.tar\.gz
+ftp://ftp.octave.org/pub/octave/[V_3_1:bleeding-edge/:]octave-([\d\.]+)\.tar\.gz
Deleted: octave/trunk/debian/patches/50_OCTAVEHOME-texi.dpatch
===================================================================
--- octave/trunk/debian/patches/50_OCTAVEHOME-texi.dpatch 2009-02-13 21:37:16 UTC (rev 2676)
+++ octave/trunk/debian/patches/50_OCTAVEHOME-texi.dpatch 2009-02-16 15:36:59 UTC (rev 2677)
@@ -1,35 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## -*- diff -*-
-## 50_OCTAVEHOME-2.9.dpatch by Rafael Laboissiere <rafael at debian.org>
-##
-## DP: Correct value for OCTAVEHOME in Debian systems
-
- at DPATCH@
-
---- octave2.1-2.1.73.orig/doc/conf.texi 2006-07-28 19:31:58.000000000 +0200
-+++ octave2.1-2.1.73/doc/conf.texi 2006-08-18 22:14:48.441613384 +0200
-@@ -3,5 +3,5 @@
- @c For copying conditions, see the file gpl.texi.
-
- @set VERSION 2.1.x
-- at set OCTAVEHOME /usr/local
-+ at set OCTAVEHOME /usr
- @set TARGETHOSTTYPE i586-pc-linux-gnu
---- octave2.1-2.1.73.orig/doc/interpreter/conf.texi 2006-07-28 19:31:58.000000000 +0200
-+++ octave2.1-2.1.73/doc/interpreter/conf.texi 2006-08-18 22:14:48.444612928 +0200
-@@ -3,5 +3,5 @@
- @c For copying conditions, see the file gpl.texi.
-
- @set VERSION 2.1.x
-- at set OCTAVEHOME /usr/local
-+ at set OCTAVEHOME /usr
- @set TARGETHOSTTYPE i586-pc-linux-gnu
---- octave2.1-2.1.73.orig/doc/liboctave/conf.texi 2006-07-28 19:31:58.000000000 +0200
-+++ octave2.1-2.1.73/doc/liboctave/conf.texi 2006-08-18 22:14:48.447612472 +0200
-@@ -3,5 +3,5 @@
- @c For copying conditions, see the file gpl.texi.
-
- @set VERSION 2.1.x
-- at set OCTAVEHOME /usr/local
-+ at set OCTAVEHOME /usr
- @set TARGETHOSTTYPE i586-pc-linux-gnu
Deleted: octave/trunk/debian/patches/50_automatic-replot-docstring.dpatch
===================================================================
--- octave/trunk/debian/patches/50_automatic-replot-docstring.dpatch 2009-02-13 21:37:16 UTC (rev 2676)
+++ octave/trunk/debian/patches/50_automatic-replot-docstring.dpatch 2009-02-16 15:36:59 UTC (rev 2677)
@@ -1,30 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## -*- diff -*-
-## 50_automatic-replot-docstring.dpatch by Rafael Laboissiere <rafael at debian.org>
-##
-## Introduce documentation string for the varaible automatic_replot
-
- at DPATCH@
-
---- octave2.1-2.1.73.orig/doc/interpreter/plot.txi
-+++ octave2.1-2.1.73/doc/interpreter/plot.txi
-@@ -341,6 +341,8 @@
- any arguments.
- @end deffn
-
-+ at DOCSTRING(automatic_replot)
-+
- Note that NaN values in the plot data are automatically omitted, and
- Inf values are converted to a very large value before calling gnuplot.
-
---- octave2.1-2.1.73.orig/doc/interpreter/var.txi
-+++ octave2.1-2.1.73/doc/interpreter/var.txi
-@@ -283,7 +283,7 @@
- Default value: @code{"+ "}.
-
- @item automatic_replot
-- at xref{Two-Dimensional Plotting}.
-+ at xref{Low-Level plotting commands}.
-
- Default value: 0.
-
Deleted: octave/trunk/debian/patches/50_build-octave-faq.dpatch
===================================================================
--- octave/trunk/debian/patches/50_build-octave-faq.dpatch 2009-02-13 21:37:16 UTC (rev 2676)
+++ octave/trunk/debian/patches/50_build-octave-faq.dpatch 2009-02-16 15:36:59 UTC (rev 2677)
@@ -1,22 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## -*- diff -*-
-## 50_build-octave-faq.dpatch by Rafael Laboissiere <rafael at debian.org>
-##
-## DP: Build correctly the PS form of the Octave-FAQ documentation
-
- at DPATCH@
-
---- octave2.1-2.1.73.orig/doc/faq/Makefile.in
-+++ octave2.1-2.1.73/doc/faq/Makefile.in
-@@ -43,9 +43,9 @@
- -$(MAKEINFO) -I$(srcdir) $<
-
- Octave-FAQ.dvi: $(TEXINFO)
-- -TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):" $(TEXI2DVI) $<
-+ -TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):" TEX=tex $(TEXI2DVI) $<
-
--Octave-FAQ.ps: $(TEXINFO)
-+Octave-FAQ.ps: Octave-FAQ.dvi
- -dvips -o $@ $<
-
- Octave-FAQ.pdf: $(TEXINFO)
Deleted: octave/trunk/debian/patches/50_clean-pdf-docs.dpatch
===================================================================
--- octave/trunk/debian/patches/50_clean-pdf-docs.dpatch 2009-02-13 21:37:16 UTC (rev 2676)
+++ octave/trunk/debian/patches/50_clean-pdf-docs.dpatch 2009-02-16 15:36:59 UTC (rev 2677)
@@ -1,30 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## -*- diff -*-
-## 50_clean-pdf-docs.dpatch by Rafael Laboissiere <rafael at debian.org>
-##
-## DP: Clean PDF files in doc/ not cleaned by the maintainer-clean target
-
- at DPATCH@
-
---- octave2.1-2.1.73.orig/doc/faq/Makefile.in
-+++ octave2.1-2.1.73/doc/faq/Makefile.in
-@@ -79,7 +79,7 @@
-
- maintainer-clean: distclean
- rm -f tags TAGS Octave-FAQ.info Octave-FAQ.info-*
-- rm -f Octave-FAQ.dvi Octave-FAQ.ps
-+ rm -f Octave-FAQ.dvi Octave-FAQ.ps Octave-FAQ.pdf
- rm -rf HTML
- .PHONY: maintainer-clean
-
---- octave2.1-2.1.73.orig/doc/liboctave/Makefile.in
-+++ octave2.1-2.1.73/doc/liboctave/Makefile.in
-@@ -95,7 +95,7 @@
-
- maintainer-clean: distclean
- rm -f tags TAGS liboctave.info liboctave.info-*
-- rm -f liboctave.dvi liboctave.ps
-+ rm -f liboctave.dvi liboctave.ps liboctave.pdf
- rm -rf HTML
- .PHONY: maintainer-clean
-
Deleted: octave/trunk/debian/patches/50_compile-with-g++-4.3.dpatch
===================================================================
--- octave/trunk/debian/patches/50_compile-with-g++-4.3.dpatch 2009-02-13 21:37:16 UTC (rev 2676)
+++ octave/trunk/debian/patches/50_compile-with-g++-4.3.dpatch 2009-02-16 15:36:59 UTC (rev 2677)
@@ -1,137 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## -*- diff -*-
-## 50_compile-with-g++-4.3.dpatch by Rafael Laboissiere <rafael at debian.org>
-##
-## DP: Fixes for compiling octave2.1 with g++-4.3
-
- at DPATCH@
-diff -urNad octave2.1-2.1.73~/doc/interpreter/munge-texi.cc octave2.1-2.1.73/doc/interpreter/munge-texi.cc
---- octave2.1-2.1.73~/doc/interpreter/munge-texi.cc 2005-05-02 13:15:47.000000000 +0200
-+++ octave2.1-2.1.73/doc/interpreter/munge-texi.cc 2008-04-08 12:03:29.000000000 +0200
-@@ -29,6 +29,8 @@
- #include <iostream>
- #include <fstream>
- #include <string>
-+#include <cstring>
-+#include <cstdlib>
- #include <map>
-
- static const char doc_delim = ' ';
-diff -urNad octave2.1-2.1.73~/liboctave/chMatrix.cc octave2.1-2.1.73/liboctave/chMatrix.cc
---- octave2.1-2.1.73~/liboctave/chMatrix.cc 2005-05-02 13:16:21.000000000 +0200
-+++ octave2.1-2.1.73/liboctave/chMatrix.cc 2008-04-08 12:02:13.000000000 +0200
-@@ -30,6 +30,8 @@
- #include <config.h>
- #endif
-
-+#include <cstring>
-+
- #include <iostream>
- #include <string>
-
-diff -urNad octave2.1-2.1.73~/liboctave/data-conv.cc octave2.1-2.1.73/liboctave/data-conv.cc
---- octave2.1-2.1.73~/liboctave/data-conv.cc 2005-05-02 13:16:22.000000000 +0200
-+++ octave2.1-2.1.73/liboctave/data-conv.cc 2008-04-08 12:02:13.000000000 +0200
-@@ -26,6 +26,7 @@
- #endif
-
- #include <cctype>
-+#include <cstdlib>
-
- #include <iostream>
-
-diff -urNad octave2.1-2.1.73~/liboctave/lo-utils.cc octave2.1-2.1.73/liboctave/lo-utils.cc
---- octave2.1-2.1.73~/liboctave/lo-utils.cc 2005-05-02 13:16:26.000000000 +0200
-+++ octave2.1-2.1.73/liboctave/lo-utils.cc 2008-04-08 12:02:13.000000000 +0200
-@@ -29,6 +29,7 @@
- #include <climits>
- #include <cstdlib>
- #include <cstdio>
-+#include <cstring>
-
- #include <string>
-
-diff -urNad octave2.1-2.1.73~/liboctave/oct-env.cc octave2.1-2.1.73/liboctave/oct-env.cc
---- octave2.1-2.1.73~/liboctave/oct-env.cc 2005-05-02 13:16:27.000000000 +0200
-+++ octave2.1-2.1.73/liboctave/oct-env.cc 2008-04-08 12:02:13.000000000 +0200
-@@ -43,6 +43,7 @@
-
- #include <cctype>
- #include <cstdlib>
-+#include <cstring>
-
- #include <string>
-
-diff -urNad octave2.1-2.1.73~/liboctave/oct-sort.cc octave2.1-2.1.73/liboctave/oct-sort.cc
---- octave2.1-2.1.73~/liboctave/oct-sort.cc 2005-05-02 13:16:28.000000000 +0200
-+++ octave2.1-2.1.73/liboctave/oct-sort.cc 2008-04-08 12:02:13.000000000 +0200
-@@ -84,6 +84,8 @@
- #include <config.h>
- #endif
-
-+#include <cstdlib>
-+
- #include "lo-mappers.h"
- #include "quit.h"
- #include "oct-sort.h"
-diff -urNad octave2.1-2.1.73~/src/DLD-FUNCTIONS/sort.cc octave2.1-2.1.73/src/DLD-FUNCTIONS/sort.cc
---- octave2.1-2.1.73~/src/DLD-FUNCTIONS/sort.cc 2006-03-20 22:11:03.000000000 +0100
-+++ octave2.1-2.1.73/src/DLD-FUNCTIONS/sort.cc 2008-04-08 12:02:13.000000000 +0200
-@@ -26,6 +26,8 @@
- #include <config.h>
- #endif
-
-+#include <vector>
-+
- #include "lo-mappers.h"
- #include "quit.h"
-
-@@ -294,7 +296,7 @@
- template class octave_sort<vec_index<unsigned EIGHT_BYTE_INT> *>;
-
- template <>
--static octave_value
-+/* static */ octave_value
- mx_sort (ArrayN<double> &m, int dim, sortmode mode)
- {
- octave_value retval;
-@@ -431,7 +433,7 @@
- }
-
- template <>
--static octave_value_list
-+/* static */ octave_value_list
- mx_sort_indexed (ArrayN<double> &m, int dim, sortmode mode)
- {
- octave_value_list retval;
-diff -urNad octave2.1-2.1.73~/src/pr-output.cc octave2.1-2.1.73/src/pr-output.cc
---- octave2.1-2.1.73~/src/pr-output.cc 2005-05-02 13:17:17.000000000 +0200
-+++ octave2.1-2.1.73/src/pr-output.cc 2008-04-08 12:02:13.000000000 +0200
-@@ -32,6 +32,7 @@
-
- #include <iomanip>
- #include <iostream>
-+#include <sstream>
- #include <string>
-
- #include "Array-util.h"
-@@ -1602,7 +1603,7 @@
- }
-
- template <>
--static inline void
-+/* static */ inline void
- pr_plus_format (std::ostream& os, const Complex& c)
- {
- double rp = c.real ();
-diff -urNad octave2.1-2.1.73~/src/unwind-prot.cc octave2.1-2.1.73/src/unwind-prot.cc
---- octave2.1-2.1.73~/src/unwind-prot.cc 2005-05-02 13:17:20.000000000 +0200
-+++ octave2.1-2.1.73/src/unwind-prot.cc 2008-04-08 12:02:13.000000000 +0200
-@@ -30,6 +30,7 @@
- #endif
-
- #include <cstddef>
-+#include <cstring>
-
- #include "CMatrix.h"
-
Deleted: octave/trunk/debian/patches/50_drop-lo-manpages.dpatch
===================================================================
--- octave/trunk/debian/patches/50_drop-lo-manpages.dpatch 2009-02-13 21:37:16 UTC (rev 2676)
+++ octave/trunk/debian/patches/50_drop-lo-manpages.dpatch 2009-02-16 15:36:59 UTC (rev 2677)
@@ -1,52 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## -*- diff -*-
-## 50_drop-lo-manpages.dpatch by Rafael Laboissiere <rafael at debian.org>
-
- at DPATCH@
-
-# HG changeset patch
-# User Rafael Laboissiere <rafael at debian.org>
-# Date 1202453731 -3600
-# Node ID 8aac910c2ea0b6f2480c39359dcdd6766afc0f75
-# Parent 1032e24f199f6679577c9f73af138913705d27d5
-Drop .LO macros from manpages
-
-The .LO are not documented anywhere and processing the manpages through man
-(e.g. "man --warnings -l octave.1") yields:
-
-<standard input>:20: warning: `LO' not defined
-
-diff -r 1032e24f199f -r 8aac910c2ea0 doc/ChangeLog
---- a/doc/ChangeLog Thu Feb 07 22:36:11 2008 -0500
-+++ b/doc/ChangeLog Fri Feb 08 07:55:31 2008 +0100
-@@ -1,1 +1,6 @@ 2008-02-07 David Bateman <dbateman at fre
-+2008-02-08 Rafael Laboissiere <rafael at debian.org>
-+
-+ * interpreter/octave.1: Dropped unknow LO macro
-+ * interpreter/octave-bug.1: Likewise
-+
- 2007-12-21 John W. Eaton <jwe at octave.org>
-
- Version 3.0.0 released.
-diff -r 1032e24f199f -r 8aac910c2ea0 doc/interpreter/octave-bug.1
---- a/doc/interpreter/octave-bug.1 Thu Feb 07 22:36:11 2008 -0500
-+++ b/doc/interpreter/octave-bug.1 Fri Feb 08 07:55:31 2008 +0100
-@@ -19,7 +19,6 @@
- .\" This page was contributed by Dirk Eddelbuettel <edd at debian.org>
- .\"
- .TH octave-bug 1 "6 March 2000" GNU
--.LO 1
- .SH NAME
- octave-bug \- report a bug in GNU Octave
- .SH SYNOPSIS
-diff -r 1032e24f199f -r 8aac910c2ea0 doc/interpreter/octave.1
---- a/doc/interpreter/octave.1 Thu Feb 07 22:36:11 2008 -0500
-+++ b/doc/interpreter/octave.1 Fri Feb 08 07:55:31 2008 +0100
-@@ -17,7 +17,6 @@
- .\" <http://www.gnu.org/licenses/>.
- .\"
- .TH Octave 1 "Jan 8 1996"
--.LO 1
- .SH NAME
- octave \- A high-level interactive language for numerical computations.
- .SH SYNOPSIS
Deleted: octave/trunk/debian/patches/50_fixed-freqz.dpatch
===================================================================
--- octave/trunk/debian/patches/50_fixed-freqz.dpatch 2009-02-13 21:37:16 UTC (rev 2676)
+++ octave/trunk/debian/patches/50_fixed-freqz.dpatch 2009-02-16 15:36:59 UTC (rev 2677)
@@ -1,70 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## -*- diff -*-
-## 50_fixed-freqz.dpatch by Rafael Laboissiere <rafael at debian.org>
-##
-## DP: Fixed freqz.m (patch taken from upstream CVS)
-
- at DPATCH@
-
---- octave2.1-2.1.73.orig/scripts/signal/freqz.m
-+++ octave2.1-2.1.73/scripts/signal/freqz.m
-@@ -84,7 +84,7 @@
- region = Fs = [];
- elseif (nargin == 4)
- Fs = [];
-- if (! isstr (region) && ! isempty (region))
-+ if (! ischar (region) && ! isempty (region))
- Fs = region;
- region = [];
- endif
-@@ -114,26 +114,27 @@
- endif
- endif
-
-- a = a(:).';
-- b = b(:).';
-+ a = a(:);
-+ b = b(:);
-
- if (! isscalar (n)) ## Explicit frequency vector given
- w = f = n;
- if (nargin == 4) ## Sampling rate Fs was specified
- w = 2*pi*f/Fs;
- endif
-- hb = polyval (fliplr(b), exp(-j*w));
-- ha = polyval (fliplr(a), exp(-j*w));
-+ hb = polyval (fliplr(b), exp(j*w));
-+ ha = polyval (fliplr(a), exp(j*w));
- elseif (strcmp (region, "whole"))
-- f = Fs * (0:n-1) / n;
-- ## polyval(fliplr(P),exp(-jw)) is O(p n) and fft(x) is O(n log(n)), where p is the
-- ## order of the the polynomial P. For small p it would be faster to use polyval
-- ## but in practice the overhead for polyval is much higher and the little bit of
-- ## time saved isn't worth the extra code.
-+ f = Fs * (0:n-1)' / n;
-+ ## polyval(fliplr(P),exp(jw)) is O(p n) and fft(x) is O(n log(n)),
-+ ## where p is the order of the the polynomial P. For small p it
-+ ## would be faster to use polyval but in practice the overhead for
-+ ## polyval is much higher and the little bit of time saved isn't
-+ ## worth the extra code.
- hb = fft (postpad (b, n));
- ha = fft (postpad (a, n));
- else
-- f = Fs/2 * (0:n-1) / n;
-+ f = Fs/2 * (0:n-1)' / n;
- hb = fft (postpad (b, 2*n))(1:n);
- ha = fft (postpad (a, 2*n))(1:n);
- endif
-@@ -169,9 +170,9 @@
- %!test # Sampling frequency properly interpreted
- %! b = [1 1 1]/3;
- %! [h,f] = freqz(b,1,16,320);
--%! assert(f,[0:15]*10,10*eps);
-+%! assert(f,[0:15]'*10,10*eps);
- %! [h2,f2] = freqz(b,1,[0:15]*10,320);
- %! assert(f2,[0:15]*10,10*eps);
--%! assert(h,h2,20*eps);
-+%! assert(h,h2',20*eps);
- %! [h3,f3] = freqz(b,1,32,'whole',320);
--%! assert(f3,[0:31]*10,10*eps);
-+%! assert(f3,[0:31]'*10,10*eps);
Deleted: octave/trunk/debian/patches/50_g++4.1-fixes.dpatch
===================================================================
--- octave/trunk/debian/patches/50_g++4.1-fixes.dpatch 2009-02-13 21:37:16 UTC (rev 2676)
+++ octave/trunk/debian/patches/50_g++4.1-fixes.dpatch 2009-02-16 15:36:59 UTC (rev 2677)
@@ -1,30 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## -*- diff -*-
-## 50_g++4.1-fixes.dpatch by Rafael Laboissiere <rafael at debian.org>
-##
-## DP: Aloow compilation against g++ 4.1
-
- at DPATCH@
-
---- octave2.1-2.1.73.orig/liboctave/ArrayN.h
-+++ octave2.1-2.1.73/liboctave/ArrayN.h
-@@ -63,7 +63,7 @@
- ArrayN (const dim_vector& dv) : Array<T> (dv) { }
-
- ArrayN (const dim_vector& dv, const T& val)
-- : Array<T> (dv) { fill (val); }
-+ : Array<T> (dv) { Array<T>::fill (val); }
-
- template <class U>
- explicit ArrayN (const Array2<U>& a) : Array<T> (a, a.dims ()) { }
---- octave2.1-2.1.73.orig/liboctave/DiagArray2.h
-+++ octave2.1-2.1.73/liboctave/DiagArray2.h
-@@ -125,7 +125,7 @@
- {
- this->dimensions = dim_vector (r, c);
-
-- fill (val);
-+ Array<T>::fill (val);
- }
-
- DiagArray2 (const Array<T>& a) : Array<T> (a)
Deleted: octave/trunk/debian/patches/50_incomplete_gamma.dpatch
===================================================================
--- octave/trunk/debian/patches/50_incomplete_gamma.dpatch 2009-02-13 21:37:16 UTC (rev 2676)
+++ octave/trunk/debian/patches/50_incomplete_gamma.dpatch 2009-02-16 15:36:59 UTC (rev 2677)
@@ -1,42 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## -*- diff -*-
-## 50_incomplete_gamma.dpatch by Thomas Weber <thomas.weber.mail at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch for #335195, taken from Octave 2.9;
-## it enhances the documentation of the gammainc function
-
- at DPATCH@
-diff -urNad octave-2.1.73~/src/DLD-FUNCTIONS/gammainc.cc octave-2.1.73/src/DLD-FUNCTIONS/gammainc.cc
---- octave-2.1.73~/src/DLD-FUNCTIONS/gammainc.cc 2005-05-02 13:17:21.000000000 +0200
-+++ octave-2.1.73/src/DLD-FUNCTIONS/gammainc.cc 2006-03-24 14:29:33.000000000 +0100
-@@ -36,7 +36,7 @@
- DEFUN_DLD (gammainc, args, ,
- "-*- texinfo -*-\n\
- @deftypefn {Mapping Function} {} gammainc (@var{x}, @var{a})\n\
--Computes the incomplete gamma function,\n\
-+Compute the normalized incomplete gamma function,\n\
- @iftex\n\
- @tex\n\
- $$\n\
-@@ -53,15 +53,18 @@
- gamma (a) /\n\
- t=0\n\
- @end smallexample\n\
-+\n\
- @end ifinfo\n\
-+with the limiting value of 1 as @var{x} approaches infinity.\n\
-+The standard notation is @math{P(a,x)}, e.g. Abramowitz and Stegun (6.5.1).\n\
- \n\
- If @var{a} is scalar, then @code{gammainc (@var{x}, @var{a})} is returned\n\
- for each element of @var{x} and vice versa.\n\
- \n\
- If neither @var{x} nor @var{a} is scalar, the sizes of @var{x} and\n\
- @var{a} must agree, and @var{gammainc} is applied element-by-element.\n\
-- at end deftypefn\n\
-- at seealso{gamma and lgamma}")
-+ at seealso{gamma, lgamma}\n\
-+ at end deftypefn")
- {
- octave_value retval;
-
Deleted: octave/trunk/debian/patches/50_lgamma_doc.dpatch
===================================================================
--- octave/trunk/debian/patches/50_lgamma_doc.dpatch 2009-02-13 21:37:16 UTC (rev 2676)
+++ octave/trunk/debian/patches/50_lgamma_doc.dpatch 2009-02-16 15:36:59 UTC (rev 2677)
@@ -1,23 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## -*- diff -*-
-## 50_lgamma_doc.dpatch by Thomas Weber <thomas.weber.mail at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch for #335373; this was applied upstream only for Octave 2.9;
-## it fixes the documentation of th lgamma mapper function
-
- at DPATCH@
-diff -urNad octave-2.1.73~/src/mappers.cc octave-2.1.73/src/mappers.cc
---- octave-2.1.73~/src/mappers.cc 2005-05-02 13:17:13.000000000 +0200
-+++ octave-2.1.73/src/mappers.cc 2006-03-24 13:47:00.000000000 +0100
-@@ -537,8 +537,8 @@
-
- DEFUN_MAPPER (lgamma, 0, 0, 0, xlgamma, 0, 0, 0.0, 0.0, 0, 0,
- "-*- texinfo -*-\n\
-- at deftypefn {Mapping Function} {} lgamma (@var{a}, @var{x})\n\
-- at deftypefnx {Mapping Function} {} gammaln (@var{a}, @var{x})\n\
-+ at deftypefn {Mapping Function} {} lgamma (@var{x})\n\
-+ at deftypefnx {Mapping Function} {} gammaln (@var{x})\n\
- Return the natural logarithm of the gamma function.\n\
- @end deftypefn\n\
- @seealso{gamma and gammai}");
Deleted: octave/trunk/debian/patches/50_rename-octave-tags.dpatch
===================================================================
--- octave/trunk/debian/patches/50_rename-octave-tags.dpatch 2009-02-13 21:37:16 UTC (rev 2676)
+++ octave/trunk/debian/patches/50_rename-octave-tags.dpatch 2009-02-16 15:36:59 UTC (rev 2677)
@@ -1,61 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## -*- diff -*-
-## 50_rename-octave-tags.dpatch by Rafael Laboissiere <rafael at debian.org>
-##
-## DP: Rename otags to be octave-tags, to avoid conflict with the Ocaml otags
-## DP: package. These changes are already in upstream CVS.
-
- at DPATCH@
-
---- octave2.1-2.1.73.orig/doc/interpreter/emacs.txi
-+++ octave2.1-2.1.73/doc/interpreter/emacs.txi
-@@ -339,9 +339,9 @@
-
- @cindex TAGS
- @cindex Emacs TAGS files
-- at cindex @code{otags}
-+ at cindex @code{octave-tags}
- You can generate TAGS files for Emacs from Octave @file{.m} files using
--the shell script @code{otags} that is installed alongside your copy of
-+the shell script @code{octave-tags} that is installed alongside your copy of
- Octave.
-
- Customization of Octave mode can be performed by modification of the
---- octave2.1-2.1.73.orig/emacs/otags
-+++ octave2.1-2.1.73/emacs/otags
-@@ -2,7 +2,7 @@
-
- # Generate a TAGS file from a set of Octave .m files for use with Emacs.
- #
--# Run as '$ otags' in the given Octave directory to generate a
-+# Run as '$ octave-tags' in the given Octave directory to generate a
- # TAGS file. If you want to include another directory, add a line
- # prior to the "*.m" line containing something like
- # `--include=/path/to/other/directory/TAGS" \'.
---- octave2.1-2.1.73.orig/emacs/otags.1
-+++ octave2.1-2.1.73/emacs/otags.1
-@@ -1,19 +1,19 @@
- .\" Man page contributed by Dirk Eddelbuettel <edd at debian.org>
- .\" and released under the GNU GPL
--.TH OTAGS 1 "31 October 2001" "GNU Octave"
-+.TH OCTAVE-TAGS 1 "31 October 2001" "GNU Octave"
- .SH NAME
--OTAGS - Generate Emacs tags file from GNU Octave code
-+OCTAVE-TAGS - Generate Emacs tags file from GNU Octave code
- .SH SYNOPSIS
--.BR otags\ [--include\ dir]
-+.BR octave-tags\ [--include\ dir]
- \fIfile\fP .\|.\|.
- .SH DESCRIPTION
- .PP
--.B otags
-+.B octave-tags
- program is used to create a tag table file, in a format understood by
- .BR emacs (1)
- and
- .BR xemacs (1).
--.B otags
-+.B octave-tags
- reads the files specified on the command line, and write a tag table
- (defaults: `TAGS') in the current working directory. Files specified with
- relative file names will be recorded in the tag table with file names
Deleted: octave/trunk/debian/patches/50_return-deffn.dpatch
===================================================================
--- octave/trunk/debian/patches/50_return-deffn.dpatch 2009-02-13 21:37:16 UTC (rev 2676)
+++ octave/trunk/debian/patches/50_return-deffn.dpatch 2009-02-16 15:36:59 UTC (rev 2677)
@@ -1,26 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## -*- diff -*-
-## 50_return-deffn.dpatch by Rafael Laboissiere <rafael at debian.org>
-##
-## The "return" keyword will appear in the function index, instead of the
-## variable index
-
- at DPATCH@
-
---- octave2.1-2.1.73.orig/doc/interpreter/func.txi
-+++ octave2.1-2.1.73/doc/interpreter/func.txi
-@@ -373,12 +373,12 @@
- without adding extra logic to avoid printing the message if the vector
- does contain a nonzero element.
-
-- at defvr {Keyword} return
-+ at deffn {Keyword} return
- When Octave encounters the keyword @code{return} inside a function or
- script, it returns control to the caller immediately. At the top level,
- the return statement is ignored. A @code{return} statement is assumed
- at the end of every function definition.
-- at end defvr
-+ at end deffn
-
- @DOCSTRING(return_last_computed_value)
-
Deleted: octave/trunk/debian/patches/50_syscalls-test-sleep.dpatch
===================================================================
--- octave/trunk/debian/patches/50_syscalls-test-sleep.dpatch 2009-02-13 21:37:16 UTC (rev 2676)
+++ octave/trunk/debian/patches/50_syscalls-test-sleep.dpatch 2009-02-16 15:36:59 UTC (rev 2677)
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## -*- diff -*-
-## 50_syscalls-test-sleep.dpatch by Rafael Laboissiere <rafael at debian.org>
-##
-## DP: Increase the amount of time to sleep, in case of errno == EAGAIN
-## DP: when running the test for syscalls.cc ("make check" hangs in an
-## DP: unpredictable way without this patch)
-
- at DPATCH@
-
---- octave2.9-2.9.10.orig/src/syscalls.cc
-+++ octave2.9-2.9.10/src/syscalls.cc
-@@ -372,7 +372,7 @@
- %! idx++;
- %! str{idx} = s;
- %! elseif (errno () == EAGAIN)
--%! sleep (0.1);
-+%! sleep (1);
- %! fclear (out);
- %! else
- %! done = true;
Deleted: octave/trunk/debian/patches/imshow_only_handles_octave_images.dpatch
===================================================================
--- octave/trunk/debian/patches/imshow_only_handles_octave_images.dpatch 2009-02-13 21:37:16 UTC (rev 2676)
+++ octave/trunk/debian/patches/imshow_only_handles_octave_images.dpatch 2009-02-16 15:36:59 UTC (rev 2677)
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## -*- diff -*-
-## imshow_only_handles_octave_images.dpatch by Thomas Weber <thomas.weber.mail at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: imshow can only handle Octave's native image for the time being
-## DP: #478271
-
- at DPATCH@
-diff -urNad octave3.0-3.0.1~/scripts/image/imshow.m octave3.0-3.0.1/scripts/image/imshow.m
---- octave3.0-3.0.1~/scripts/image/imshow.m 2008-04-21 18:00:20.000000000 +0200
-+++ octave3.0-3.0.1/scripts/image/imshow.m 2008-05-21 13:49:19.000000000 +0200
-@@ -37,7 +37,7 @@
- ## image using the supplied color map.
- ##
- ## If a file name is given instead of an image, the file will be read and
--## shown.
-+## shown. The file must be in Octave's native image format.
- ##
- ## If given, the parameter @var{string_param1} has value
- ## @var{value1}. @var{string_param1} can be any of the following:
Deleted: octave/trunk/debian/patches/sane-file-stat-return.dpatch
===================================================================
--- octave/trunk/debian/patches/sane-file-stat-return.dpatch 2009-02-13 21:37:16 UTC (rev 2676)
+++ octave/trunk/debian/patches/sane-file-stat-return.dpatch 2009-02-16 15:36:59 UTC (rev 2677)
@@ -1,79 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## -*- diff -*-
-## sane-file-stat-return.dpatch by Rafael Laboissiere <rafael at debian.org>
-##
-## DP: Avoid calls to deprecated __glp_lib_* functions which are deprecated
-## DP: and have been removed for the GLPK public API since version 4.32.
-## DP:
-## DP: Adapted from the upstream changesets in:
-## DP: http://hg.savannah.gnu.org/hgweb/octave/rev/ddbe87599331
-## DP: http://hg.savannah.gnu.org/hgweb/octave/rev/6e9887f9cf9f
-## DP:
-## DP: # HG changeset patch
-## DP: # User John W. Eaton <jwe at octave.org>
-## DP: # Date 1233873504 18000
-## DP: # Node ID ddbe875993314945753a2b3fed6d75d2fa741e0a
-## DP: # Parent d7306ecd077a45c41801796e13ab791dcc630511
-## DP: base_file_stat::is_XXX: return false if object is not initialized
-## DP:
-## DP: # HG changeset patch
-## DP: # User John W. Eaton <jwe at octave.org>
-## DP: # Date 1233880778 18000
-## DP: # Node ID 6e9887f9cf9f646de4e166f3236279e106c071b0
-## DP: # Parent ddbe875993314945753a2b3fed6d75d2fa741e0a
-## DP: file-stat.cc: use EXISTS instead of OK in previuos change
-
- at DPATCH@
---- a/liboctave/file-stat.cc Thu Feb 05 17:14:44 2009 -0500
-+++ b/liboctave/file-stat.cc Thu Feb 05 17:38:24 2009 -0500
-@@ -54,43 +54,43 @@
- bool
- file_stat::is_blk (void) const
- {
-- return is_blk (fs_mode);
-+ return exists () && is_blk (fs_mode);
- }
-
- bool
- file_stat::is_chr (void) const
- {
-- return is_chr (fs_mode);
-+ return exists () && is_chr (fs_mode);
- }
-
- bool
- file_stat::is_dir (void) const
- {
-- return is_dir (fs_mode);
-+ return exists () && is_dir (fs_mode);
- }
-
- bool
- file_stat::is_fifo (void) const
- {
-- return is_fifo (fs_mode);
-+ return exists () && is_fifo (fs_mode);
- }
-
- bool
- file_stat::is_lnk (void) const
- {
-- return is_lnk (fs_mode);
-+ return exists () && is_lnk (fs_mode);
- }
-
- bool
- file_stat::is_reg (void) const
- {
-- return is_reg (fs_mode);
-+ return exists () && is_reg (fs_mode);
- }
-
- bool
- file_stat::is_sock (void) const
- {
-- return is_sock (fs_mode);
-+ return exists () && is_sock (fs_mode);
- }
-
- bool
More information about the Pkg-octave-commit
mailing list