[Pkg-octave-commit] [octave-io] 03/04: Since 2.2.0, java libraries are no longer autoloaded. Therefore:
Sébastien Villemot
sebastien at debian.org
Wed Apr 30 11:16:33 UTC 2014
This is an automated email from the git hooks/post-receive script.
sebastien pushed a commit to branch master
in repository octave-io.
commit e7662fddc3050b2ae49437f326463e78a4b59cb6
Author: Sébastien Villemot <sebastien at debian.org>
Date: Wed Apr 30 13:10:27 2014 +0200
Since 2.2.0, java libraries are no longer autoloaded. Therefore:
- mention this in NEWS.Debian
- explain in README.Debian how to manually load java libraries
- explicitly run chk_spreadsheet_support in testsuite, but without UNO support since it does not work in chroots (and therefore drop build-dependencies on libreoffice)
- drop low-priority-for-UNO.patch, since it is now less relevant
Git-Dch: Full
---
debian/NEWS | 10 ++
debian/README.Debian | 16 ++--
debian/check.m | 9 +-
debian/control | 1 -
debian/patches/low-priority-for-UNO.patch | 154 ------------------------------
debian/patches/series | 1 -
6 files changed, 25 insertions(+), 166 deletions(-)
diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644
index 0000000..e9b49c3
--- /dev/null
+++ b/debian/NEWS
@@ -0,0 +1,10 @@
+octave-io (2.2.1-1) unstable; urgency=medium
+
+ * Note that auto-loading of java libraries is now disabled, because it
+ significantly increases the startup time of octave. This means that,
+ by default, the package has access to less interfaces, and in
+ particular can no longer read XLS files. See README.Debian for
+ instructions on manually activating these java-based interfaces.
+
+ -- Sébastien Villemot <sebastien at debian.org> Wed, 30 Apr 2014 13:07:46 +0200
+
diff --git a/debian/README.Debian b/debian/README.Debian
index 904a5ff..a406331 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -4,8 +4,15 @@ Status of spreadsheet support in IO package for Octave
This package provides support for reading Excel (XLS, XLSX), OpenDocument
(ODS) and Gnumeric spreadsheet files from Octave.
-If you installed the packages recommended by octave-io, the following
-interfaces should already be functional:
+By default, the package can read/write XLSX and ODS files, and can read
+gnumeric files (using the so-called OCT interface).
+
+If you installed the packages recommended by octave-io, and after you have run
+the following command in octave:
+
+ chk_spreadsheet_support("/usr/share/java", 0, "/usr/share/libreoffice");
+
+then the following interfaces will also be accessible:
* JExcelAPI (JXL): for reading and writing XLS files;
@@ -17,9 +24,6 @@ interfaces should already be functional:
Note that the UNO interface is still experimental. It interacts with running
LibreOffice processes.
-There is also a built-in pure Octave interface (OCT) for reading (but not
-writing) XLSX, ODS and gnumeric files.
-
Other interfaces (OpenXLS, ODF Toolkit, JOpenDocument) are not available in
Debian.
@@ -30,4 +34,4 @@ function can help you diagnose problems if any.
More information on spreadsheet support can be found in READ-XLS.html and
READ-ODS.html.
- -- Sébastien Villemot <sebastien at debian.org>, Sat, 16 Nov 2013 15:08:26 +0100
+ -- Sébastien Villemot <sebastien at debian.org>, Wed, 30 Apr 2014 13:04:14 +0200
diff --git a/debian/check.m b/debian/check.m
index 1a32f1e..de7debd 100644
--- a/debian/check.m
+++ b/debian/check.m
@@ -1,5 +1,9 @@
disp("Testing {xls,ods}read...")
+# Do not load libreoffice/UNO stuff (the 3rd arg is omitted), since UNO does
+# not work in a chroot
+chk_spreadsheet_support("/usr/share/java", 0)
+
# Test defaults
testhelper("xls")
@@ -7,15 +11,12 @@ testhelper("xlsx")
testhelper("ods")
testhelper("gnumeric")
-# Test specific interfaces (UNO must be last in each category)
+# Test specific interfaces (except UNO)
testhelper("xls", "JXL")
testhelper("xls", "POI")
-testhelper("xls", "UNO")
testhelper("xlsx", "OCT")
testhelper("xlsx", "POI")
-testhelper("xlsx", "UNO")
testhelper("ods", "OCT")
-testhelper("ods", "UNO")
diff --git a/debian/control b/debian/control
index 87418ac..b0c3def 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Maintainer: Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>
Uploaders: Thomas Weber <tweber at debian.org>,
Sébastien Villemot <sebastien at debian.org>
Build-Depends: debhelper (>= 9), cdbs, octave-pkg-dev (>= 1.1),
- libreoffice-java-common, libreoffice-core (>= 3.5),
libjexcelapi-java, libapache-poi-java (>= 3.9-1~),
unzip
Standards-Version: 3.9.5
diff --git a/debian/patches/low-priority-for-UNO.patch b/debian/patches/low-priority-for-UNO.patch
deleted file mode 100644
index 0b8977d..0000000
--- a/debian/patches/low-priority-for-UNO.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-Description: Give low priority to UNO interface (below OCT)
- It does not work well in chroots, and is experimental.
-Author: Sébastien Villemot <sebastien at debian.org>
-Forwarded: not-needed
-Last-Update: 2014-02-20
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/inst/odsopen.m
-+++ b/inst/odsopen.m
-@@ -290,6 +290,12 @@
- __JOD_spsh_open__ (ods, rw, filename, odssupport);
- endif
-
-+ if (odsinterfaces.OCT && ! odssupport && ...
-+ (ftype == 2 || ftype == 3 || ftype == 5))
-+ [ ods, odssupport, lastintf ] = ...
-+ __OCT_spsh_open__ (ods, rw, filename, odssupport, ftype);
-+ endif
-+
- if (odsinterfaces.UNO && ! odssupport && ftype < 5)
- ## Warn for LO / OOo stubbornness
- if (ftype == 0 || ftype == 5 || ftype == 6)
-@@ -299,12 +305,6 @@
- __UNO_spsh_open__ (ods, rw, filename, odssupport);
- endif
-
-- if (odsinterfaces.OCT && ! odssupport && ...
-- (ftype == 2 || ftype == 3 || ftype == 5))
-- [ ods, odssupport, lastintf ] = ...
-- __OCT_spsh_open__ (ods, rw, filename, odssupport, ftype);
-- endif
--
- ## if
- ## <other interfaces here>
-
---- a/inst/private/getodsinterfaces.m
-+++ b/inst/private/getodsinterfaces.m
-@@ -188,6 +188,19 @@
- endif
- endif
-
-+ ## Native Octave
-+ if (isempty (odsinterfaces.OCT))
-+ ## Nothing to check, always supported
-+ odsinterfaces.OCT = 1;
-+ printf ("OCT");
-+ if (deflt)
-+ printf ("; ");
-+ else
-+ printf ("*; ");
-+ deflt = 1;
-+ endif
-+ endif
-+
- ## Try Java & UNO
- if (isempty (odsinterfaces.UNO))
- odsinterfaces.UNO = 0;
-@@ -208,19 +221,6 @@
- endif
- endif
-
-- ## Native Octave
-- if (isempty (odsinterfaces.OCT))
-- ## Nothing to check, always supported
-- odsinterfaces.OCT = 1;
-- printf ("OCT");
-- if (deflt)
-- printf ("; ");
-- else
-- printf ("*; ");
-- deflt = 1;
-- endif
-- endif
--
- ## ---- Other interfaces here, similar to the ones above
-
- if (deflt)
---- a/inst/private/getxlsinterfaces.m
-+++ b/inst/private/getxlsinterfaces.m
-@@ -202,6 +202,19 @@
- endif
- endif
-
-+ ## Native Octave
-+ if (isempty (xlsinterfaces.OCT))
-+ ## Nothing to check, always supported
-+ xlsinterfaces.OCT = 1;
-+ printf ("OCT");
-+ if (deflt)
-+ printf ("; ");
-+ else
-+ printf ("*; ");
-+ deflt = 1;
-+ endif
-+ endif
-+
- ## Try Java & UNO
- if (isempty (xlsinterfaces.UNO))
- xlsinterfaces.UNO = 0;
-@@ -220,19 +233,6 @@
- endif
- endif
-
-- ## Native Octave
-- if (isempty (xlsinterfaces.OCT))
-- ## Nothing to check, always supported
-- xlsinterfaces.OCT = 1;
-- printf ("OCT");
-- if (deflt)
-- printf ("; ");
-- else
-- printf ("*; ");
-- deflt = 1;
-- endif
-- endif
--
- ## Try Java & Apache POI
- if (isempty (xlsinterfaces.POI))
- xlsinterfaces.POI = 0;
---- a/inst/xlsopen.m
-+++ b/inst/xlsopen.m
-@@ -314,7 +314,7 @@
- ## Keep track of which interface is selected
- xlssupport = 0;
-
-- ## Interface preference order is defined below: currently COM -> JXL -> OXS -> UNO -> OCT -> POI
-+ ## Interface preference order is defined below: currently COM -> JXL -> OXS -> OCT -> UNO -> POI
- ## ftype (file type) is conveyed depending on interface capabilities
-
- if ((! xlssupport) && xlsinterfaces.COM && (ftype != 5))
-@@ -330,6 +330,11 @@
- [ xls, xlssupport, lastintf ] = __OXS_spsh_open__ (xls, xwrite, filename, xlssupport, ftype);
- endif
-
-+ if ((! xlssupport) && xlsinterfaces.OCT && ...
-+ (ftype == 2 || ftype == 3 || ftype == 5))
-+ [ xls, xlssupport, lastintf ] = __OCT_spsh_open__ (xls, xwrite, filename, xlssupport, ftype);
-+ endif
-+
- if ((! xlssupport) && xlsinterfaces.UNO && (ftype != 5))
- ## Warn for LO / OOo stubbornness
- if (ftype == 0 || ftype == 5 || ftype == 6)
-@@ -338,11 +343,6 @@
- [ xls, xlssupport, lastintf ] = __UNO_spsh_open__ (xls, xwrite, filename, xlssupport);
- endif
-
-- if ((! xlssupport) && xlsinterfaces.OCT && ...
-- (ftype == 2 || ftype == 3 || ftype == 5))
-- [ xls, xlssupport, lastintf ] = __OCT_spsh_open__ (xls, xwrite, filename, xlssupport, ftype);
-- endif
--
- if ((! xlssupport) && xlsinterfaces.POI && (ftype <= 2))
- [ xls, xlssupport, lastintf ] = __POI_spsh_open__ (xls, xwrite, filename, xlssupport, ftype, xlsinterfaces);
- endif
diff --git a/debian/patches/series b/debian/patches/series
index 3c3336c..92d0345 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
no-flexml.patch
autoload-yes.patch
uno.patch
-low-priority-for-UNO.patch
--
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave-io.git
More information about the Pkg-octave-commit
mailing list