[Pkg-octave-commit] [octave-io] 02/04: Simplify uno.patch.

[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 26868ae49e2c214298adcd4962f3816bd3fceae5
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Wed Apr 30 12:59:26 2014 +0200

    Simplify uno.patch.
---
 debian/patches/uno.patch | 64 +++++++++---------------------------------------
 1 file changed, 11 insertions(+), 53 deletions(-)

diff --git a/debian/patches/uno.patch b/debian/patches/uno.patch
index 1cf6cfa..7e2b6bf 100644
--- a/debian/patches/uno.patch
+++ b/debian/patches/uno.patch
@@ -1,58 +1,16 @@
 Description: Fix detection of UNO interface for Debian
 Author: Sébastien Villemot <sebastien at debian.org>
-Origin: Debian
 Forwarded: not-needed
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/PKG_ADD
-+++ b/PKG_ADD
-@@ -19,29 +19,20 @@
-     ## Set libdir to "." to avoid searching in a root dir
-     libdir = ".";
-   endif
--
--  ## Find LibreOffice or OpenOffice.org
--  ooopath = '';
--  ii = 0;
--  ## Possible locations for  OOo or LO.
--  bnam = {"C:/Program Files (X86)", ...
--               "C:/Program Files", ...
--               "C:/Programs", ...
--               "/opt", ...
--               "/usr/lib"};
--  while (isempty (ooopath) && ii < numel (bnam))
--    ooopath = glob ([ bnam{++ii} filesep "[Ll]ibre[Oo]ffice*"]);
--  endwhile
--  while (isempty (ooopath) && ii < numel (bnam))
--    ooopath = glob ([ bnam{++ii} filesep "[Oo]pen[Oo]ffice.org*"]);
--  endwhile
--  while (isempty (ooopath) && ii < numel (bnam))
--    ooopath = glob ([ bnam{++ii} filesep "ooo*"]);
--  endwhile
--  if (! isempty (ooopath))
--    ooopath = ooopath{:};
--  else
--    ooopath = '';
-+  ## 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
-   endif
- 
-   ## One big try-catch to circumvent possible problems on Linux
-@@ -80,4 +71,4 @@
-   end_try_catch
- endif
- ## Clean up
--clear libdir spr_status userdir homedir bnam ooopath ii;
-+clear libdir spr_status userdir homedir ooopath;
+--- a/inst/chk_spreadsheet_support.m
++++ b/inst/chk_spreadsheet_support.m
+@@ -555,7 +555,7 @@ function  [ retval, sinterfaces, loaded_
+     endif
+     ## Rest of missing entries. Find where URE is located. Watch out because
+     ## case of ./ure is unknown
+-    uredir = get_dir_ (path_to_ooo, "ure");
++    uredir = get_dir_ (path_to_ooo, "ure-link");
+     if (isempty (uredir))
+       return
+     endif

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave-io.git