[Pkg-octave-commit] [SCM] octave-pkg-dev branch, master, updated. cd19518e6e0d4930994db036f8d98b1d365752cd

[Rafael Laboissiere]

The following commit has been merged in the master branch:
commit 84330fa058e31b108d0d4dccaac89a99cdf26455
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Sun Jun 7 20:55:25 2009 +0200

    Use exist() to check presence of PKG_ADD.bak
    
    The previous method with glob() does not work on Octave 3.2.0, because
    cells are not converted to boolean values.

diff --git a/debian/changelog b/debian/changelog
index e4ca41e..9004f3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ octave-pkg-dev (0.7.0) UNRELEASED; urgency=low
   * debian/rules, octave-pkg.mk.in, octave-pkg-helper.in: Use separate
     OCTVER for the major version number and MINVER for the minimum
     depending version of Octave
+  * octave-pkg.mk.in: Use exist() instead of glob() when building the
+    Octave pkg.  The return value of the later (a cell) cannot be
+    converted to boolean in Octave 3.2.0.
   * debian/copyright: Put in the DEP5 format
 
  -- Rafael Laboissiere <rafael at debian.org>  Sat, 06 Jun 2009 22:26:48 +0200
diff --git a/octave-pkg.mk.in b/octave-pkg.mk.in
index 5619959..96ddd93 100644
--- a/octave-pkg.mk.in
+++ b/octave-pkg.mk.in
@@ -62,7 +62,7 @@ install-pkg:
 		      [pwd(),'/$(debpkg)/$(bpath)']);			\
 		 pkg ('local_list', [pwd(),'/$(local_list)']);		\
 		 pkg ('global_list', [pwd(),'/$(global_list)']);	\
-		 if (glob ('PKG_ADD.bak')),				\
+		 if (exist ('PKG_ADD.bak') == 2),			\
 		     movefile ('PKG_ADD.bak', 'PKG_ADD');		\
 		 endif;							\
 		 pkg -verbose -nodeps install ."

-- 
octave-pkg-dev