[Pkg-octave-commit] [SCM] octave-ocs branch, master, updated. 2c2fbcc31f01d503cdd94532287d32e24582e218

[Thomas Weber]

The following commit has been merged in the master branch:
commit 289aabba0af79d5e58a060a8704108eb69e373b8
Author: Thomas Weber <tweber at debian.org>
Date:   Wed May 4 20:30:50 2011 +0200

    Adapt patch set_nonarch_path_for_pkg_add for new upstream release

diff --git a/debian/changelog b/debian/changelog
index b4a3ef0..885803a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ octave-ocs (0.1.1-1) UNRELEASED; urgency=low
 
   * New upstream release
   * Bump standards version to 3.9.1, no changes required
+  * Adapt patch set_nonarch_path_for_pkg_add for new upstream release.
 
  -- Thomas Weber <tweber at debian.org>  Tue, 03 May 2011 22:02:36 +0200
 
diff --git a/debian/patches/set_nonarch_path_for_pkg_add b/debian/patches/set_nonarch_path_for_pkg_add
index 7bf44d6..037c8fa 100644
--- a/debian/patches/set_nonarch_path_for_pkg_add
+++ b/debian/patches/set_nonarch_path_for_pkg_add
@@ -1,26 +1,41 @@
 --- a/PKG_ADD
 +++ b/PKG_ADD
-@@ -1,6 +1,8 @@
- dirlist        = {"utl","asm","tst","nls","prs","sbn"};
- [basename,dir] = fileparts(fileparts (mfilename ("fullpath")));
+@@ -1,10 +1,14 @@
+ dirlist = {"utl","asm","tst","nls","prs","sbn"};
+ dir     = fileparts (mfilename ("fullpath"));
  
-+basename = "/usr/share/octave/packages/3.2/ocs-0.1.0/";
++# set paths for octave 3.2 and ocs-0.1.1, so that the package can cope with the
++# fact that the .oct files and the .m files are not in the same directory
++dir = "/usr/share/octave/packages/3.2/ocs-0.1.1/";
 +
- for ii=1:length(dirlist)
-   if (! exist (fullfile (basename, "inst"), "dir"))
-     ## Run this if the package is installed
+ if (! exist (fullfile (dir, "inst"), "dir"))      
+   ## Run this if the package is installed      
+   for ii=1:length(dirlist)
+-    addpath (fullfile(dir,"..",dirlist{ii}),"-end")
++    addpath (fullfile(dir,dirlist{ii}),"-end")
+   endfor
+ else
+   ## Run this if we are testing the package is installed without installation
+@@ -13,4 +17,4 @@
+   endfor
+ endif
+ 
+-clear dirlist dir
+\ No newline at end of file
++clear dirlist dir
 --- a/PKG_DEL
 +++ b/PKG_DEL
-@@ -1,6 +1,8 @@
+@@ -1,6 +1,9 @@
  dirlist        = {"utl","asm","tst","nls","prs","sbn"};
  [basename,dir] = fileparts(fileparts (mfilename ("fullpath")));
  
-+basename = "/usr/share/octave/packages/3.2/ocs-0.1.0/";
++## Remove the changed path added in PKG_ADD
++basename = "/usr/share/octave/packages/3.2/ocs-0.1.1/";
 +
  for ii=1:length(dirlist)
    if (! exist (fullfile (basename, "inst"), "dir"))
      ## Run this if the package is installed
-@@ -9,4 +11,4 @@
+@@ -9,4 +12,4 @@
      ## Run this if we are testing the package is installed without installation
      rmpath ( [ fileparts( mfilename("fullpath")) "/inst/" dirlist{ii}])
    end

-- 
octave-ocs