[Pkg-octave-commit] [SCM] octave-ocs branch, master, updated. 3e1701b86ccd527ae1d63ef96847aad5503e8d6e

[Thomas Weber]

tags 582750 pending
thanks

The following commit has been merged in the master branch:
commit b090b5bd48e5abc64ea2986b292e64f2a8816696
Author: Thomas Weber <tweber at debian.org>
Date:   Sat Jun 26 22:03:08 2010 +0200

    Force noarch path for PKG_ADD and PKG_DEL (bug fix for #582750)

diff --git a/debian/changelog b/debian/changelog
index 7ced516..4adbeaf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+octave-ocs (0.1.0-2) UNRELEASED; urgency=low
+
+  * New patch: set_nonarch_path_for_pkg_add: Change PKG_ADD and PKG_DEL to
+    cater for the split of arch-independent and arch-dependent files in two
+    separate directories (closes: #582750)
+
+ -- Thomas Weber <tweber at debian.org>  Sat, 26 Jun 2010 20:56:05 +0200
+
 octave-ocs (0.1.0-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/patches/series b/debian/patches/series
index 6f889c5..fd7ad07 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+set_nonarch_path_for_pkg_add
 autoload-yes.diff
diff --git a/debian/patches/set_nonarch_path_for_pkg_add b/debian/patches/set_nonarch_path_for_pkg_add
new file mode 100644
index 0000000..7bf44d6
--- /dev/null
+++ b/debian/patches/set_nonarch_path_for_pkg_add
@@ -0,0 +1,29 @@
+--- a/PKG_ADD
++++ b/PKG_ADD
+@@ -1,6 +1,8 @@
+ dirlist        = {"utl","asm","tst","nls","prs","sbn"};
+ [basename,dir] = fileparts(fileparts (mfilename ("fullpath")));
+ 
++basename = "/usr/share/octave/packages/3.2/ocs-0.1.0/";
++
+ for ii=1:length(dirlist)
+   if (! exist (fullfile (basename, "inst"), "dir"))
+     ## Run this if the package is installed
+--- a/PKG_DEL
++++ b/PKG_DEL
+@@ -1,6 +1,8 @@
+ dirlist        = {"utl","asm","tst","nls","prs","sbn"};
+ [basename,dir] = fileparts(fileparts (mfilename ("fullpath")));
+ 
++basename = "/usr/share/octave/packages/3.2/ocs-0.1.0/";
++
+ for ii=1:length(dirlist)
+   if (! exist (fullfile (basename, "inst"), "dir"))
+     ## Run this if the package is installed
+@@ -9,4 +11,4 @@
+     ## Run this if we are testing the package is installed without installation
+     rmpath ( [ fileparts( mfilename("fullpath")) "/inst/" dirlist{ii}])
+   end
+-end
+\ No newline at end of file
++end

-- 
octave-ocs