diff -Nru octave-3.8.1/debian/bzr-builder.manifest octave-3.8.1+2+19~ubuntu15.04.1/debian/bzr-builder.manifest --- octave-3.8.1/debian/bzr-builder.manifest 1970-01-01 00:00:00.000000000 +0000 +++ octave-3.8.1+2+19~ubuntu15.04.1/debian/bzr-builder.manifest 2014-10-28 10:54:56.000000000 +0000 @@ -0,0 +1,3 @@ +# bzr-builder format 0.3 deb-version {debupstream}+2+19 +lp:~gabriel1984sibiu/octave/octave revid:gabriel1984sibiu@gmail.com-20140307195157-xh7nlheg70c5r879 +nest-part packaging lp:~gabriel1984sibiu/octave/debian debian debian revid:gabriel1984sibiu@gmail.com-20140307200620-ixfl6s7liwpbsi60 diff -Nru octave-3.8.1/debian/changelog octave-3.8.1+2+19~ubuntu15.04.1/debian/changelog --- octave-3.8.1/debian/changelog 2014-04-11 22:14:30.000000000 +0000 +++ octave-3.8.1+2+19~ubuntu15.04.1/debian/changelog 2014-10-28 10:54:56.000000000 +0000 @@ -1,213 +1,20 @@ -octave (3.8.1-1ubuntu1) trusty; urgency=medium +octave (3.8.1+2+19~ubuntu15.04.1) vivid; urgency=low - * Merge with Debian; remaining changes: - - Disable JIT on all archs to fix LLVM library conflicts. (LP: #1293876) - - Adjust octave breaks to the versions found in trusty. - - -- Julian Taylor Sat, 12 Apr 2014 00:12:03 +0200 - -octave (3.8.1-1) unstable; urgency=medium - - * Imported Upstream version 3.8.1 - + libgui/src/main-window.cc: Fix problems with gui startup and focus issues - (Closes: #738672) - + scripts/pkg/private/fix_depends.m: Fix installing packages where - dependency name contains '-' (Closes: #740984) - * debian/copyright: reflect upstream changes. - * octave.postinst: remove workaround for #681064 (package dir re-creation). - (Closes: #681461) - * Remove patches applied upstream: - + doc-compressed-info.diff - + kfreebsd_tcgetattr.diff - + octave-cli-manpage.diff - + save-uint8-in-text-format.diff - * mkoctfile is now an executable binary instead of a shell script. - + mkoctfile-mpi.diff: adapt for new format of mkoctfile. - + d/control: add shlibs:Depends to liboctave-dev. - * Fix statement about the GUI in NEWS.Debian. - * debian/control: don't mention the FAQ in descriptions, it has been removed. - * Adapt to the fact that JIT is now disabled by default in ./configure script. - * Disable JIT on hurd-i386, LLVM not available there. - - -- Sébastien Villemot Mon, 10 Mar 2014 17:32:29 +0100 - -octave (3.8.0-5ubuntu6) trusty; urgency=medium - - * Disable JIT on all archs to fix LLVM library conflicts. (LP: #1293876) - - -- Mike Miller Mon, 07 Apr 2014 11:19:12 -0500 - -octave (3.8.0-5ubuntu5) trusty; urgency=medium - - * Fix installing packages where dependency name contains '-'. (LP: #1288136) - - -- Mike Miller Mon, 10 Mar 2014 09:11:34 -0400 - -octave (3.8.0-5ubuntu4) trusty; urgency=medium - - * Build again with default optimization on ppc64el. - - -- Matthias Klose Wed, 26 Feb 2014 16:39:01 +0100 - -octave (3.8.0-5ubuntu3) trusty; urgency=medium - - * Fix CFLAGS/CXXFLAGS thinko in debian/rules for -O3 mangling. - - -- Adam Conrad Wed, 26 Feb 2014 03:44:16 -0700 - -octave (3.8.0-5ubuntu2) trusty; urgency=medium - - * Adjust octave breaks to the versions found in trusty. - - -- Matthias Klose Wed, 26 Feb 2014 10:19:57 +0100 - -octave (3.8.0-5) unstable; urgency=medium - - * Re-enable java on amd64, i386 and mips (was disabled by mistake). - * Ensure that octave-common always contains octave.jar. - - -- Sébastien Villemot Tue, 25 Feb 2014 20:41:26 +0100 - -octave (3.8.0-4ubuntu2) trusty; urgency=medium - - * Use llvm-3.3 explicity, octave is not ready for 3.4. - * Disable the jit on arm64, which only has llvm-3.4. - * Build using -O2 on ppc64el to work around an ICE. - - -- Matthias Klose Mon, 24 Feb 2014 13:17:20 +0100 - -octave (3.8.0-4ubuntu1) trusty; urgency=medium - - * Do not use llvm-dev on ppc64el. - - -- Matthias Klose Mon, 24 Feb 2014 12:34:06 +0100 - -octave (3.8.0-4) unstable; urgency=medium - - * Disable java on kfreebsd-* and sparc. Fixes FTBFS on those archs. - - -- Sébastien Villemot Fri, 21 Feb 2014 14:09:30 +0100 - -octave (3.8.0-3) unstable; urgency=medium - - * Upload to unstable. - * No longer set pkg prefix in /etc/octave.conf. (Closes: #536839) + * Auto build. - -- Sébastien Villemot Wed, 19 Feb 2014 22:17:24 +0100 + -- grevutiu gabriel Tue, 28 Oct 2014 10:54:56 +0000 -octave (3.8.0-2) experimental; urgency=medium - - [ Mike Miller ] - * Disable Java on mipsel, using openjdk causes bus error. - * Disable Java on hurd-i386. - - [ Rafael Laboissiere ] - * save-uint8-in-text-format.diff: new patch, fixes saving int8 and uint8 in - plain text format (Closes: #732659) - * Make octave break an explicit list of packages instead of liboctave1. - Adding a Breaks on liboctave1 breaks upgrades from octave 3.6, because of - #671711. - - -- Sébastien Villemot Wed, 15 Jan 2014 20:49:20 +0100 - -octave (3.8.0-1) experimental; urgency=medium - - [ Sébastien Villemot ] - * Imported Upstream version 3.8.0 - + octave-gui is no longer shipped in /usr/bin. - * Run testsuite within Xvfb, to avoid failures due to lack of DISPLAY. - * dblquad-s390x.diff: new patch, fixes FTBFS on s390x. - * Indicate that octave breaks liboctave1. - A package compiled against liboctave1 can not be used with the octave 3.8 - interpreter. - * Disable JIT on armel, armhf, mips, mipsel, powerpc. Should fix FTBFS - on these archs. - - [ Mike Miller ] - * debian_missing_handler.m: Fix liboctave-dev package name. - * Build-depend on javahelper, use to configure default Java paths. - * doc-compressed-info.diff: Add patch from upstream. - Fixes the doc command to work correctly with compressed info files. - * kfreebsd_tcgetattr.diff: new patch, fixes FTBFS on kFreeBSD. - * hurd_path_max.diff: new patch, fixes FTBFS on Hurd. - - [ Rafael Laboissiere ] - * Add Lintian override file for dh-exec-subst-unknown-variable warning - * New patch patches/octave-cli-manpage.diff: Add manpage for - octave-cli (taken from the upstream SCM repository). - - -- Sébastien Villemot Wed, 08 Jan 2014 13:45:32 +0100 - -octave (3.8.0~rc2-1) experimental; urgency=medium - - * Imported Upstream version 3.8.0~rc2 - * missing-example.diff: drop patch, no longer needed. - * debian/rules: fix binary-arch rule. - * Consolidate all patches relative to dropping version numbers in binaries. - The new consolidated patch is drop_versioned_binaries.diff. - Also drops versions numbers in calls from src/main.in.cc. - - -- Sébastien Villemot Sun, 22 Dec 2013 13:33:58 +0100 - -octave (3.8.0~rc1-1) experimental; urgency=medium - - [ Sébastien Villemot ] - * New upstream release candidate, which fixes the following bugs: - - Function pkg.m works correctly when promoting warnings to errors - (Closes: #693873) - - Sparse matrices A(n,n) behave correctly when n is a multiple of - 65536=2^16 (Closes: #706376) - - Function interpft does not fail when downsampling (Closes: #706640) - - Function print correctly handles option -d when no file - name is given (Closes: #710423) - - Documentation for function triangle_lw (and others) is removed - from the manual (Closes: #721802) - - Subfunctions are deleted from the table of symbols when deleting - the parent function (Closes: #725442) - * debian/copyright: reflect upstream changes. - * Remove patches applied upstream or no longer needed: - + contourc-stack-overflow.diff - + correct_typos - + gcc-4.8.diff - + glpk-4.49.diff - + texinfo5.diff - + use_system_gl2ps - * Refresh other patches. - * The Octave FAQ is no longer part of upstream tarball, don't try to ship it. - * Add LLVM, QScintilla and the default JDK to build dependencies. - Also make octave depend on the default headless JRE. - * Bump SONAME of library package to liboctave2. - Also stop distributing libcruft, which no longer exists. - * missing-example.diff: new patch, adds back a file omitted in upstream - tarball. - * Ship octave-cli and octave-gui in the octave package. - * Add breaks/conflicts + replaces on octave-java and octave-io. - * Ship *.png files used in info doc, using an "octave-" prefix for filenames. - * debian/watch: add automatic verification of PGP signature. - * Merge README.Atlas into README.Debian. - * Document the GUI and the JIT in NEWS.Debian. - - [ Rafael Laboissiere ] - * Bump to Standards-Version 3.9.5, no changes needed - * debian/octave.conf: Do not use obsolete function read_readline_init_file - * Add a Debian-specific error handler +octave (3.8.1-0) saucy; urgency=low + + * New release for Octave, 3.8.1-0. - [ Thomas Weber ] - * Change priority from 'extra' to 'optional' + -- Grevutiu Gabriel Fri, 07 Mar 2014 22:02:01 +0200 - -- Sébastien Villemot Fri, 20 Dec 2013 20:49:52 +0100 +octave (3.8.0-0) saucy; urgency=low -octave (3.6.4-4) unstable; urgency=low + * New release for Octave, 3.8.0-0. - [ Rafael Laboissiere ] - * Drop useless build-dependency on texi2html - - [ Sébastien Villemot ] - * Use canonical address for packaging VCS - * glpk-4.49.diff: new patch, fixes FTBFS against recent versions of GLPK - (Closes: #714360) - - -- Sébastien Villemot Thu, 15 Aug 2013 14:12:46 +0200 + -- Grevutiu Gabriel Thu, 02 Jan 2014 17:35:22 +0200 octave (3.6.4-3) unstable; urgency=low @@ -3880,191 +3687,3 @@ -- Dirk Eddelbuettel Fri, 17 Apr 1998 18:44:10 -0400 -octave (2.0.11.92-2) unstable; urgency=low, - - * Added Depends: on "info (>= 3.12-1) | info-browser" to debian/control - as Octave no longer comes with an info binary - * Added explicit setting of INFO_PROGRAM = "/usr/bin/info" to - /etc/octave.conf as the default INFO_PROGRAM still points to the old - location - - -- Dirk Eddelbuettel Thu, 16 Apr 1998 22:46:32 -0400 - -octave (2.0.11.92-1) unstable; urgency=low - - * Upgraded to new upstream test-release 2.0.11.92 - * Compiled with libstdc++2.8_2.90.27-0.6 which provides a correctly - versioned shlibs file (fixes #20033, #20978) - - -- Dirk Eddelbuettel Thu, 16 Apr 1998 18:41:21 -0400 - -octave (2.0.11.91-1) unstable; urgency=low - - * Upgraded to new upstream test-release 2.0.11.91 - * This fixes a couple of small bugs, one of them dear to to fellow - Debianer Jim van Zandt, and as a test-release might as well go into - our current 'unstable' distribution. I have used previous pre-releases - and they work just as well --- call it the pre-patch methodology - spreading into application space ;-) - - -- Dirk Eddelbuettel Fri, 10 Apr 1998 11:51:56 -0400 - -octave (2.0.11-2) frozen unstable; urgency=low - - * Compilation with new gcc/g77/g++ 2.90.26 based on egcs - * Changed debian/rules by adding a Perl one-liner substition so that - /usr/bin/octave-bug will use tempfile(1) to create a temporary - filename; also sent the sources for debianutils-1.8 upstream so that - they might be included in the next release (fixes #19804) - - -- Dirk Eddelbuettel Wed, 18 Mar 1998 18:41:12 -0500 - -octave (2.0.11-1) unstable; urgency=low - - * Upgraded to new upstream version - - -- Dirk Eddelbuettel Wed, 25 Feb 1998 18:33:04 -0500 - -octave (2.0.10-2) unstable; urgency=low - - * Compilation with f2c instead of g77 in order to get a libc6 version - going (see bug report #17963 filed against g77) - - * Added Replaces: octave (<= 2.0.5-2) to control for octave-staticlibs - to cleanly replace the static libraries from the older octave package - as well as an explicit version number for the Depends: on octave - (thanks to Richard Braakman for the hints) - - * Fixed FSF address in copyright (lintian) - * Made octave.rc to /etc/octave.conf symlink absolute (lintian) - * Created links to ../man7/undocumented.7.gz in lieu of manual pages - for the two utility scripts octave-bug and mkoctfile (lintian) - - -- Dirk Eddelbuettel Wed, 25 Feb 1998 18:32:27 -0500 - -octave (2.0.10-1) unstable; urgency=low - - * Upgraded to new upstream version - - * This version is compiled on a libc5 system as g77/gcc and eg77/egcc - (including the new {gcc,g77}_2.90.23-1) both die on some legacy - Fortran code on a libc6 system. Major bummer. - - -- Dirk Eddelbuettel Sun, 8 Feb 1998 17:05:07 -0500 - -octave (2.0.9-2) unstable; urgency=low - - * Compiled with GNU libc2 aka libc6 (fixes bug #11739) - * Create a new file /usr/share/octave/ls-R file from the postinst - * Now ships the unmodified upstream source as octave_2.0.9.orig.tar.gz - * Byte-compile the octave-{mod,hlp,inf}.el files - * Includes two newer octave-{mod,inf} files and add an elisp startup - file /etc/emacs/site-start.d/50octave.el (thanks to Nils Naumann) - - -- Dirk Eddelbuettel Sat, 1 Nov 1997 17:13:31 -0500 - -octave (2.0.9-1) unstable; urgency=low - - * Upgraded to new upstream version - - -- Dirk Eddelbuettel Thu, 10 Jul 1997 19:19:12 -0400 - -octave (2.0.8-1) unstable; urgency=low - - * Upgraded to new upstream version - - -- Dirk Eddelbuettel Mon, 23 Jun 1997 20:02:03 -0400 - -octave (2.0.7-1) unstable; urgency=low - - * upgraded to new upstream version (bug #10419) - - -- Dirk Eddelbuettel Sat, 7 Jun 1997 13:42:21 -0400 - -octave (2.0.6-1) unstable; urgency=low - - * upgraded to new upstream version - - -- Dirk Eddelbuettel Wed, 28 May 1997 18:50:13 -0400 - -octave (2.0.5-3) unstable; urgency=low - - * added creation of /usr/local/share/octave/site-m in the postinst if - /usr/local filesystem is writable and removal of the directories - /usr/local/share/octave/site-m and /usr/local/share/octave/site-m in - the prerm if they are empty to reflect Debian policy on /usr/local/ - * moved configuration file /usr/share/octave/site/m/startup/octaverc - into /etc/octave.conf and provided a softlink from the default location - * added LOADPATH setting to octave.conf aka octaverc for the local tree - * made /etc/octave.conf a conffile - * moved static libs into a seperate package (which is not needed for - normal use of octave) --- this saves 4.4 MB of diskspace - * patched mkoctfile.in to add a flag for stripping to /usr/bin/mkoctfile - * changed configure to explicit setting of host architecture - - -- Dirk Eddelbuettel Sun, 27 Apr 1997 19:06:03 -0400 - -octave (2.0.5-2) unstable; urgency=low - - * rewrote debian/rules: - - configure for dynamic loading, shared libs and lite kernel which - allows dynamic extension of the octave language via user provided - C++ programs; examples are in /usr/doc/octave/examples - - configure prefix /usr; install prefix debian/tmp/usr (fixes bug #8139) - - configure for libs in /usr/lib/octave to avoid clashed - - include upstream postscript docs - * rewrote Description in debian/control: - * changed Priority: to optional as per overrides file - * changed Suggests: from info to virtual package info-browser - * created new package octave-doc for postscript docs on octave - * updated debian/copyright - * new maintainer - - -- Dirk Eddelbuettel Wed, 26 Mar 1997 22:15:30 -0500 - -octave (2.0.5-1) unstable; urgency=low - - * tracking upstream source, upgraded to newest release - * put *.el files back in /usr/lib/emacs/site-lisp bug #7457 - * also bugs #7144, 7282, and 7532 are fixed with this release. - - -- Dale Scheetz Mon, 10 Mar 1997 21:47:07 -0500 - -octave (2.0.2-2) unstable; urgency=low - - * bug#7020 removed static libraries from the installation - * bug#7021 corrected spelling errors - * applied patch from upstream for pipes fix - - -- Dale Scheetz Sun, 2 Feb 1997 20:19:27 -0500 - -octave (2.0.2-1) unstable; urgency=low - - * New upstream source - - -- Dale Scheetz Wed, 29 Jan 1997 12:18:29 -0500 - -octave (2.0.1-2) unstable; urgency=low - - * corrected unreferenced dependencies - - -- Dale Scheetz Mon, 27 Jan 1997 09:45:30 -0500 - -octave (2.0.1-1) unstable; urgency=low - - * Bug# 6028, 6044, 6416, Moved to newer release. - * Bug# 5096, referenced binary no longer exists. - - -- Dale Scheetz Sun, 26 Jan 1997 16:16:43 -0500 - -octave (1.1.1-8) frozen unstable; urgency=low - - * built with static libc5.2.18 - - -- Dale Scheetz Tue, 26 Nov 1996 13:49:37 -0500 - -octave (1.1.1-7) unstable; urgency=low - - * converted to Standards-Version 2.1.0.0 - - -- Dale Scheetz Mon, 14 Oct 1996 08:42:54 -0400 diff -Nru octave-3.8.1/debian/control octave-3.8.1+2+19~ubuntu15.04.1/debian/control --- octave-3.8.1/debian/control 2014-04-11 22:17:42.000000000 +0000 +++ octave-3.8.1+2+19~ubuntu15.04.1/debian/control 2014-10-28 10:54:55.000000000 +0000 @@ -1,84 +1,35 @@ Source: octave Section: math -Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Octave Group +Priority: extra +Maintainer: Debian Octave Group Uploaders: Thomas Weber , Sébastien Villemot Build-Depends: gfortran, debhelper (>= 9), automake, dh-autoreconf, texinfo, texlive-latex-base, texlive-generic-recommended, epstool, transfig, pstoedit, - libreadline-dev, xauth, xvfb, + libreadline-dev | libreadline6-dev | libreadline5-dev, libncurses5-dev, gperf, libhdf5-dev (>= 1.8.8), - libblas-dev (>=1.2-7), liblapack-dev (>= 3.4.1-4), gnuplot-nox, libfftw3-dev, + libblas-dev (>=1.2-7), liblapack-dev (>= 3.4.1-4), libfftw3-dev, texi2html, less, libpcre3-dev, flex, libglpk-dev (>= 4.15), libsuitesparse-dev (>= 1:3.2.0), gawk, ghostscript, libcurl4-gnutls-dev | libcurl4-dev, libqhull-dev, desktop-file-utils, libfltk1.3-dev, libgl2ps-dev, libgraphicsmagick++1-dev, libftgl-dev, libfontconfig1-dev, - libqrupdate-dev, libarpack2-dev (>= 2.1+parpack96.dfsg-2), dh-exec, - dpkg-dev (>= 1.16.1), - default-jdk, libqscintilla2-dev, libxft-dev, javahelper -Standards-Version: 3.9.5 + libqrupdate-dev, libarpack2-dev, dh-exec, libqt4-dev, libqscintilla2-dev, default-jdk, gnuplot-x11, libbison-dev, libxft-dev, llvm-dev, dpkg-dev (>= 1.16.1) +Standards-Version: 3.9.4 Homepage: http://www.octave.org/ -Vcs-Git: git://anonscm.debian.org/pkg-octave/octave.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-octave/octave.git +Vcs-Git: git://git.debian.org/git/pkg-octave/octave.git +Vcs-Browser: http://git.debian.org/?p=pkg-octave/octave.git Package: octave Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, texinfo, octave-common (= ${source:Version}), - liboctave2 (= ${binary:Version}), - default-jre-headless [!hurd-i386 !kfreebsd-amd64 !kfreebsd-i386 !mipsel !sparc] + liboctave2 (= ${binary:Version}) Recommends: gnuplot-x11 | gnuplot-qt, libatlas3-base | libopenblas-base, pstoedit Suggests: octave-info, octave-doc, octave-htmldoc, -Conflicts: octave3.2, octave-java -Replaces: octave3.2, octave-java -Breaks: libsbml5-octave (<= 5.8.0-2), - octave-audio (<= 1.1.4-4), - octave-biosig (<= 1.3.0-2), - octave-communications (<= 1.2.0-1), - octave-control (<= 2.6.2-1), - octave-econometrics (<= 1:1.1.1-2), - octave-gdf (<= 0.1.2-2), - octave-general (<= 1.3.2-2), - octave-geometry (<= 1.7.0-1), - octave-gmt (<= 4.5.11-1), - octave-gsl (<= 1.0.8-5), - octave-image (<= 2.0.0-3), - octave-io (<< 1.3), - octave-java (<= 1.2.9-2), - octave-lhapdf (<= 5.9.1-3), - octave-linear-algebra (<= 2.2.0-1), - octave-miscellaneous (<= 1.2.0-2), - octave-mpi (<= 1.1.1-1), - octave-nan (<= 2.5.9-1), - octave-nlopt (<= 2.4.1+dfsg-1), - octave-nurbs (<= 1.3.7-1), - octave-ocs (<= 0.1.3-1), - octave-octcdf (<= 1.1.6-1), - octave-octgpr (<= 1.2.0-3), - octave-odepkg (<= 0.8.4-1), - octave-openmpi-ext (<= 1.1.1-1), - octave-optim (<= 1.2.2-2), - octave-optiminterp (<= 0.3.4-1), - octave-parallel (<= 2.2.0-1), - octave-pfstools (<= 1.8.5-1), - octave-plplot (<= 5.9.9-5), - octave-psychtoolbox-3 (<= 3.0.11.20131230.dfsg1-1), - octave-quaternion (<= 2.2.0-1), - octave-secs2d (<= 0.0.8-4), - octave-signal (<= 1.2.2-1), - octave-sockets (<= 1.0.8-1), - octave-specfun (<= 1.1.0-1), - octave-strings (<= 1.1.0-1), - octave-struct (<= 1.0.10-1), - octave-sundials (<= 2.5.0-3), - octave-symbolic (<= 1.1.0-2), - octave-tsa (<= 4.2.7-1), - octave-vlfeat (<= 0.9.17+dfsg0-6), - sdpam (<= 7.3.9+dfsg-1), - dynare (<= 4.4.1-1) +Conflicts: octave3.6 +Replaces: octave3.6 Description: GNU Octave language for numerical computations Octave is a (mostly Matlab (R) compatible) high-level language, primarily intended for numerical computations. It provides a convenient command-line @@ -88,7 +39,6 @@ Package: octave-dbg Section: debug -Priority: extra Architecture: any Depends: octave (=${binary:Version}), ${misc:Depends} Description: Debug symbols for octave @@ -123,10 +73,10 @@ intended for numerical computations. It provides a convenient command-line interface for solving linear and nonlinear problems numerically. . - This package provides the following documentation in PDF format: 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-info package. + 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-info package. Package: octave-htmldoc Architecture: all @@ -138,24 +88,26 @@ intended for numerical computations. It provides a convenient command-line interface for solving linear and nonlinear problems numerically. . - This package provides the following documentation in html format: 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. + 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. Package: octave-info Architecture: all Depends: info, ${misc:Depends} -Conflicts: octave3.2-info -Replaces: octave3.2-info +Conflicts: octave3.6-info +Replaces: octave3.6-info Section: doc Description: GNU Info documentation on the GNU Octave language 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 following documentation in info format: 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. + 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. Package: liboctave2 Architecture: any @@ -172,14 +124,13 @@ Package: liboctave-dev Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, - liboctave2 (= ${binary:Version}), octave (= ${binary:Version}), +Depends: liboctave2 (= ${binary:Version}), octave (= ${binary:Version}), ${misc:Depends}, libreadline-dev | libreadline6-dev | libreadline5-dev, libncurses5-dev, libhdf5-dev (>= 1.8.8) | libhdf5-openmpi-dev (>= 1.8.8) | libhdf5-mpich2-dev (>= 1.8.8), libgl1-mesa-dev | libgl-dev, libblas-dev (>=1.2-7), liblapack-dev (>=3.2.1-7), libfftw3-dev, gfortran, gcc, g++ -Conflicts: octave3.2-headers -Replaces: octave3.2-headers +Conflicts: octave3.6-headers +Replaces: octave3.6-headers Section: libdevel Description: Development files for the GNU Octave language Octave is a (mostly Matlab (R) compatible) high-level language, primarily diff -Nru octave-3.8.1/debian/copyright octave-3.8.1+2+19~ubuntu15.04.1/debian/copyright --- octave-3.8.1/debian/copyright 2014-03-10 16:27:09.000000000 +0000 +++ octave-3.8.1+2+19~ubuntu15.04.1/debian/copyright 2014-10-28 10:54:55.000000000 +0000 @@ -4,51 +4,51 @@ Source: http://www.octave.org Files: * -Copyright: 1992-2014 John W. Eaton - 1984-1985, 1987-2013 Free Software Foundation, Inc - 1997-2013 David Bateman - 2008-2013 VZLU Prague, a.s., Czech Republic - 1995-2013 Kurt Hornik - 2010-2013 Rik Wehbring - 2008-2013 Jaroslav Hajek - 1998-2013 Andy Adler - 1999-2013 Kai Habel - 1993-2013 Paul Kienzle - 2007-2013 Michael Goffioul - 1995-2013 Friedrich Leisch - 2007-2013 Ben Abbott - 2005-2013 Bill Denney - 1993-2013 Shai Ayal - 1995-2013 Andreas Weingessel - 1996-2013 Daniel Calvelo - 2005-2013 Søren Hauberg - 2000-2013 Teemu Ikonen - 2012-2013 Daniel Kraft - 2009-2013 Martin Helm - 2005-2013 William Poetra Yoga Hadisoeseno - 1993-2013 Auburn University - 2001-2013 Ben Sapp - 2000-2013 Gabriele Pannocchia - 2005-2013 Ivana Varekova - 2009-2013 Jason Riedy - 2005-2013 Nicolo' Giorgetti - 1996-2013 A. S. Hodel - 1993-2013 A. Scottedward Hodel - 2006-2013 Alexander Barth - 2009-2013 Benjamin Lindner - 2008-2013 Radek Salac - 2009-2013 Carlo de Falco - 2000-2013 Etienne Grossmann - 2008-2013 Julian Schnidder - 2005-2013 Ludwig Schwardt, Kevin Ruland - 2005-2013 Michael Zeising - 2006-2013 Michel D. Schmid - 1999-2013 Peter Ekberg - 2004-2013 Piotr Krzyzanowski - 2007-2013 Regents of the University of California - 2006-2013 Sylvain Pelissier - 2008-2013 Thorsten Meyer - 1997-2013 Vincent Cautaerts +Copyright: 1992-2013 John W. Eaton + 1984-1985, 1987-2012 Free Software Foundation, Inc + 1997-2012 David Bateman + 2008-2012 VZLU Prague, a.s., Czech Republic + 1995-2012 Kurt Hornik + 2010-2012 Rik Wehbring + 2008-2012 Jaroslav Hajek + 1998-2012 Andy Adler + 1999-2012 Kai Habel + 1993-2012 Paul Kienzle + 2007-2012 Michael Goffioul + 1995-2012 Friedrich Leisch + 2007-2012 Ben Abbott + 2005-2012 Bill Denney + 1993-2012 Shai Ayal + 1995-2012 Andreas Weingessel + 1996-2012 Daniel Calvelo + 2005-2012 Søren Hauberg + 2000-2012 Teemu Ikonen + 2012 Daniel Kraft + 2009-2012 Martin Helm + 2005-2012 William Poetra Yoga Hadisoeseno + 1993-2012 Auburn University + 2001-2012 Ben Sapp + 2000-2012 Gabriele Pannocchia + 2005-2012 Ivana Varekova + 2009-2012 Jason Riedy + 2005-2012 Nicolo' Giorgetti + 1996-2012 A. S. Hodel + 1993-2012 A. Scottedward Hodel + 2006-2012 Alexander Barth + 2009-2012 Benjamin Lindner + 2008-2012 Radek Salac + 2009-2012 Carlo de Falco + 2000-2012 Etienne Grossmann + 2008-2012 Julian Schnidder + 2005-2012 Ludwig Schwardt, Kevin Ruland + 2005-2012 Michael Zeising + 2006-2012 Michel D. Schmid + 1999-2012 Peter Ekberg + 2004-2012 Piotr Krzyzanowski + 2007-2012 Regents of the University of California + 2006-2012 Sylvain Pelissier + 2008-2012 Thorsten Meyer + 1997-2012 Vincent Cautaerts 1995, 2000-2001 Maurice LeBrun 2000, 2002 Joao Cardoso 2000-2002, 2004 Alan W. Irwin @@ -56,92 +56,67 @@ 2004 Victor Munoz 2003 Alberto Terruzzi 2012 Alexander Klein - 2004-2013 Alois Schloegl - 2002-2013 Andreas Stahel - 2008-2013 Thomas L. Scofield + 2004-2012 Alois Schloegl + 2002-2012 Andreas Stahel + 2008-2012 Thomas L. Scofield 2010 David Grundberg 2005 Stefan van der Walt 2006 Thomas Weber 2007-2009 John Swensen - 2011-2013 John P. Swensen - 1998-2013 Ariel Tankus - 2012-2013 Carnë Draug - 2005-2013 Mohamed Kamoun - 2008-2013 Robert Platt - 2000-2013 Bill Lash - 2001-2013 Cai Jianming + 1998-2012 Ariel Tankus + 2012 Carnë Draug + 2005-2012 Mohamed Kamoun + 2008-2012 Robert Platt + 2000-2012 Bill Lash + 2001-2012 Cai Jianming 2010 Christos Dimitrakakis - 1999-2013 Daniel Heiserer - 2001, 2005-2013 Laurent Mazet - 2006-2013 Daniel Sebald - 2007-2013 Jordi Gutiérrez Hermoso - 2006-2013 Marco Caliari - 1999-2013 David M. Doolin - 1993-2013 Dirk Laurie - 2009-2013 E. Jason Riedy - 2009-2013 Eric Chassande-Mottin, CNRS (France) - 2012-2013 Philip Nienhuis - 2006-2013 Frederick (Rick) A Niles - 2005-2013 Hoxide Ma - 2012-2013 Iain Murray - 2008-2013 Ivana Varekova - 2012-2013 Jarno Rajahalme - 2008-2013 Jonathan Stickel - 2001-2013 Rolf Fabian + 1999-2012 Daniel Heiserer + 2001 2005-2012 Laurent Mazet + 2006-2012 Daniel Sebald + 2007-2012 Jordi Gutiérrez Hermoso + 2006-2012 Marco Caliari + 1999-2012 David M. Doolin + 1993-2012 Dirk Laurie + 2009-2012 E. Jason Riedy + 2009-2012 Eric Chassande-Mottin, CNRS (France) + 2012 Philip Nienhuis + 2006-2012 Frederick (Rick) A Niles + 2005-2012 Hoxide Ma + 2012 Iain Murray + 2008-2012 Ivana Varekova + 2012 Jarno Rajahalme + 2008-2012 Jonathan Stickel + 2001-2012 Rolf Fabian 2007 Stallmanfacts.com - 2006-2013 Keith Goodman - 2008-2013 N.J. Higham + 2006-2012 Keith Goodman + 2008-2012 N.J. Higham 2010 Richard T. Guy - 2007-2013 Michael Weitzel - 1998-2013 Nicol N. Schraudolph - 2010-2013 Pedro Gonnet - 2004-2013 Petr Mikulik - 2001-2013 Ross Lippert - 2007-2013 Thomas Treichl - 2009-2013 Tony Richardson - 1998-2013 Walter Gautschi + 2007-2012 Michael Weitzel + 1998-2012 Nicol N. Schraudolph + 2010-2012 Pedro Gonnet + 2004-2012 Petr Mikulik + 2009-2012 Robert T. Short + 2001-2012 Ross Lippert + 2007-2012 Thomas Treichl + 2009-2012 Tony Richardson + 1998-2012 Walter Gautschi 1997-2002 Makoto Matsumoto and Takuji Nishimura - 2011-2013 Jacob Dawid - 2012-2013 Max Brister - 2010, 2013 Martin Hepperle - 2013 John Donoghue - 2009 P. L. Lucas - 2012-2013 pdiribarne - 2009 Nokia Corporation and/or its subsidiary(-ies) - 2012-2013 Torsten - 2008 Kristian Rumberg - 2013 Julien Bect - 2004 Josep Mones i Teixidor - 2013 Michael D. Godfrey - 2013 Mike Miller - 2013 Sébastien Villemot - 2007 Muthiah Annamalai - 2013 Carl Osterwisch - 2001, 2013 David Billinghurst - 2003, 2013 Jaakko Ruohio - 2012-2013 Erik Kjellson - 2012-2013 Fotios Kasolis - 1993-1998 Karl Berry - 2012-2013 Juan Pablo Carbajal - 2013 Leopoldo Cerbaro - 2012-2013 Richard Crozier License: GPL-3+ Files: debian/* Copyright: Andrew D. Fernandes Dale Scheetz Dirk Eddelbuettel - 2005-2009, 2012-2014 Rafael Laboissiere - 2006-2013 Thomas Weber - 2011-2014 Sébastien Villemot - 2013-2014 Mike Miller + 2005-2009, 2012 Rafael Laboissiere + 2006-2012 Thomas Weber + 2011-2012 Sébastien Villemot License: GPL-3+ -Files: liboctave/cruft/amos/* - liboctave/cruft/dassl/* - liboctave/cruft/fftpack/* - liboctave/cruft/slatec-err/* - liboctave/cruft/slatec-fn/* +Files: libcruft/amos/* + libcruft/dassl/* + libcruft/fftpack/* + libcruft/slatec-err/* + libcruft/slatec-fn/* Copyright: none License: public-domain The Library is in the public domain and distributed by the Energy Science @@ -154,15 +129,15 @@ Note that the AMOS library is part of SLATEC and is therefore covered by the same license. -Files: liboctave/cruft/daspk/* +Files: libcruft/daspk/* Copyright: none License: public-domain Work performed under the auspices of the U.S. Department of Energy by Lawrence Livermore National Laboratory under contract number W-7405-Eng-48. -Files: liboctave/cruft/lapack-xtra/* - liboctave/cruft/blas-xtra/xerbla.f +Files: libcruft/lapack-xtra/* + libcruft/blas-xtra/xerbla.f Copyright: 1992-2006 The University of Tennessee License: BSD-3-clause Redistribution and use in source and binary forms, with or without @@ -193,7 +168,7 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Files: liboctave/cruft/opdepack/* +Files: libcruft/opdepack/* Copyright: none License: public-domain Written by Alan C. Hindmarsh @@ -205,7 +180,7 @@ were written at LLNL. All are in the Public Domain and are freely available from the CASC Software Download Site. -Files: liboctave/cruft/quadpack/* +Files: libcruft/quadpack/* Copyright: none License: public-domain QUADPACK originated from a joint project of R. Piessens and E. de @@ -213,7 +188,7 @@ C. Überhuber (Inst. Fuer Math.- Techn.U.Wien, Austria), and D. Kahaner (Nation. Bur. of Standards- Washington D.C., U.S.A.). -Files: liboctave/cruft/ranlib/* +Files: libcruft/ranlib/* Copyright: none License: public-domain We place the Randlib code that we have written in the public domain. @@ -235,42 +210,24 @@ ITS ANALYSIS BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY THIRD PARTIES) THE PROGRAM. -Files: liboctave/cruft/Faddeeva/Faddeeva.cc - liboctave/cruft/Faddeeva/Faddeeva.hh -Copyright: 2012 Massachusetts Institute of Technology -License: Expat - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, sublicense, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject to - the following conditions: - . - The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Software. - . - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE - LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION - OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +Files: liboctave/kpse.cc +Copyright: 1992-1997 Free Software Foundation, Inc + 1993-1997 O. Weber + 1993-1998 Karl Berry +License: LGPL-2+ -Files: liboctave/system/tempnam.c +Files: liboctave/tempnam.c Copyright: 1991, 1993 Free Software Foundation, Inc License: LGPL-2+ -Files: liboctave/system/tempname.c -Copyright: 1991-1993 Free Software Foundation, Inc +Files: liboctave/tempname.c +Copyright: 1991-1993, Free Software Foundation, Inc License: GPL-2+ Files: m4/ax_blas.m4 m4/ax_lapack.m4 m4/ax_pthread.m4 Copyright: 2008-2009 Steven G. Johnson - 2011 Daniel Richard G. License: GPL-3+ with Autoconf exception Files: m4/ax_blas_f77_func.m4 @@ -304,9 +261,7 @@ On Debian systems, the full text of the GNU General Public License version 2 can be found in the file `/usr/share/common-licenses/GPL-2'. -Files: aclocal.m4 - m4/00gnulib.m4 - m4/base64.m4 +Files: m4/00gnulib.m4 m4/canonicalize.m4 m4/ceil.m4 m4/ceilf.m4 @@ -318,6 +273,7 @@ m4/configmake.m4 m4/copysign.m4 m4/copysignf.m4 + m4/d-ino.m4 m4/d-type.m4 m4/dirent_h.m4 m4/dirfd.m4 @@ -326,14 +282,12 @@ m4/dup.m4 m4/dup2.m4 m4/eealloc.m4 - m4/environ.m4 m4/errno_h.m4 m4/error.m4 m4/exponentd.m4 m4/exponentf.m4 m4/exponentl.m4 m4/extensions.m4 - m4/extern-inline.m4 m4/fchdir.m4 m4/fclose.m4 m4/fcntl-o.m4 @@ -351,8 +305,6 @@ m4/fpieee.m4 m4/fpurge.m4 m4/freading.m4 - m4/frexp.m4 - m4/frexpf.m4 m4/fseek.m4 m4/fseeko.m4 m4/fstat.m4 @@ -375,7 +327,6 @@ m4/isnand.m4 m4/isnanf.m4 m4/isnanl.m4 - m4/largefile.m4 m4/link.m4 m4/localcharset.m4 m4/locale-fr.m4 @@ -398,6 +349,7 @@ m4/mkdir.m4 m4/mkfifo.m4 m4/mkostemp.m4 + m4/mkstemp.m4 m4/mmap-anon.m4 m4/mode_t.m4 m4/msvc-inval.m4 @@ -406,12 +358,10 @@ m4/nanosleep.m4 m4/nocrash.m4 m4/nproc.m4 - m4/off_t.m4 m4/open.m4 m4/openat.m4 m4/opendir.m4 m4/printf.m4 - m4/putenv.m4 m4/raise.m4 m4/readdir.m4 m4/readlink.m4 @@ -422,7 +372,6 @@ m4/round.m4 m4/roundf.m4 m4/save-cwd.m4 - m4/secure_getenv.m4 m4/select.m4 m4/sigaction.m4 m4/signal_h.m4 @@ -449,7 +398,6 @@ m4/strftime.m4 m4/string_h.m4 m4/strings_h.m4 - m4/strndup.m4 m4/strptime.m4 m4/symlink.m4 m4/sys_select_h.m4 @@ -459,7 +407,6 @@ m4/sys_times_h.m4 m4/sys_types_h.m4 m4/sys_uio_h.m4 - m4/sys_utsname_h.m4 m4/tempname.m4 m4/time_h.m4 m4/time_r.m4 @@ -469,7 +416,6 @@ m4/tmpfile.m4 m4/trunc.m4 m4/truncf.m4 - m4/uname.m4 m4/unistd-safer.m4 m4/unistd_h.m4 m4/unlink.m4 @@ -479,86 +425,41 @@ m4/wchar_t.m4 m4/wctype_h.m4 m4/wint_t.m4 - m4/xalloc.m4 - m4/xgetcwd.m4 m4/xsize.m4 - m4/xstrndup.m4 -Copyright: 1992-2013, Free Software Foundation, Inc + m4/alloca.m4 + m4/glibc21.m4 + m4/intmax_t.m4 + m4/ltoptions.m4 + m4/malloca.m4 + m4/mbrtowc.m4 + m4/mempcpy.m4 + m4/memrchr.m4 + m4/mktime.m4 + m4/pathmax.m4 + m4/vasprintf.m4 +Copyright: 1992-2012, Free Software Foundation, Inc License: other This file is free software; the Free Software Foundation gives unlimited permission to copy and/or distribute it, with or without modifications, as long as this notice is preserved. -Files: m4/pkg.m4 -Copyright: 2004 Scott James Remnant +Files: scripts/miscellaneous/getappdata.m + scripts/miscellaneous/isappdata.m + scripts/miscellaneous/rmappdata.m + scripts/miscellaneous/setappdata.m + scripts/strings/untabify.m +Copyright: 2010-2012 Ben Abbott License: GPL-2+ -Files: libgui/qterminal/libqterminal/unix/Filter.cpp - libgui/qterminal/libqterminal/unix/Filter.h - libgui/qterminal/libqterminal/unix/KeyboardTranslator.cpp - libgui/qterminal/libqterminal/unix/KeyboardTranslator.h - libgui/qterminal/libqterminal/unix/ScreenWindow.cpp - libgui/qterminal/libqterminal/unix/ScreenWindow.h - libgui/qterminal/libqterminal/unix/Character.h - libgui/qterminal/libqterminal/unix/CharacterColor.h - libgui/qterminal/libqterminal/unix/Emulation.h - libgui/qterminal/libqterminal/unix/Screen.h - libgui/qterminal/libqterminal/unix/Vt102Emulation.h - libgui/qterminal/libqterminal/unix/TerminalModel.cpp - libgui/qterminal/libqterminal/unix/TerminalModel.h - libgui/qterminal/libqterminal/unix/TerminalView.cpp - libgui/qterminal/libqterminal/unix/TerminalView.h - libgui/qterminal/libqterminal/unix/History.cpp - libgui/qterminal/libqterminal/unix/History.h - libgui/qterminal/libqterminal/unix/Screen.cpp - libgui/qterminal/libqterminal/unix/Vt102Emulation.cpp - libgui/qterminal/libqterminal/unix/BlockArray.cpp - libgui/qterminal/libqterminal/unix/BlockArray.h - libgui/qterminal/libqterminal/unix/Emulation.cpp -Copyright: 1997-1998, 2013 Lars Doelle - 2007-2008, 2013 Robert Knight - 2012-2013 Jacob Dawid - 2000, 2013 Stephan Kulow +Files: scripts/sparse/bicg.m +Copyright: 2006 Sylvain Pelissier + 2012 Carlo de Falco License: GPL-2+ -Files: libgui/qterminal/libqterminal/unix/kpty.h - libgui/qterminal/libqterminal/unix/kpty_p.h - libgui/qterminal/libqterminal/unix/TerminalCharacterDecoder.cpp - libgui/qterminal/libqterminal/unix/TerminalCharacterDecoder.h - libgui/qterminal/libqterminal/unix/QUnixTerminalImpl.cpp - libgui/qterminal/libqterminal/unix/QUnixTerminalImpl.h - libgui/qterminal/libqterminal/unix/kpty.cpp -Copyright: 2003, 2007, 2013 Oswald Buddenhagen - 2006-2007, 2013 Robert Knight - 2008 e_k (e_k@users.sourceforge.net) - 2012-2013 Jacob Dawid - 2002, 2013 Waldo Bastian -License: LGPL-2+ - -Files: scripts/polynomial/private/__splinefit__.m -Copyright: 2010 Jonas Lundgren -License: BSD-2-clause - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - . - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the distribution - . - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. +Files: src/gl2ps.c + src/gl2ps.h +Copyright: 1999-2011 C. Geuzaine +License: GPL-2+ License: GPL-2+ This program is free software; you can redistribute it and/or diff -Nru octave-3.8.1/debian/debian_missing_handler.m octave-3.8.1+2+19~ubuntu15.04.1/debian/debian_missing_handler.m --- octave-3.8.1/debian/debian_missing_handler.m 2014-01-13 17:55:52.000000000 +0000 +++ octave-3.8.1+2+19~ubuntu15.04.1/debian/debian_missing_handler.m 1970-01-01 00:00:00.000000000 +0000 @@ -1,36 +0,0 @@ -## Copyright (C) 2013 Mike Miller -## -## This program 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 3 of the License, or -## (at your option) any later version. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Octave; see the file COPYING. If not, see -## . - -## This file was modified for Debian from the original file available at: -## https://savannah.gnu.org/file/distro_missing_handler.m?file_id=29104 -## by Rafael Laboiissiere - -## -*- texinfo -*- -## @deftypefn {Function File} {@var{msg} =} debian_missing_handler (@var{name}) -## Debian-specific hook function for the missing component handler -## (see missing_component_hook). -## @end deftypefn - -function msg = debian_missing_handler (name) - switch (name) - case "info-file" - msg = "please install the Debian package \"octave-info\" to get the Octave manual"; - case "mkoctfile" - msg = "please install the Debian package \"liboctave-dev\" to get the mkoctfile command"; - otherwise - msg = []; - endswitch -endfunction diff -Nru octave-3.8.1/debian/liboctave2.install octave-3.8.1+2+19~ubuntu15.04.1/debian/liboctave2.install --- octave-3.8.1/debian/liboctave2.install 2014-01-13 17:55:52.000000000 +0000 +++ octave-3.8.1+2+19~ubuntu15.04.1/debian/liboctave2.install 2014-10-28 10:54:55.000000000 +0000 @@ -1,5 +1,5 @@ #!/usr/bin/dh-exec -usr/lib/${DEB_HOST_MULTIARCH}/liboctave.so.2* /usr/lib/${DEB_HOST_MULTIARCH} +usr/lib/${DEB_HOST_MULTIARCH}/octave/3.8.1/liboctave.so.2* /usr/lib/${DEB_HOST_MULTIARCH} -usr/lib/${DEB_HOST_MULTIARCH}/liboctinterp.so.2* /usr/lib/${DEB_HOST_MULTIARCH} +usr/lib/${DEB_HOST_MULTIARCH}/octave/3.8.1/liboctinterp.so.2* /usr/lib/${DEB_HOST_MULTIARCH} diff -Nru octave-3.8.1/debian/liboctave-dev.install octave-3.8.1+2+19~ubuntu15.04.1/debian/liboctave-dev.install --- octave-3.8.1/debian/liboctave-dev.install 2014-01-13 17:55:52.000000000 +0000 +++ octave-3.8.1+2+19~ubuntu15.04.1/debian/liboctave-dev.install 2014-10-28 10:54:55.000000000 +0000 @@ -1,8 +1,8 @@ #!/usr/bin/dh-exec -src/mkoctfile /usr/bin/ -src/octave-config /usr/bin/ +usr/bin/mkoctfil* /usr/bin/ +usr/bin/octave-confi* /usr/bin/ examples/ /usr/share/doc/liboctave-dev/ usr/include /usr debian/defs.make /usr/share/octave/debian/ -usr/lib/${DEB_HOST_MULTIARCH}/liboctave.so /usr/lib/${DEB_HOST_MULTIARCH} -usr/lib/${DEB_HOST_MULTIARCH}/liboctinterp.so /usr/lib/${DEB_HOST_MULTIARCH} +usr/lib/${DEB_HOST_MULTIARCH}/octave/3.8.1/liboct*.so /usr/lib/${DEB_HOST_MULTIARCH} +usr/lib/${DEB_HOST_MULTIARCH}/octave/3.8.1/liboct*.so /usr/lib/${DEB_HOST_MULTIARCH} diff -Nru octave-3.8.1/debian/NEWS octave-3.8.1+2+19~ubuntu15.04.1/debian/NEWS --- octave-3.8.1/debian/NEWS 2014-04-11 21:28:37.000000000 +0000 +++ octave-3.8.1+2+19~ubuntu15.04.1/debian/NEWS 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -octave (3.8.0~rc1-1) experimental; urgency=medium - - * Starting with this version, the octave package now contains an - experimental graphical user interface (GUI) based on the Qt toolkit. - That GUI can be started by giving the `--force-gui' option to the - octave binary. - - * For those who want to keep the lower memory footprint of a pure text - interface, there is the `octave-cli' executable which is not linked - against Qt. - - -- Sébastien Villemot Fri, 20 Dec 2013 20:47:36 +0100 diff -Nru octave-3.8.1/debian/octave-common.install octave-3.8.1+2+19~ubuntu15.04.1/debian/octave-common.install --- octave-3.8.1/debian/octave-common.install 2014-01-13 17:55:52.000000000 +0000 +++ octave-3.8.1+2+19~ubuntu15.04.1/debian/octave-common.install 2014-10-28 10:54:55.000000000 +0000 @@ -1,9 +1,4 @@ -#!/usr/bin/dh-exec - usr/share/octave /usr/share/ # install the configuration file we copied into the built tmp tree /etc/octave.conf /etc - -# Install the Debian-specific error handler -debian/debian_missing_handler.m /usr/share/octave/${DEB_VERSION_UPSTREAM}/m/debian/ diff -Nru octave-3.8.1/debian/octave.conf octave-3.8.1+2+19~ubuntu15.04.1/debian/octave.conf --- octave-3.8.1/debian/octave.conf 2014-02-20 09:11:18.000000000 +0000 +++ octave-3.8.1+2+19~ubuntu15.04.1/debian/octave.conf 2014-10-28 10:54:55.000000000 +0000 @@ -4,11 +4,11 @@ ### time Octave starts for every user at this site. ## This file is an extended copy of Octave's startup file at -## /usr/share/octave/${OCTAVE_VERSION}/m/startup/octaverc +# /usr/share/octave/3.6.1/m/startup/octaverc ## Configure readline using the file inputrc in the Octave startup ## directory. -readline_read_init_file (sprintf ("%s%s%s", +read_readline_init_file (sprintf ("%s%s%s", octave_config_info ("startupfiledir"), filesep, "inputrc")); @@ -16,13 +16,20 @@ 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. pkg ("load", "auto"); atexit ("__finish__"); - -## Set the Debian-specific error handler - -missing_component_hook ("debian_missing_handler"); diff -Nru octave-3.8.1/debian/octave.install octave-3.8.1+2+19~ubuntu15.04.1/debian/octave.install --- octave-3.8.1/debian/octave.install 2014-01-13 17:55:52.000000000 +0000 +++ octave-3.8.1+2+19~ubuntu15.04.1/debian/octave.install 2014-10-28 10:54:55.000000000 +0000 @@ -1,5 +1,6 @@ #!/usr/bin/dh-exec usr/bin/octave /usr/bin -usr/bin/octave-cli /usr/bin +usr/bin/octave-3.8.1 /usr/bin +usr/bin/octave-cli* /usr/bin usr/lib/${DEB_HOST_MULTIARCH}/octave/* /usr/lib/${DEB_HOST_MULTIARCH}/octave usr/share/applications /usr/share diff -Nru octave-3.8.1/debian/octave.manpages octave-3.8.1+2+19~ubuntu15.04.1/debian/octave.manpages --- octave-3.8.1/debian/octave.manpages 2014-01-13 17:55:52.000000000 +0000 +++ octave-3.8.1+2+19~ubuntu15.04.1/debian/octave.manpages 2014-10-28 10:54:55.000000000 +0000 @@ -1,2 +1 @@ doc/interpreter/octave.1 -doc/interpreter/octave-cli.1 diff -Nru octave-3.8.1/debian/octave.postinst octave-3.8.1+2+19~ubuntu15.04.1/debian/octave.postinst --- octave-3.8.1/debian/octave.postinst 2014-03-06 17:54:50.000000000 +0000 +++ octave-3.8.1+2+19~ubuntu15.04.1/debian/octave.postinst 2014-10-28 10:54:55.000000000 +0000 @@ -7,6 +7,9 @@ #DEBHELPER# rebuild_pkg_database () { + # Workaround for #681064 (can be removed after Wheezy) + mkdir -p /usr/share/octave/packages + octave --silent --no-history --no-init-file --no-window-system \ --eval "pkg ('rebuild');" } diff -Nru octave-3.8.1/debian/patches/add_info_dir_categories octave-3.8.1+2+19~ubuntu15.04.1/debian/patches/add_info_dir_categories --- octave-3.8.1/debian/patches/add_info_dir_categories 2014-01-13 17:55:52.000000000 +0000 +++ octave-3.8.1+2+19~ubuntu15.04.1/debian/patches/add_info_dir_categories 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -Description: Add categories to the static info files generated by the texi files. -Forwarded: not yet -Author: Thomas Weber ---- a/doc/interpreter/octave.texi -+++ b/doc/interpreter/octave.texi -@@ -23,6 +23,7 @@ - @include macros.texi - - @ifinfo -+@dircategory Math - @format - START-INFO-DIR-ENTRY - * Octave: (octave). Interactive language for numerical computations. ---- a/doc/liboctave/liboctave.texi -+++ b/doc/liboctave/liboctave.texi -@@ -21,6 +21,7 @@ - @setfilename liboctave.info - - @ifinfo -+@dircategory Math - @format - START-INFO-DIR-ENTRY - * liboctave: (liboctave). Octave C++ Classes diff -Nru octave-3.8.1/debian/patches/always-build-octave-jar.patch octave-3.8.1+2+19~ubuntu15.04.1/debian/patches/always-build-octave-jar.patch --- octave-3.8.1/debian/patches/always-build-octave-jar.patch 2014-02-24 17:43:08.000000000 +0000 +++ octave-3.8.1+2+19~ubuntu15.04.1/debian/patches/always-build-octave-jar.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,51 +0,0 @@ -Description: Ensure that octave.jar is built even if java is disabled - On some archs we pass --disable-java to the configure script, but we still - want octave-common to contain octave.jar if built on those archs. -Author: Sébastien Villemot -Forwarded: not-needed -Last-Update: 2014-02-24 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/scripts/java/module.mk -+++ b/scripts/java/module.mk -@@ -1,3 +1,6 @@ -+JAVAC=javac -+JAR=jar -+ - FCN_FILE_DIRS += java - - java_FCN_FILES = \ -@@ -14,13 +17,10 @@ PKG_ADD_FILES += java/PKG_ADD - - DIRSTAMP_FILES += java/$(octave_dirstamp) - --if AMCOND_HAVE_JAVA - JAR_FILES += java/octave.jar --endif - - org_octave_dir = org/octave - --if AMCOND_HAVE_JAVA - JAVA_SRC = \ - $(org_octave_dir)/ClassHelper.java \ - $(org_octave_dir)/OctClassLoader.java \ -@@ -31,7 +31,6 @@ JAVA_SRC = \ - $(org_octave_dir)/DlgListener.java \ - $(org_octave_dir)/TeXtranslator.java \ - $(org_octave_dir)/TeXcode.java --endif - - JAVA_CLASSES = $(JAVA_SRC:.java=.class) - -@@ -61,11 +60,9 @@ java/images.stamp: $(srcdir_java_JAVA_IM - fi - touch $@ - --if AMCOND_HAVE_JAVA - java/octave.jar: java/images.stamp $(java_JAVA_CLASSES) - ( cd java; "$(JAR)" cf octave.jar.t $(JAVA_CLASSES) $(JAVA_IMAGES) ) - mv $@.t $@ --endif - - EXTRA_DIST += $(JAR_FILES) $(java_JAVA_SRC) $(java_JAVA_IMAGES) - diff -Nru octave-3.8.1/debian/patches/dblquad-s390x.diff octave-3.8.1+2+19~ubuntu15.04.1/debian/patches/dblquad-s390x.diff --- octave-3.8.1/debian/patches/dblquad-s390x.diff 2014-01-13 17:55:52.000000000 +0000 +++ octave-3.8.1+2+19~ubuntu15.04.1/debian/patches/dblquad-s390x.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -Description: Disable a test of dblquad.m - That test makes the testsuite crash on s390x. It still needs investigation. -Author: Sébastien Villemot -Forwarded: no -Last-Update: 2014-01-06 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: octave/scripts/general/dblquad.m -=================================================================== ---- octave.orig/scripts/general/dblquad.m 2014-01-02 19:28:07.000000000 +0000 -+++ octave/scripts/general/dblquad.m 2014-01-06 18:35:00.000000000 +0000 -@@ -75,9 +75,6 @@ - endfunction - - --%% Nasty integrand to show quadcc off --%!assert (dblquad (@(x,y) 1 ./ (x+y), 0, 1, 0, 1), 2*log (2), 1e-6) -- - %!assert (dblquad (@(x,y) exp (-x.^2 - y.^2) , -1, 1, -1, 1, 1e-6, @quadgk), pi * erf (1).^2, 1e-6) - %!assert (dblquad (@(x,y) exp (-x.^2 - y.^2) , -1, 1, -1, 1, 1e-6, @quadl), pi * erf (1).^2, 1e-6) - %!assert (dblquad (@(x,y) exp (-x.^2 - y.^2) , -1, 1, -1, 1, 1e-6, @quadv), pi * erf (1).^2, 1e-6) diff -Nru octave-3.8.1/debian/patches/drop_versioned_binaries.diff octave-3.8.1+2+19~ubuntu15.04.1/debian/patches/drop_versioned_binaries.diff --- octave-3.8.1/debian/patches/drop_versioned_binaries.diff 2014-03-10 16:27:09.000000000 +0000 +++ octave-3.8.1+2+19~ubuntu15.04.1/debian/patches/drop_versioned_binaries.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,70 +0,0 @@ -Description: Don't install binarys with a version in them - We don't need them. -Forwarded: not-needed -Author: Thomas Weber ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -141,7 +141,7 @@ mkoctfile.cc: mkoctfile.in.cc Makefile - main.cc: main.in.cc Makefile - @$(do_subst_default_vals) - --install-exec-hook: make-version-links -+install-exec-hook: - - uninstall-local: remove-version-links - ---- a/src/main.in.cc -+++ b/src/main.in.cc -@@ -500,7 +500,7 @@ main (int argc, char **argv) - std::string octave_archlibdir = get_octave_archlibdir (); - - std::string file -- = octave_bindir + dir_sep_char + "octave-cli-" OCTAVE_VERSION;; -+ = octave_bindir + dir_sep_char + "octave-cli";; - - char **new_argv = new char * [argc + 1]; - -@@ -521,7 +521,7 @@ main (int argc, char **argv) - - file = octave_archlibdir + dir_sep_char + "octave-gui"; - #else -- file = octave_bindir + dir_sep_char + "octave-cli-" OCTAVE_VERSION; -+ file = octave_bindir + dir_sep_char + "octave-cli"; - #endif - new_argv[k++] = argv[i]; - } -@@ -566,7 +566,7 @@ main (int argc, char **argv) - start_gui = false; - gui_libs = false; - -- file = octave_bindir + dir_sep_char + "octave-cli-" OCTAVE_VERSION; -+ file = octave_bindir + dir_sep_char + "octave-cli"; - - if (warn_display) - { ---- a/scripts/miscellaneous/mkoctfile.m -+++ b/scripts/miscellaneous/mkoctfile.m -@@ -148,7 +148,7 @@ function [output, status] = mkoctfile (v - bindir = octave_config_info ("bindir"); - ext = octave_config_info ("EXEEXT"); - -- shell_script = fullfile (bindir, sprintf ("mkoctfile-%s%s", OCTAVE_VERSION, ext)); -+ shell_script = fullfile (bindir, "mkoctfile"); - - if (! exist (shell_script, "file")) - __gripe_missing_component__ ("mkoctfile", "mkoctfile"); ---- a/scripts/pkg/private/configure_make.m -+++ b/scripts/pkg/private/configure_make.m -@@ -29,9 +29,9 @@ function configure_make (desc, packdir, - octave_bindir = octave_config_info ("bindir"); - ver = version (); - ext = octave_config_info ("EXEEXT"); -- mkoctfile_program = fullfile (octave_bindir, sprintf ("mkoctfile-%s%s", ver, ext)); -- octave_config_program = fullfile (octave_bindir, sprintf ("octave-config-%s%s", ver, ext)); -- octave_binary = fullfile (octave_bindir, sprintf ("octave-%s%s", ver, ext)); -+ mkoctfile_program = fullfile (octave_bindir, "mkoctfile"); -+ octave_config_program = fullfile (octave_bindir, "octave-config"); -+ octave_binary = fullfile (octave_bindir, "octave"); - cenv = {"MKOCTFILE"; mkoctfile_program; - "OCTAVE_CONFIG"; octave_config_program; - "OCTAVE"; octave_binary; diff -Nru octave-3.8.1/debian/patches/enable_dirs_in_pkg octave-3.8.1+2+19~ubuntu15.04.1/debian/patches/enable_dirs_in_pkg --- octave-3.8.1/debian/patches/enable_dirs_in_pkg 2014-01-13 17:55:52.000000000 +0000 +++ octave-3.8.1+2+19~ubuntu15.04.1/debian/patches/enable_dirs_in_pkg 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -Description: Allow installation of already extracted packages with pkg.m -Forwarded: not-needed -Author: Thomas Weber ---- a/scripts/pkg/private/install.m -+++ b/scripts/pkg/private/install.m -@@ -75,25 +75,32 @@ - endif - - ## Uncompress the package. -- if (verbose) -- printf ("untar (%s, %s)\n", tgz, tmpdir); -- endif -- untar (tgz, tmpdir); -- -- ## Get the name of the directories produced by tar. -- [dirlist, err, msg] = readdir (tmpdir); -- if (err) -- error ("couldn't read directory produced by tar: %s", msg); -- endif -+ if (!exist(tgz, "dir")) -+ if (verbose) -+ printf ("untar (%s, %s)\n", tgz, tmpdir); -+ endif -+ untar (tgz, tmpdir); - -- if (length (dirlist) > 3) -- error ("bundles of packages are not allowed"); -- endif -- endif -+ ## Get the name of the directories produced by tar. -+ [dirlist, err, msg] = readdir (tmpdir); -+ if (err) -+ error ("couldn't read directory produced by tar: %s", msg); -+ endif - -- ## The filename pointed to an uncompressed package to begin with. -- if (exist (tgz, "dir")) -- dirlist = {".", "..", tgz}; -+ if (length (dirlist) > 3) -+ error ("bundles of packages are not allowed"); -+ endif -+ else -+ ## we are dealing with a directory, so just copy the files -+ if (verbose) -+ printf ("Copying directory (%s, %s)\n", tgz, tmpdir); -+ endif -+ [status, msg, msgid] = copyfile (tgz, tmpdir); -+ if (!status) -+ disp(msg); -+ endif -+ dirlist = {".", "..", tgz}; -+ endif - endif - - if (exist (tgz, "file") || exist (tgz, "dir")) diff -Nru octave-3.8.1/debian/patches/hurd_path_max.diff octave-3.8.1+2+19~ubuntu15.04.1/debian/patches/hurd_path_max.diff --- octave-3.8.1/debian/patches/hurd_path_max.diff 2014-03-10 16:27:09.000000000 +0000 +++ octave-3.8.1+2+19~ubuntu15.04.1/debian/patches/hurd_path_max.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -Description: Set a fallback value for PATH_MAX if not defined - Based on kdelibs upstream git commit a8057419. -Author: Mike Miller -Applied-Upstream: http://hg.savannah.gnu.org/hgweb/octave/raw-rev/91805d8ab62f -Bug: https://savannah.gnu.org/bugs/?41212 -Last-Updated: 2014-01-12 - ---- a/libgui/qterminal/libqterminal/unix/kpty.cpp -+++ b/libgui/qterminal/libqterminal/unix/kpty.cpp -@@ -153,6 +153,14 @@ extern "C" { - # endif - #endif - -+#ifndef PATH_MAX -+# ifdef MAXPATHLEN -+# define PATH_MAX MAXPATHLEN -+# else -+# define PATH_MAX 1024 -+# endif -+#endif -+ - /////////////////////// - // private functions // - /////////////////////// diff -Nru octave-3.8.1/debian/patches/install_libraries_publically octave-3.8.1+2+19~ubuntu15.04.1/debian/patches/install_libraries_publically --- octave-3.8.1/debian/patches/install_libraries_publically 2014-01-13 17:55:52.000000000 +0000 +++ octave-3.8.1+2+19~ubuntu15.04.1/debian/patches/install_libraries_publically 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ -Description: Install the Octave libraries publically in /usr/lib/ - Thanks to John Eaton for helping with this. - . - The patch is currently not needed upstream, but forwarding it might make sense - in the future. -Forwarded: not-needed -Author: Thomas Weber ---- a/liboctave/Makefile.am -+++ b/liboctave/Makefile.am -@@ -38,7 +38,8 @@ - - AM_CXXFLAGS += $(WARN_CXXFLAGS) - --octlib_LTLIBRARIES = liboctave.la -+lib_LTLIBRARIES = liboctave.la -+octlib_LTLIBRARIES = - - EXTRA_DIST = - ---- a/libinterp/Makefile.am -+++ b/libinterp/Makefile.am -@@ -38,7 +38,8 @@ - - AM_CXXFLAGS += $(WARN_CXXFLAGS) - --octlib_LTLIBRARIES = liboctinterp.la -+lib_LTLIBRARIES = liboctinterp.la -+octlib_LTLIBRARIES = - - ## Order matters here. Leave builtins.cc last, because it depends on - ## $(DEF_FILES), and building those requires all the sources diff -Nru octave-3.8.1/debian/patches/mkoctfile-mpi.diff octave-3.8.1+2+19~ubuntu15.04.1/debian/patches/mkoctfile-mpi.diff --- octave-3.8.1/debian/patches/mkoctfile-mpi.diff 2014-03-10 16:27:09.000000000 +0000 +++ octave-3.8.1+2+19~ubuntu15.04.1/debian/patches/mkoctfile-mpi.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -Description: Include MPI headers when building Oct/MEX-files -Author: Thomas Weber -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=598227 -Forwarded: not-needed -Last-Update: 2012-08-18 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/src/mkoctfile.in.cc -+++ b/src/mkoctfile.in.cc -@@ -143,7 +143,8 @@ initialize (void) - vars["CXXPICFLAG"] = get_variable ("CXXPICFLAG", %OCTAVE_CONF_CXXPICFLAG%); - vars["XTRA_CFLAGS"] = get_variable ("XTRA_CFLAGS", %OCTAVE_CONF_XTRA_CFLAGS%); - vars["XTRA_CXXFLAGS"] = get_variable ("XTRA_CXXFLAGS", -- %OCTAVE_CONF_XTRA_CXXFLAGS%); -+ std::string("-I/usr/include/mpi ") -+ + %OCTAVE_CONF_XTRA_CXXFLAGS%); - - vars["AR"] = get_variable ("AR", %OCTAVE_CONF_MKOCTFILE_AR%); - vars["RANLIB"] = get_variable ("RANLIB", %OCTAVE_CONF_MKOCTFILE_RANLIB%); diff -Nru octave-3.8.1/debian/patches/no_pdf_in_print.diff octave-3.8.1+2+19~ubuntu15.04.1/debian/patches/no_pdf_in_print.diff --- octave-3.8.1/debian/patches/no_pdf_in_print.diff 2014-01-13 17:55:52.000000000 +0000 +++ octave-3.8.1+2+19~ubuntu15.04.1/debian/patches/no_pdf_in_print.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -Warn that PDF generation is not possible packaged gnuplot, due to the -missing pdflib (closes: #478677) - - -- Thomas Weber Sat, 24 May 2008 13:49:51 +0200 - ---- a/scripts/plot/util/print.m -+++ b/scripts/plot/util/print.m -@@ -165,6 +165,9 @@ - ## - ## @item pdf - ## Portable document format -+## -+## NOTE: The gnuplot binary as shipped by Debian cannot create PDF files, see http://bugs.debian.org/478677 -+## - ## @end table - ## - ## If the device is omitted, it is inferred from the file extension, diff -Nru octave-3.8.1/debian/patches/series octave-3.8.1+2+19~ubuntu15.04.1/debian/patches/series --- octave-3.8.1/debian/patches/series 2014-03-10 16:27:09.000000000 +0000 +++ octave-3.8.1+2+19~ubuntu15.04.1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -enable_dirs_in_pkg -drop_versioned_binaries.diff -install_libraries_publically -no_pdf_in_print.diff -add_info_dir_categories -mkoctfile-mpi.diff -dblquad-s390x.diff -hurd_path_max.diff -always-build-octave-jar.patch diff -Nru octave-3.8.1/debian/README.Atlas octave-3.8.1+2+19~ubuntu15.04.1/debian/README.Atlas --- octave-3.8.1/debian/README.Atlas 1970-01-01 00:00:00.000000000 +0000 +++ octave-3.8.1+2+19~ubuntu15.04.1/debian/README.Atlas 2014-10-28 10:54:55.000000000 +0000 @@ -0,0 +1,9 @@ + + Notes on using Atlas libs with GNU Octave + +In order to speed up Octave's BLAS and LAPACK operation, you can install the +ATLAS packages (libatlas3gf-base at the time of writing). Octave should +automatically pick up the faster libraries. + + + -- Thomas Weber Mon, 14 Nov 2011 22:41:35 +0100 diff -Nru octave-3.8.1/debian/README.Debian octave-3.8.1+2+19~ubuntu15.04.1/debian/README.Debian --- octave-3.8.1/debian/README.Debian 2014-02-20 09:11:18.000000000 +0000 +++ octave-3.8.1+2+19~ubuntu15.04.1/debian/README.Debian 2014-10-28 10:54:55.000000000 +0000 @@ -11,18 +11,7 @@ source archive can be found at http://www.octave.org The Debian Octave-related packages are collectively maintained by the Debian -Octave Group (https://wiki.debian.org/Teams/DebianOctaveGroup). - - -Using ATLAS or OpenBLAS libs with GNU Octave -============================================ - -In order to speed up Octave's linear algebra operations, you can install the -ATLAS package (libatlas3-base), or the OpenBLAS package (libopenblas-base). -Octave should automatically pick up the faster libraries. For more information -about BLAS and LAPACK in Debian, see: - - https://wiki.debian.org/DebianScience/LinearAlgebraLibraries +Octave Group (http://pkg-octave.alioth.debian.org). About Octave-Forge packages @@ -32,9 +21,12 @@ (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- (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. +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? @@ -48,5 +40,5 @@ pkg.m is not part of liboctave-dev as it's used to find already installed packages (via /etc/octave.conf). - -- Sébastien Villemot , Wed, 12 Feb 2014 18:52:32 +0100 + -- Sébastien Villemot , Fri, 1 Jun 2012 14:30:32 +0200 diff -Nru octave-3.8.1/debian/rules octave-3.8.1+2+19~ubuntu15.04.1/debian/rules --- octave-3.8.1/debian/rules 2014-04-11 23:06:32.000000000 +0000 +++ octave-3.8.1+2+19~ubuntu15.04.1/debian/rules 2014-10-28 10:54:55.000000000 +0000 @@ -7,37 +7,12 @@ # This has to be exported to make some magic below work. export DH_OPTIONS +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + # Needed by octave-common.links include /usr/share/dpkg/pkg-info.mk -DEB_VERSION_UPSTREAM := $(subst ~rc,-rc,$(DEB_VERSION_UPSTREAM)) export DEB_VERSION_UPSTREAM -# Configure default Java paths using javahelper except on some archs. -# hurd-i386, kfreebsd-* and sparc have gcj as default, which cause either -# a compilation failure (hurd-i386) or a test failure (other archs). -# On mipsel java unit tests calling openjdk-7 cause a bus error at runtime. -# This arch list must be kept in sync with the arch list qualifying -# default-jre in debian/control (note: we always want default-jdk in -# build deps because it is needed for octave-common, see -# debian/patches/always-build-octave-jar.patch). -include /usr/share/dpkg/architecture.mk -NO_JDK_ARCHS := hurd-i386 kfreebsd-amd64 kfreebsd-i386 mipsel sparc -ifneq (,$(filter $(DEB_HOST_ARCH),$(NO_JDK_ARCHS))) -WITH_JAVA_FLAGS := --disable-java -else -include /usr/share/javahelper/java-vars.mk -JAVA_LIBDIR := $(firstword $(JVM_CLIENT_DIR) $(JVM_SERVER_DIR)) -WITH_JAVA_FLAGS := --with-java-homedir=$(JAVA_HOME) --with-java-libdir=$(JAVA_LIBDIR) -endif - -# Enable the JIT on some archs. On other archs, either LLVM is unavailable, or -# JIT unit tests currently segfault. This arch list must be kept in sync with -# the arch list qualifying llvm-dev in debian/control. -JIT_ARCHS := -ifneq (,$(filter $(DEB_HOST_ARCH),$(JIT_ARCHS))) -JIT_FLAG := --enable-jit -endif - %: dh $@ --with autoreconf --parallel @@ -45,12 +20,9 @@ dh clean --with autoreconf # override normal dh_auto_configure call to pass OpenMP flag to it (#631831) +# and while we are at it, disable the rpath (thanks lintian) override_dh_auto_configure: - dh_auto_configure -- --enable-openmp $(WITH_JAVA_FLAGS) $(JIT_FLAG) - -# dh_auto_test tries to run "make test", so override it -override_dh_auto_test: - xvfb-run make check + dh_auto_configure -- --enable-openmp --disable-rpath # override normal dh_compress call to avoid compressing .pdf files override_dh_compress: @@ -62,18 +34,7 @@ # Smuggle our configuration file into the installed files mkdir -p debian/tmp/etc && cp debian/octave.conf debian/tmp/etc/ dh_auto_install --max-parallel=1 - # Delete .la files (for liboctgui) - find debian/tmp -name '*.la' -delete - -# The info files have references to .png images -# Rename them by prefixing their name with "octave-", adapt the *.info files to -# this new name, and ship the images under /usr/share/info -override_dh_installinfo-indep: - dh_installinfo - for f in `grep -a src=\".*\" doc/interpreter/*.info* | sed 's/.*src="\([^"]*\)".*/\1/'`; do \ - cp doc/interpreter/$$f debian/octave-info/usr/share/info/octave-$$f; \ - sed -i "s/src=\"$$f\"/src=\"octave-$$f\"/g" debian/octave-info/usr/share/info/octave.info*; \ - done + # save debug information into the debug package override_dh_strip: @@ -86,6 +47,10 @@ dh_shlibdeps -O--parallel find debian/octave -name '*.oct' -print0 2>/dev/null | xargs -0r chmod 644 +# Latest version containing a backward-compatible API change (see policy 8.6.2) +override_dh_makeshlibs: + dh_makeshlibs -V 'liboctave2 (>= 3.8.1)' + get-orig-source: uscan --force-download --rename --destdir . .PHONY: get-orig-source diff -Nru octave-3.8.1/debian/source/format octave-3.8.1+2+19~ubuntu15.04.1/debian/source/format --- octave-3.8.1/debian/source/format 2013-11-06 13:33:16.000000000 +0000 +++ octave-3.8.1+2+19~ubuntu15.04.1/debian/source/format 2014-10-28 10:54:56.000000000 +0000 @@ -1 +1 @@ -3.0 (quilt) +3.0 (native) diff -Nru octave-3.8.1/debian/source/include-binaries octave-3.8.1+2+19~ubuntu15.04.1/debian/source/include-binaries --- octave-3.8.1/debian/source/include-binaries 2014-02-20 09:11:18.000000000 +0000 +++ octave-3.8.1+2+19~ubuntu15.04.1/debian/source/include-binaries 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -debian/upstream/signing-key.pgp diff -Nru octave-3.8.1/debian/source/lintian-overrides octave-3.8.1+2+19~ubuntu15.04.1/debian/source/lintian-overrides --- octave-3.8.1/debian/source/lintian-overrides 2014-01-13 17:55:52.000000000 +0000 +++ octave-3.8.1+2+19~ubuntu15.04.1/debian/source/lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -octave source: dh-exec-subst-unknown-variable debian/octave-common.install DEB_VERSION_UPSTREAM diff -Nru octave-3.8.1/debian/source/options octave-3.8.1+2+19~ubuntu15.04.1/debian/source/options --- octave-3.8.1/debian/source/options 2014-01-13 17:55:52.000000000 +0000 +++ octave-3.8.1+2+19~ubuntu15.04.1/debian/source/options 2014-10-28 10:54:55.000000000 +0000 @@ -1 +1 @@ -extend-diff-ignore=.*\.pdf|.*\.dvi|.*\.png|.*\.eps|.*\.ps|.*\.texi|.*\.info.*|stamp-vti|libinterp/parse-tree/oct-gperf\.h|AUTHORS|doc/interpreter/doc-cache +extend-diff-ignore=.*\.pdf|.*\.dvi|.*\.png|.*\.eps|.*\.ps|.*\.texi|.*\.info.*|stamp-vti|src/oct-gperf\.h|AUTHORS Binary files /tmp/dPelSFW5ru/octave-3.8.1/debian/upstream/signing-key.pgp and /tmp/OIqH4O1Vq1/octave-3.8.1+2+19~ubuntu15.04.1/debian/upstream/signing-key.pgp differ diff -Nru octave-3.8.1/debian/watch octave-3.8.1+2+19~ubuntu15.04.1/debian/watch --- octave-3.8.1/debian/watch 2014-01-13 17:55:52.000000000 +0000 +++ octave-3.8.1+2+19~ubuntu15.04.1/debian/watch 2014-10-28 10:54:55.000000000 +0000 @@ -1,2 +1,2 @@ version=3 -opts=pgpsigurlmangle=s/$/.sig/ http://ftpmirror.gnu.org/octave/octave-([\d\.]+)\.tar\.bz2 +http://ftpmirror.gnu.org/octave/octave-([\d\.]+)\.tar\.bz2