[Pkg-octave-commit] [octave-ocs] 02/02: d/p/set_nonarch_path_for_pkg_add: Refresh for new upstream version

[Rafael Laboissière]

This is an automated email from the git hooks/post-receive script.

rlaboiss-guest pushed a commit to branch master
in repository octave-ocs.

commit 58c3c4a61bc9a662600eaaf432cb713e374c99c1
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Sun Jul 26 17:12:12 2015 -0300

    d/p/set_nonarch_path_for_pkg_add: Refresh for new upstream version
---
 debian/patches/set_nonarch_path_for_pkg_add | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/debian/patches/set_nonarch_path_for_pkg_add b/debian/patches/set_nonarch_path_for_pkg_add
index c5386ed..2258c4c 100644
--- a/debian/patches/set_nonarch_path_for_pkg_add
+++ b/debian/patches/set_nonarch_path_for_pkg_add
@@ -3,7 +3,9 @@ Description: Use the architecture-independent path
  which is not the same as were the PKG_ADD file lands.  This patch remedies
  the problem.
 Author: Rafael Laboissiere <rafael at laboissiere.net>
+Forwarded: not-needed
 Last-Update: 2012-03-17
+Last-Modified: 2015-07-26
 
 --- octave-ocs-0.1.3.orig/PKG_ADD
 +++ octave-ocs-0.1.3/PKG_ADD
@@ -12,13 +14,13 @@ Last-Update: 2012-03-17
  dirname = fileparts (canonicalize_file_name (mfilename ("fullpath")));
 +dirname = sprintf ("%s%s",
 +                   dirname (1 : strfind (dirname, "usr/lib/") - 1),
-+                   "usr/share/octave/packages/ocs-0.1.3/");   
++                   "usr/share/octave/packages/ocs-0.1.4/");
  
  if (! exist (fullfile (dirname, "inst"), "dir"))
    ## Run this if the package is installed
    for ii=1:length (dirlist)
--    addpath ( [ dirname "/../" dirlist{ii}],"-end")
-+    addpath ( [ dirname dirlist{ii}],"-end")
+-    addpath (fullfile (dirname, "..", dirlist{ii}), "-end")
++    addpath (fullfile (dirname, dirlist{ii}), "-end")
    endfor
  else
    ## Run this if we are testing the package without installation
@@ -29,13 +31,13 @@ Last-Update: 2012-03-17
  dirname = fileparts (canonicalize_file_name (mfilename ("fullpath")));
 +dirname = sprintf ("%s%s",
 +                   dirname (1 : strfind (dirname, "usr/lib/") - 1),
-+                   "usr/share/octave/packages/ocs-0.1.3/");   
++                   "usr/share/octave/packages/ocs-0.1.4/");
  
- for ii=1:length (dirlist)
-   if (! exist (fullfile (dirname, "inst"), "dir"))
-     ## Run this if the package is installed
--    rmpath ( [ dirname "/../" dirlist{ii}])
-+    rmpath ( [ dirname dirlist{ii}])
-   else
-     ## Run this if we are testing the package without installation
-     rmpath ([ dirname "/inst/" dirlist{ii}])
+ if (! exist (fullfile (dirname, "inst"), "dir"))
+   ## Run this if the package is installed
+   for ii=1:length (dirlist)
+-    rmpath (fullfile (dirname, "..", dirlist{ii}))
++    rmpath (fullfile (dirname, dirlist{ii}))
+   endfor
+ else
+   ## Run this if we are testing the package without installation

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