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

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit 0a6e6b23197dd1466aabd4c24e2be6711ff9ccfd
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Mon Apr 2 21:09:07 2012 +0200

    debian/patches/configure-java-classpath.patch: refresh patch

diff --git a/debian/patches/configure-java-classpath.patch b/debian/patches/configure-java-classpath.patch
index 23e6554..b0d4a1f 100644
--- a/debian/patches/configure-java-classpath.patch
+++ b/debian/patches/configure-java-classpath.patch
@@ -1,5 +1,5 @@
 Description: Enable spreadsheet support
- This patch does 3 things:
+ This patch does 4 things:
  - make sure the java package is loaded if available (the field "loaded" does
    not seem to be very reliable, so force package loading if autoload is
    enabled)
@@ -7,14 +7,15 @@ Description: Enable spreadsheet support
    by chk_spreadsheet_support does not work well)
  - let chk_spreadsheet_support auto-detect other JARs from /usr/share/java and
    /usr/local/share/java in case the user installed them manually
+ - do not delete PKG_ADD in post_install.m, we need it!
 Author: Sébastien Villemot <sebastien.villemot at ens.fr>
 Forwarded: not-needed
-Last-Update: 2012-03-17
+Last-Update: 2012-04-02
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/PKG_ADD
 +++ b/PKG_ADD
-@@ -4,9 +4,34 @@
+@@ -4,10 +4,35 @@
  javapkgind = find (cellfun(@(x) strcmp(x.name, "java"), pkglist), 1, "first");
  if ~isempty (javapkgind)
    javapkg = pkglist{javapkgind};
@@ -29,14 +30,14 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +      endif
 +
 +      ## Add UNO support if present
-+      if exist ("/usr/share/libreoffice/basis-link/program", "dir") ...
-+              && exist ("/usr/share/libreoffice/basis-link/program/classes/unoil.jar", "file") ...
++      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/basis-link/program
-+          javaaddpath /usr/share/libreoffice/basis-link/program/classes/unoil.jar
++          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
@@ -53,3 +54,23 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +      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 @@
+-## 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
+-## .m directory (since chk_spreadsheet_support is there), when called from the
+-## .oct directory it fails since the package hasn't been loaded yet
+-
+-function post_install (desc)
+-  file = cstrcat (desc.archprefix, filesep, octave_config_info ("canonical_host_type"),
+-                  "-", octave_config_info ("api_version"), filesep, "PKG_ADD");
+-  [err, msg] = unlink (file);
+-  if (err)
+-    warning ("Unable to remove PKG_ADD: %S", msg);
+-  endif
+-endfunction

-- 
Debian packaging for octave-io