[Pkg-octave-commit] [SCM] Debian packaging for octave-io branch, master, updated. debian/1.0.19-1-12-gdcb9424

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit beb61f85e36b353ebe67ad4c70f640dd2b093def
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Wed Apr 17 10:48:54 2013 +0200

    configure-java-classpath.patch: refresh patch

diff --git a/debian/patches/configure-java-classpath.patch b/debian/patches/configure-java-classpath.patch
index 57a7239..e78946a 100644
--- a/debian/patches/configure-java-classpath.patch
+++ b/debian/patches/configure-java-classpath.patch
@@ -13,53 +13,9 @@ Forwarded: not-needed
 Last-Update: 2012-06-09
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/PKG_ADD
-+++ b/PKG_ADD
-@@ -4,10 +4,35 @@
- javapkgind = find (cellfun(@(x) strcmp(x.name, "java"), pkglist), 1, "first");
- if ~isempty (javapkgind)
-   javapkg = pkglist{javapkgind};
--  if javapkg.loaded
--    # Assume jar files are in /lib/java and let chk_spreadsheet_support sort it out
--    libdir = octave_config_info("libdir");
--    spr_status = chk_spreadsheet_support ([libdir "/java"]);
-+  if exist (javapkg.dir, "dir") && (javapkg.autoload || javapkg.loaded)
-+      ## Force loading of java package if autoload=yes but loaded=no
-+      if ~javapkg.loaded
-+          pkg load java
-+      endif
-+
-+      ## Add UNO support if present
-+      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
-+      endif
-+
-+      ## Add JXL support if present
-+      if exist ("/usr/share/java/jxl.jar", "file")
-+          javaaddpath /usr/share/java/jxl.jar
-+      endif
-+
-+      ## Auto-detect other interfaces possibly installed
-+      chk_spreadsheet_support ("/usr/share/java");
-+      chk_spreadsheet_support ("/usr/local/share/java");
-   endif
- endif
--clear javapkgind javapkg libdir spr_status pkglist ;
-\ No newline at end of file
-+clear javapkgind javapkg pkglist ;
 --- a/post_install.m
 +++ /dev/null
-@@ -1,14 +0,0 @@
+@@ -1,16 +0,0 @@
 -## this function removes the PKG_ADD script from the .oct directory of the io
 -## package after installation. The reason is that PKG_ADD calls chk_spreadsheet_support
 -## which belongs to the io package itself. While it is ok when called from the
@@ -71,6 +27,55 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 -                  "-", octave_config_info ("api_version"), filesep, "PKG_ADD");
 -  [err, msg] = unlink (file);
 -  if (err)
--    warning ("Unable to remove PKG_ADD: %S", msg);
+-    warning ("Unable to remove PKG_ADD: %s", msg);
+-    printf ("For spreadsheet I/O you may need to manually add the required\n", ... 
+-            "Java class libs to the javaclasspath");
 -  endif
 -endfunction
+--- a/PKG_ADD
++++ b/PKG_ADD
+@@ -4,13 +4,36 @@
+ javapkgind = find (cellfun (@(x) strcmp(x.name, "java"), pkglist), 1, "first");
+ if (! isempty (javapkgind))
+   javapkg = pkglist{javapkgind};
+-  if (javapkg.loaded)
+-    # Assume jar files are in /lib/java and let chk_spreadsheet_support sort it out
+-    libdir = octave_config_info ("libdir");
+-    ## Allow time for package to be fully loaded
+-    pause (0.25);
+-    spr_status = chk_spreadsheet_support ([ libdir filesep "java" ]);
++  if exist (javapkg.dir, "dir") && (javapkg.autoload || javapkg.loaded)
++      ## Force loading of java package if autoload=yes but loaded=no
++      if ~javapkg.loaded
++          pkg load java
++      endif
++
++      ## Add UNO support if present
++      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
++      endif
++
++      ## Add JXL support if present
++      if exist ("/usr/share/java/jxl.jar", "file")
++          javaaddpath /usr/share/java/jxl.jar
++      endif
++
++      ## Auto-detect other interfaces possibly installed
++      chk_spreadsheet_support ("/usr/share/java");
++      chk_spreadsheet_support ("/usr/local/share/java");
+   endif
+ endif
+ ## Clean up
+-clear javapkgind javapkg libdir spr_status pkglist ;
+\ No newline at end of file
++clear javapkgind javapkg pkglist ;

-- 
Debian packaging for octave-io