[Pkg-octave-commit] [SCM] Debian packaging for octave-io branch, master, updated. debian/1.0.18-1-2-g68a7e83

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit c0c530678104fc493a4a3a85bb0003fb0f86686f
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Sat Jun 9 15:17:31 2012 +0200

    configure-java-classpath.patch: update patch to avoid breakage of octave-java
    
    Before this change, the following situation happened:
    - suppose octave-io and octave-java are installed
    - apt-get purge octave-java
    - dpkg purges octave-java files, and launches the octave trigger (for rebuilding
      the pkg database)
    - but octave crashes in octave-io's PKG_ADD because the pkg database still marks
      octave-java as present, while it is deleted from the disk

diff --git a/debian/patches/configure-java-classpath.patch b/debian/patches/configure-java-classpath.patch
index b0d4a1f..b2b1eb3 100644
--- a/debian/patches/configure-java-classpath.patch
+++ b/debian/patches/configure-java-classpath.patch
@@ -10,7 +10,7 @@ Description: Enable spreadsheet support
  - 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-04-02
+Last-Update: 2012-06-09
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/PKG_ADD
@@ -23,7 +23,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 -    # 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 javapkg.autoload || javapkg.loaded
++  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

-- 
Debian packaging for octave-io