[Pkg-octave-commit] [octave-io] 02/04: Refresh patches
Thomas Weber
tweber at moszumanska.debian.org
Tue Apr 22 12:35:48 UTC 2014
This is an automated email from the git hooks/post-receive script.
tweber pushed a commit to branch master
in repository octave-io.
commit 1f9234f55a43c5c4d0e924f254245d7d19ad5bc1
Author: Thomas Weber <tweber at debian.org>
Date: Sun Apr 20 18:36:13 2014 +0200
Refresh patches
---
debian/patches/autoload-yes.patch | 4 ++--
debian/patches/low-priority-for-POI.patch | 10 +++++-----
debian/patches/low-priority-for-UNO.patch | 18 ++++++++---------
debian/patches/uno.patch | 33 ++++++++++++++++---------------
4 files changed, 33 insertions(+), 32 deletions(-)
diff --git a/debian/patches/autoload-yes.patch b/debian/patches/autoload-yes.patch
index d6b2c95..b3d859d 100644
--- a/debian/patches/autoload-yes.patch
+++ b/debian/patches/autoload-yes.patch
@@ -6,9 +6,9 @@ Last-Update: 2013-04-17
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/DESCRIPTION
+++ b/DESCRIPTION
-@@ -9,6 +9,6 @@ Categories: IO
+@@ -9,6 +9,6 @@
Problems: Default initial Java memory probably too small, increase with java.opts (see documentation). No OXS write support. UNO support experimental.
- Depends: octave (>= 3.7.2)
+ Depends: octave (>= 3.8.0)
Suggested: windows (>= 1.2.1)
-Autoload: no
+Autoload: yes
diff --git a/debian/patches/low-priority-for-POI.patch b/debian/patches/low-priority-for-POI.patch
index 2f33804..63848ef 100644
--- a/debian/patches/low-priority-for-POI.patch
+++ b/debian/patches/low-priority-for-POI.patch
@@ -8,7 +8,7 @@ Last-Update: 2014-02-20
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/inst/xlsopen.m
+++ b/inst/xlsopen.m
-@@ -318,7 +318,7 @@ function [ xls ] = xlsopen (filename, xw
+@@ -314,7 +314,7 @@
## Keep track of which interface is selected
xlssupport = 0;
@@ -17,7 +17,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
## ftype (file type) is conveyed depending on interface capabilities
if ((! xlssupport) && xlsinterfaces.COM && (ftype != 5))
-@@ -326,10 +326,6 @@ function [ xls ] = xlsopen (filename, xw
+@@ -322,10 +322,6 @@
[ xls, xlssupport, lastintf ] = __COM_spsh_open__ (xls, xwrite, filename, xlssupport);
endif
@@ -28,7 +28,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
if ((! xlssupport) && xlsinterfaces.JXL && ftype == 1)
[ xls, xlssupport, lastintf ] = __JXL_spsh_open__ (xls, xwrite, filename, xlssupport, ftype);
endif
-@@ -351,6 +347,10 @@ function [ xls ] = xlsopen (filename, xw
+@@ -347,6 +343,10 @@
[ xls, xlssupport, lastintf ] = __OCT_spsh_open__ (xls, xwrite, filename, xlssupport, ftype);
endif
@@ -41,7 +41,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
## endif
--- a/inst/private/getxlsinterfaces.m
+++ b/inst/private/getxlsinterfaces.m
-@@ -161,32 +161,6 @@ function [xlsinterfaces] = getxlsinterfa
+@@ -161,32 +161,6 @@
endif
endif
@@ -74,7 +74,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
## Try Java & JExcelAPI
if (isempty (xlsinterfaces.JXL))
xlsinterfaces.JXL = 0;
-@@ -259,6 +233,32 @@ function [xlsinterfaces] = getxlsinterfa
+@@ -259,6 +233,32 @@
endif
endif
diff --git a/debian/patches/low-priority-for-UNO.patch b/debian/patches/low-priority-for-UNO.patch
index 0791993..0b8977d 100644
--- a/debian/patches/low-priority-for-UNO.patch
+++ b/debian/patches/low-priority-for-UNO.patch
@@ -7,7 +7,7 @@ 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
-@@ -285,6 +285,12 @@ function [ ods ] = odsopen (filename, rw
+@@ -290,6 +290,12 @@
__JOD_spsh_open__ (ods, rw, filename, odssupport);
endif
@@ -20,7 +20,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
if (odsinterfaces.UNO && ! odssupport && ftype < 5)
## Warn for LO / OOo stubbornness
if (ftype == 0 || ftype == 5 || ftype == 6)
-@@ -294,12 +300,6 @@ function [ ods ] = odsopen (filename, rw
+@@ -299,12 +305,6 @@
__UNO_spsh_open__ (ods, rw, filename, odssupport);
endif
@@ -35,7 +35,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/inst/private/getodsinterfaces.m
+++ b/inst/private/getodsinterfaces.m
-@@ -188,6 +188,19 @@ function [odsinterfaces] = getodsinterfa
+@@ -188,6 +188,19 @@
endif
endif
@@ -55,7 +55,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
## Try Java & UNO
if (isempty (odsinterfaces.UNO))
odsinterfaces.UNO = 0;
-@@ -208,19 +221,6 @@ function [odsinterfaces] = getodsinterfa
+@@ -208,19 +221,6 @@
endif
endif
@@ -77,7 +77,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
if (deflt)
--- a/inst/private/getxlsinterfaces.m
+++ b/inst/private/getxlsinterfaces.m
-@@ -202,6 +202,19 @@ function [xlsinterfaces] = getxlsinterfa
+@@ -202,6 +202,19 @@
endif
endif
@@ -97,7 +97,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
## Try Java & UNO
if (isempty (xlsinterfaces.UNO))
xlsinterfaces.UNO = 0;
-@@ -220,19 +233,6 @@ function [xlsinterfaces] = getxlsinterfa
+@@ -220,19 +233,6 @@
endif
endif
@@ -119,7 +119,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
xlsinterfaces.POI = 0;
--- a/inst/xlsopen.m
+++ b/inst/xlsopen.m
-@@ -318,7 +318,7 @@ function [ xls ] = xlsopen (filename, xw
+@@ -314,7 +314,7 @@
## Keep track of which interface is selected
xlssupport = 0;
@@ -128,7 +128,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
## ftype (file type) is conveyed depending on interface capabilities
if ((! xlssupport) && xlsinterfaces.COM && (ftype != 5))
-@@ -334,6 +334,11 @@ function [ xls ] = xlsopen (filename, xw
+@@ -330,6 +330,11 @@
[ xls, xlssupport, lastintf ] = __OXS_spsh_open__ (xls, xwrite, filename, xlssupport, ftype);
endif
@@ -140,7 +140,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
if ((! xlssupport) && xlsinterfaces.UNO && (ftype != 5))
## Warn for LO / OOo stubbornness
if (ftype == 0 || ftype == 5 || ftype == 6)
-@@ -342,11 +347,6 @@ function [ xls ] = xlsopen (filename, xw
+@@ -338,11 +343,6 @@
[ xls, xlssupport, lastintf ] = __UNO_spsh_open__ (xls, xwrite, filename, xlssupport);
endif
diff --git a/debian/patches/uno.patch b/debian/patches/uno.patch
index 664d7d7..64ffde6 100644
--- a/debian/patches/uno.patch
+++ b/debian/patches/uno.patch
@@ -1,9 +1,10 @@
--- a/PKG_ADD
+++ b/PKG_ADD
-@@ -20,28 +20,20 @@ if (octave_config_info ("features").JAVA
+@@ -19,29 +19,20 @@
+ ## Set libdir to "." to avoid searching in a root dir
libdir = ".";
endif
-
+-
- ## Find LibreOffice or OpenOffice.org
- ooopath = '';
- ii = 0;
@@ -14,10 +15,10 @@
- "/opt", ...
- "/usr/lib"};
- while (isempty (ooopath) && ii < numel (bnam))
-- ooopath = glob ([ bnam{++ii} filesep "LibreOffice*"]);
+- ooopath = glob ([ bnam{++ii} filesep "[Ll]ibre[Oo]ffice*"]);
- endwhile
- while (isempty (ooopath) && ii < numel (bnam))
-- ooopath = glob ([ bnam{++ii} filesep "OpenOffice.org*"]);
+- ooopath = glob ([ bnam{++ii} filesep "[Oo]pen[Oo]ffice.org*"]);
- endwhile
- while (isempty (ooopath) && ii < numel (bnam))
- ooopath = glob ([ bnam{++ii} filesep "ooo*"]);
@@ -29,21 +30,21 @@
+ ## Find LibreOffice
+ ooopath = '/usr/share/libreoffice';
+ if exist ("/usr/share/libreoffice/program", "dir") ...
-+ && exist ("/usr/share/libreoffice/program/classes/unoil.jar", "file") ...
-+ && exist ("/usr/share/java/jurt.jar", "file") ...
-+ && exist ("/usr/share/java/juh.jar", "file") ...
-+ && exist ("/usr/share/java/unoloader.jar", "file") ...
-+ && exist ("/usr/share/java/ridl.jar", "file")
-+ javaaddpath /usr/share/libreoffice/program
-+ javaaddpath /usr/share/libreoffice/program/classes/unoil.jar
-+ javaaddpath /usr/share/java/jurt.jar
-+ javaaddpath /usr/share/java/juh.jar
-+ javaaddpath /usr/share/java/unoloader.jar
-+ javaaddpath /usr/share/java/ridl.jar
++ && exist ("/usr/share/libreoffice/program/classes/unoil.jar", "file") ...
++ && exist ("/usr/share/java/jurt.jar", "file") ...
++ && exist ("/usr/share/java/juh.jar", "file") ...
++ && exist ("/usr/share/java/unoloader.jar", "file") ...
++ && exist ("/usr/share/java/ridl.jar", "file")
++ javaaddpath /usr/share/libreoffice/program
++ javaaddpath /usr/share/libreoffice/program/classes/unoil.jar
++ javaaddpath /usr/share/java/jurt.jar
++ javaaddpath /usr/share/java/juh.jar
++ javaaddpath /usr/share/java/unoloader.jar
++ javaaddpath /usr/share/java/ridl.jar
endif
## One big try-catch to circumvent possible problems on Linux
-@@ -73,4 +65,4 @@ if (octave_config_info ("features").JAVA
+@@ -80,4 +71,4 @@
end_try_catch
endif
## Clean up
--
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