[Pkg-octave-commit] [octave-io] 01/04: Drop low-priority-for-POI.patch, no longer needed (#739602 was fixed in 2.2.0-1).

[Sébastien Villemot]

This is an automated email from the git hooks/post-receive script.

sebastien pushed a commit to branch master
in repository octave-io.

commit f3e4be051d8bd40df7f89c34eaf657f39163f072
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Wed Apr 30 12:59:03 2014 +0200

    Drop low-priority-for-POI.patch, no longer needed (#739602 was fixed in 2.2.0-1).
---
 debian/patches/low-priority-for-POI.patch | 109 ------------------------------
 debian/patches/series                     |   1 -
 2 files changed, 110 deletions(-)

diff --git a/debian/patches/low-priority-for-POI.patch b/debian/patches/low-priority-for-POI.patch
deleted file mode 100644
index 63848ef..0000000
--- a/debian/patches/low-priority-for-POI.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-Description: Give low priority to POI interface
- It does not function correctly: it sees the file but no data inside.
-Author: Sébastien Villemot <sebastien at debian.org>
-Bug-Debian: http://bugs.debian.org/739602
-Forwarded: no
-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
-@@ -314,7 +314,7 @@
-   ## Keep track of which interface is selected
-   xlssupport = 0;
- 
--  ## Interface preference order is defined below: currently COM -> POI -> JXL -> OXS -> UNO -> OCT
-+  ## Interface preference order is defined below: currently COM -> JXL -> OXS -> UNO -> OCT -> POI
-   ## ftype (file type) is conveyed depending on interface capabilities
- 
-   if ((! xlssupport) && xlsinterfaces.COM && (ftype != 5))
-@@ -322,10 +322,6 @@
-     [ xls, xlssupport, lastintf ] = __COM_spsh_open__ (xls, xwrite, filename, xlssupport);
-   endif
- 
--  if ((! xlssupport) && xlsinterfaces.POI && (ftype <= 2))
--    [ xls, xlssupport, lastintf ] = __POI_spsh_open__ (xls, xwrite, filename, xlssupport, ftype, xlsinterfaces);
--  endif
--
-   if ((! xlssupport) && xlsinterfaces.JXL && ftype == 1)
-     [ xls, xlssupport, lastintf ] = __JXL_spsh_open__ (xls, xwrite, filename, xlssupport, ftype);
-   endif
-@@ -347,6 +343,10 @@
-     [ 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
-+
-   ## if 
-   ##  ---- other interfaces
-   ## endif
---- a/inst/private/getxlsinterfaces.m
-+++ b/inst/private/getxlsinterfaces.m
-@@ -161,32 +161,6 @@
-     endif
-   endif
- 
--  ## Try Java & Apache POI
--  if (isempty (xlsinterfaces.POI))
--    xlsinterfaces.POI = 0;
--    ## Check basic .xls (BIFF8) support
--    entries = {{"apache-poi.", "poi-3"}, {"apache-poi-ooxml.", "poi-ooxml-3"}};
--    ## Only under *nix we might use brute force: e.g., strfind (classname, classpath);
--    ## under Windows we need the following more subtle, platform-independent approach:
--    if (chk_jar_entries (jcp, entries) >= numel (entries))
--      xlsinterfaces.POI = 1;
--      printf ("POI");
--    endif
--    ## Check OOXML support
--    entries = {{"xbean", "xmlbean"}, {"apache-poi-ooxml-schemas", "poi-ooxml-schemas"}, "dom4j"};
--    if (chk_jar_entries (jcp, entries) >= numel (entries))
--      printf (" (& OOXML)");
--    endif
--    if (xlsinterfaces.POI)
--      if (deflt)
--        printf ("; ");
--      else
--        printf ("*; ");
--        deflt = 1; 
--      endif
--    endif
--  endif
--
-   ## Try Java & JExcelAPI
-   if (isempty (xlsinterfaces.JXL))
-     xlsinterfaces.JXL = 0;
-@@ -259,6 +233,32 @@
-     endif
-   endif
- 
-+  ## Try Java & Apache POI
-+  if (isempty (xlsinterfaces.POI))
-+    xlsinterfaces.POI = 0;
-+    ## Check basic .xls (BIFF8) support
-+    entries = {{"apache-poi.", "poi-3"}, {"apache-poi-ooxml.", "poi-ooxml-3"}};
-+    ## Only under *nix we might use brute force: e.g., strfind (classname, classpath);
-+    ## under Windows we need the following more subtle, platform-independent approach:
-+    if (chk_jar_entries (jcp, entries) >= numel (entries))
-+      xlsinterfaces.POI = 1;
-+      printf ("POI");
-+    endif
-+    ## Check OOXML support
-+    entries = {{"xbean", "xmlbean"}, {"apache-poi-ooxml-schemas", "poi-ooxml-schemas"}, "dom4j"};
-+    if (chk_jar_entries (jcp, entries) >= numel (entries))
-+      printf (" (& OOXML)");
-+    endif
-+    if (xlsinterfaces.POI)
-+      if (deflt)
-+        printf ("; ");
-+      else
-+        printf ("*; ");
-+        deflt = 1; 
-+      endif
-+    endif
-+  endif
-+
-   ## ---- Other interfaces here, similar to the ones above
- 
-   if (deflt)
diff --git a/debian/patches/series b/debian/patches/series
index 126b715..3c3336c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 no-flexml.patch
 autoload-yes.patch
-low-priority-for-POI.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