[Pkg-octave-commit] [SCM] Debian packaging for octave-geometry branch, master, updated. upstream/1.4.0-12-g5bb43d9

[Rafael Laboissiere]

The following commit has been merged in the master branch:
commit 42aaba493d564366ebb6c048274bd7459de108f9
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Sun Mar 25 09:33:07 2012 +0200

    Adapt patch for new upstream version 1.4.1
    
    Git-Dch: Ignore

diff --git a/debian/patches/arch-indep-path-for-pkg-add.patch b/debian/patches/arch-indep-path-for-pkg-add.patch
index 894200d..957020c 100644
--- a/debian/patches/arch-indep-path-for-pkg-add.patch
+++ b/debian/patches/arch-indep-path-for-pkg-add.patch
@@ -1,24 +1,18 @@
-Description: Add appropriate path for the architecture independent files
+Dcription: Add appropriate path for the architecture independent files
 Author: Rafael Laboissiere <rafael at laboissiere.net>
-Last-Update: 2012-03-21
+Last-Update: 2012-03-25
 
---- octave-geometry-1.4.0.orig/PKG_ADD
-+++ octave-geometry-1.4.0/PKG_ADD
-@@ -1,14 +1,9 @@
- %1
- dirlist = {"geom2d","io","polygons2d","shape2d","octclip", "graphs"};
- dirname = fileparts (canonicalize_file_name (mfilename ("fullpath")));
--
--%% If we are in Architecture dependent folder add from outside
--arch = cstrcat (octave_config_info ("canonical_host_type"),
--                              "-", octave_config_info ("api_version"));
--pp = strsplit (dirname,filesep (), true);
--if strcmp(arch , pp{end})
--  dirname = [strcat(filesep(),{pp{1:end-1}}){:}];
--end
-+dirname = sprintf ("%s%s",
-+                   dirname (1 : strfind (dirname, "usr/lib/") - 1),
-+                   "usr/share/octave/packages/geometry-1.4.0/");
+--- octave-geometry-1.4.1.orig/PKG_ADD
++++ octave-geometry-1.4.1/PKG_ADD
+@@ -13,8 +13,9 @@ arch = cstrcat (octave_config_info ("can
+                               "-", octave_config_info ("api_version"));
+ if strcmp (arch , pp{end})
+   dirname = [strcat(filesep(),{pp{1:end-1}}){:}];
+-  pkg_folder = strsplit (pkg_folder,filesep (), true);
+-  pkg_folder = [strcat(filesep(),{pkg_folder{1:end-1}}){:}];
++  pkg_folder = sprintf ("%s%s",
++                        dirname (1 : strfind (dirname, "usr/lib/") - 1),
++                        "usr/share/octave/packages/geometry-1.4.1");
+ end
  
  if (! exist (fullfile (dirname, "inst"), "dir"))
-   for ii=1:length (dirlist)

-- 
Debian packaging for octave-geometry