[Pkg-octave-commit] rev 598 - in
branches/2.9transition/packages/octave-forge/debian: . patches
Thomas Weber
thomas-guest at costa.debian.org
Tue May 2 15:28:39 UTC 2006
Author: thomas-guest
Date: 2006-05-02 15:28:29 +0000 (Tue, 02 May 2006)
New Revision: 598
Added:
branches/2.9transition/packages/octave-forge/debian/patches/add_gisequal.patch
branches/2.9transition/packages/octave-forge/debian/patches/clean-depreciated.patch
branches/2.9transition/packages/octave-forge/debian/patches/system.patch
Removed:
branches/2.9transition/packages/octave-forge/debian/patches/00list
branches/2.9transition/packages/octave-forge/debian/patches/50_admin-octlink.dpatch
branches/2.9transition/packages/octave-forge/debian/patches/50_extra-pdb-sinclude.dpatch
branches/2.9transition/packages/octave-forge/debian/patches/50_main-set-makefile.dpatch
branches/2.9transition/packages/octave-forge/debian/patches/50_make-pattern-rules.dpatch
branches/2.9transition/packages/octave-forge/debian/patches/50_makefile-syntax-fix.dpatch
Modified:
branches/2.9transition/packages/octave-forge/debian/changelog
branches/2.9transition/packages/octave-forge/debian/compat
branches/2.9transition/packages/octave-forge/debian/control
branches/2.9transition/packages/octave-forge/debian/rules
Log:
Get ready for 2.9 version of octave-forge
Modified: branches/2.9transition/packages/octave-forge/debian/changelog
===================================================================
--- branches/2.9transition/packages/octave-forge/debian/changelog 2006-05-01 12:18:09 UTC (rev 597)
+++ branches/2.9transition/packages/octave-forge/debian/changelog 2006-05-02 15:28:29 UTC (rev 598)
@@ -1,3 +1,72 @@
+octave-forge (2006.03.17-1) unstable; urgency=low
+
+ NOT YET RELEASED!
+
+ [ Thomas Weber ]
+ * Package renamed to octave-forge2.9; prepare for dual builds
+ * debian/compat: Bumped compat level to 5
+ * debian/control:
+ - conflict against octave-forge
+ - Depend upon Octave 2.9
+ - Build-depend on graphicsmagick-libmagick-dev-compat for the libmagick++
+ intercace
+ - Build-conflict against Octave 2.1
+ - Drop description of octave-matcompat package; it was a transition
+ package in Sarge already
+ * debian/rules: Use CDBS for package building
+ * Patches:
+ - system.patch: The output values' order of system() has changed in
+ Octave 2.9.5
+ - add_gisequal.patch: Octave's isequal() can't handle Galois fields
+ (thanks to David Bateman for the patch)
+
+ --
+
+octave-forge (2006.03.17-2) unstable; urgency=low
+
+ * Uploaded to unstable, now that the libhdf5 transition is over
+ (closes: #357651)
+
+ -- Rafael Laboissiere <rafael at debian.org> Wed, 12 Apr 2006 14:30:14 +0200
+
+octave-forge (2006.03.17-1) experimental; urgency=low
+
+ [ Thomas Weber ]
+ * New upstream release
+ * removed patches (applied upstream)
+ - 50_main-set-makefile.patch
+ - 50_make-clean.patch
+ - 50_makefile-syntax-fix.patch
+ - 60_make-distclean.patch
+ - 50_make-pattern-rules.patch
+ - 50_extra-pdb-sinclude.patch
+ * debian/rules: revert calling of versioned form of octave-config; the
+ autobuilders should have recovered by now
+
+ [ Rafael Laboissiere ]
+ * debian/patches/clean-depreciated.patch: Added patch for cleaning
+ files that are generated from *.in files according to the Octave
+ version number
+ * debian/control: Build-depends on octave2.1-headers >= 2.1.73-4
+ * With the above dependency, the package compiles correctly with g++ 4.1
+ (closes: #357651)
+
+ -- Rafael Laboissiere <rafael at debian.org> Mon, 3 Apr 2006 14:27:28 +0200
+
+octave-forge (2006.01.28-2) unstable; urgency=low
+
+ * debian/control: Build-depends on cdbs (to use simple-patchsys.mk)
+ instead of dpatch
+ * debian/patches/50_make-clean.patch: Patch from upstream CVS to clean
+ files left by make
+ * debian/patches/60_make-distclean.patch: Patch for fixing the upstream
+ behavior for make distclean
+ * debian/rules:
+ - Removed code which was doing the cleanup done in the patches above
+ - Adjusted to use CDBS' simple-patchsys.mk instead of dpatch
+
+ -- Rafael Laboissiere <rafael at debian.org> Mon, 13 Feb 2006 11:18:53 +0100
+
octave-forge (2006.01.28-1) unstable; urgency=low
* New upstream release
@@ -775,7 +844,7 @@
(save-excursion
(forward-line -1)
(beginning-of-line)
- (insert "\n NOT YET RELEASED!\n\n [ "
+ (insert "\n NOT YET RELEASED!\n\n [ "
(or (getenv "DEBFULLNAME") (user-full-name)) " ]")))
nil t)
End:
Modified: branches/2.9transition/packages/octave-forge/debian/compat
===================================================================
--- branches/2.9transition/packages/octave-forge/debian/compat 2006-05-01 12:18:09 UTC (rev 597)
+++ branches/2.9transition/packages/octave-forge/debian/compat 2006-05-02 15:28:29 UTC (rev 598)
@@ -1 +1 @@
-4
+5
Modified: branches/2.9transition/packages/octave-forge/debian/control
===================================================================
--- branches/2.9transition/packages/octave-forge/debian/control 2006-05-01 12:18:09 UTC (rev 597)
+++ branches/2.9transition/packages/octave-forge/debian/control 2006-05-02 15:28:29 UTC (rev 598)
@@ -3,12 +3,13 @@
Priority: optional
Maintainer: Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>
Uploaders: Rafael Laboissiere <rafael at debian.org>
-Standards-Version: 3.6.2
-Build-Depends: debhelper (>= 4), octave2.1-headers (>= 2.1.72-9), libxt-dev, gfortran, libqhull-dev, libginac-dev (>= 1.3.3-2+b1), libgmp3-dev, autoconf, libjpeg62-dev, libpng12-dev, libncurses5-dev, libreadline5-dev, tetex-bin, libgsl0-dev, netcdfg-dev, units, dpatch
-Build-Conflicts: octave2.0-headers, octave2.0
+Standards-Version: 3.7.0
+Build-Depends: debhelper (>= 5), octave2.9-headers (>= 2.9.5-7), libxt-dev, gfortran, libqhull-dev, libginac-dev (>= 1.3.3-2+b1), libgmp3-dev, autoconf, libjpeg62-dev, libpng12-dev, libncurses5-dev, libreadline5-dev, tetex-bin, libgsl0-dev, netcdfg-dev, graphicsmagick-libmagick-dev-compat, units, cdbs
+Build-Conflicts: octave2.0-headers, octave2.0, octave2.1-headers, octave2.1
-Package: octave-forge
-Replaces: octave-matcompat
+Package: octave-forge2.9
+Replaces: octave-matcompat, octave-forge
+Conflicts: octave-matcompat, octave-forge
Architecture: any
Depends: ${octave:Depends}, ${shlibs:Depends}
Suggests: grace, units
@@ -27,5 +28,5 @@
.
The octave-forge project is housed at http://sourceforge.net/projects/octave/
.
- The Debian octave-forge package replaces (and extends) the earlier
- octave-matcompat package.
+ This version is compiled for Octave 2.9. If you need it for Octave 2.1,
+ install octave-forge2.1
Deleted: branches/2.9transition/packages/octave-forge/debian/patches/00list
Deleted: branches/2.9transition/packages/octave-forge/debian/patches/50_admin-octlink.dpatch
Deleted: branches/2.9transition/packages/octave-forge/debian/patches/50_extra-pdb-sinclude.dpatch
Deleted: branches/2.9transition/packages/octave-forge/debian/patches/50_main-set-makefile.dpatch
Deleted: branches/2.9transition/packages/octave-forge/debian/patches/50_make-pattern-rules.dpatch
Deleted: branches/2.9transition/packages/octave-forge/debian/patches/50_makefile-syntax-fix.dpatch
Added: branches/2.9transition/packages/octave-forge/debian/patches/add_gisequal.patch
===================================================================
--- branches/2.9transition/packages/octave-forge/debian/patches/add_gisequal.patch 2006-05-01 12:18:09 UTC (rev 597)
+++ branches/2.9transition/packages/octave-forge/debian/patches/add_gisequal.patch 2006-05-02 15:28:29 UTC (rev 598)
@@ -0,0 +1,38 @@
+diff -Nur main/comm/gisequal.m octave-forge2.9-2006.03.17.new/main/comm/gisequal.m
+--- main/comm/gisequal.m 1970-01-01 01:00:00.000000000 +0100
++++ main/comm/gisequal.m 2006-04-27 12:14:37.000000000 +0200
+@@ -0,0 +1,34 @@
++## Copyright (C) 2000 Paul Kienzle
++##
++## This program is free software; you can redistribute it and/or modify
++## it under the terms of the GNU General Public License as published by
++## the Free Software Foundation; either version 2 of the License, or
++## (at your option) any later version.
++##
++## This program is distributed in the hope that it will be useful,
++## but WITHOUT ANY WARRANTY; without even the implied warranty of
++## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++## GNU General Public License for more details.
++##
++## You should have received a copy of the GNU General Public License
++## along with this program; if not, write to the Free Software
++## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++
++## -*- texinfo -*-
++## @deftypefn {Function File} {} gisequal (@var{x1}, @var{x2}, @dots{})
++## Return true if all of @var{x1}, @var{x2}, @dots{} are equal.
++## @seealso{isequalwithequalnans}
++## @end deftypefn
++
++## PKG_ADD: dispatch ("isequal", "gisequal", "galois");
++function t = gisequal(x,varargin)
++ if nargin < 2
++ usage("isequal(x,y,...)");
++ endif
++
++ for arg = 1:length(varargin)
++ y = varargin{arg};
++ t = all (x (:) == y (:));
++ if !t, return; endif
++ endfor
++endfunction
Added: branches/2.9transition/packages/octave-forge/debian/patches/clean-depreciated.patch
===================================================================
--- branches/2.9transition/packages/octave-forge/debian/patches/clean-depreciated.patch 2006-05-01 12:18:09 UTC (rev 597)
+++ branches/2.9transition/packages/octave-forge/debian/patches/clean-depreciated.patch 2006-05-02 15:28:29 UTC (rev 598)
@@ -0,0 +1,33 @@
+diff -Nur octave-forge-2006.03.17/main/plot/Makefile octave-forge-2006.03.17.new/main/plot/Makefile
+--- octave-forge-2006.03.17/main/plot/Makefile 2006-03-12 21:39:09.000000000 +0100
++++ octave-forge-2006.03.17.new/main/plot/Makefile 2006-04-03 23:15:15.264358992 +0200
+@@ -38,7 +38,7 @@
+ %.m : %.m.in
+ -$(INSTALL) $< $@
+
+-clean: ; -$(RM) *.o octave-core core *~ *.oct
++clean: ; -$(RM) *.o octave-core core *~ *.oct $(DEPRECIATED_TARGETS)
+
+ archive:
+ tar cvzf graphics.tgz Makefile *.cc *.h *.m
+diff -Nur octave-forge-2006.03.17/main/strings/Makefile octave-forge-2006.03.17.new/main/strings/Makefile
+--- octave-forge-2006.03.17/main/strings/Makefile 2006-02-12 08:34:43.000000000 +0100
++++ octave-forge-2006.03.17.new/main/strings/Makefile 2006-04-03 23:16:00.343505920 +0200
+@@ -21,7 +21,7 @@
+ pcregexp.oct: pcregexp.cc
+ $(MKOCTFILE) $< $(PCRE_OPTIONS)
+
+-clean: ; -$(RM) *.o core octave-core *.oct *~ $(t2.9.4)
++clean: ; -$(RM) *.o core octave-core *.oct *~ $(DEPRECIATED_TARGETS)
+
+ %.m : %.m.in
+ -$(INSTALL) $< $@
+diff -Nur octave-forge-2006.03.17/main/time/Makefile octave-forge-2006.03.17.new/main/time/Makefile
+--- octave-forge-2006.03.17/main/time/Makefile 2006-03-12 21:39:10.000000000 +0100
++++ octave-forge-2006.03.17.new/main/time/Makefile 2006-04-03 23:17:29.605935968 +0200
+@@ -8,3 +8,5 @@
+
+ %.m : %.m.in
+ -$(INSTALL) $< $@
++
++clean: ; -$(RM) octave-core *~ $(DEPRECIATED_TARGETS)
Added: branches/2.9transition/packages/octave-forge/debian/patches/system.patch
===================================================================
--- branches/2.9transition/packages/octave-forge/debian/patches/system.patch 2006-05-01 12:18:09 UTC (rev 597)
+++ branches/2.9transition/packages/octave-forge/debian/patches/system.patch 2006-05-02 15:28:29 UTC (rev 598)
@@ -0,0 +1,273 @@
+diff -ru octave-forge-2006.03.17.orig/extra/graceplot/alternatives/print.m octave-forge-2006.03.17/extra/graceplot/alternatives/print.m
+--- octave-forge-2006.03.17.orig/extra/graceplot/alternatives/print.m 2006-01-06 23:23:27.000000000 -0600
++++ octave-forge-2006.03.17/extra/graceplot/alternatives/print.m 2006-04-17 08:58:47.000000000 -0500
+@@ -405,7 +405,7 @@
+ unlink(printname);
+ elseif(!isempty(convertname))
+ command = [ "convert ", name, " ", convertname ];
+- [output, errcode] = system (command);
++ [errcode, output] = system (command);
+ unlink (name);
+ if (errcode)
+ error ("print: could not convert");
+diff -ru octave-forge-2006.03.17.orig/extra/graceplot/toggle_grace_use.m octave-forge-2006.03.17/extra/graceplot/toggle_grace_use.m
+--- octave-forge-2006.03.17.orig/extra/graceplot/toggle_grace_use.m 2005-02-28 06:07:24.000000000 -0600
++++ octave-forge-2006.03.17/extra/graceplot/toggle_grace_use.m 2006-04-17 09:00:19.000000000 -0500
+@@ -27,7 +27,7 @@
+ global use_grace_state
+
+ if(isempty(use_grace_state))
+- [verstr, status] = system("xmgrace -version", 1);
++ [status, verstr] = system("xmgrace -version", 1);
+ if(status != 0)
+ error("Grace binary not found");
+ endif
+diff -ru octave-forge-2006.03.17.orig/extra/testfun/test.m octave-forge-2006.03.17/extra/testfun/test.m
+--- octave-forge-2006.03.17.orig/extra/testfun/test.m 2005-11-10 17:19:15.000000000 -0600
++++ octave-forge-2006.03.17/extra/testfun/test.m 2006-04-17 09:00:59.000000000 -0500
+@@ -412,7 +412,7 @@
+
+ ## grab the test code from the file
+ ## XXX FIXME XXX why doesn't the following work?
+- ## __body = system(["sed -n 's/^%!//p' '", __file, "'"]);
++ ## [status, __body] = system(["sed -n 's/^%!//p' '", __file, "'"]);
+ __tmp = tmpnam();
+ unwind_protect
+ system(sprintf("sed -n 's/^%%!//p' '%s' > '%s'", __file, __tmp));
+diff -ru octave-forge-2006.03.17.orig/main/audio/sound.m octave-forge-2006.03.17/main/audio/sound.m
+--- octave-forge-2006.03.17.orig/main/audio/sound.m 2002-04-29 08:56:02.000000000 -0500
++++ octave-forge-2006.03.17/main/audio/sound.m 2006-04-17 09:39:22.000000000 -0500
+@@ -78,7 +78,7 @@
+ if colon, display = display(1:colon-1); endif
+ host=getenv("HOSTNAME");
+ if isempty(host),
+- host = system("uname -n");
++ [status, host] = system("uname -n");
+ ## trim newline from end of hostname
+ if !isempty(host), host = host(1:length(host)-1); endif
+ endif
+diff -ru octave-forge-2006.03.17.orig/main/comm/comms.m octave-forge-2006.03.17/main/comm/comms.m
+--- octave-forge-2006.03.17.orig/main/comm/comms.m 2003-07-25 14:11:41.000000000 -0500
++++ octave-forge-2006.03.17/main/comm/comms.m 2006-04-17 09:38:01.000000000 -0500
+@@ -110,10 +110,10 @@
+ len = length(infopath);
+ if (len)
+ if (len > 1 && strcmp(infopath([len-1, len]),"//"))
+- showfile = system(["find '", infopath(1:len-1), "' -name ", ...
++ [status, showfile] = system(["find '", infopath(1:len-1), "' -name ", ...
+ infofile]);
+ else
+- showfile = system(["find '", infopath, "' -name ", infofile, ...
++ [status, showfile] = system(["find '", infopath, "' -name ", infofile, ...
+ " -maxdepth 1"]);
+ endif
+ if (length(showfile))
+@@ -129,7 +129,7 @@
+ endif
+
+ if (exist("INFO_PROGAM"))
+- [testout, testret] = system(["'", INFO_PROGRAM, "' --version"]);
++ [testret, testout] = system(["'", INFO_PROGRAM, "' --version"]);
+ if (testret)
+ error("comms: info command not found");
+ else
+@@ -137,7 +137,7 @@
+ nodename, "'"]);
+ endif
+ else
+- [testout, testret] = system("info --version");
++ [testret, testout] = system("info --version");
+ if (testret)
+ error("comms: info command not found");
+ else
+diff -ru octave-forge-2006.03.17.orig/main/fixed/fixedpoint.m octave-forge-2006.03.17/main/fixed/fixedpoint.m
+--- octave-forge-2006.03.17.orig/main/fixed/fixedpoint.m 2006-01-06 17:31:14.000000000 -0600
++++ octave-forge-2006.03.17/main/fixed/fixedpoint.m 2006-04-17 11:31:55.000000000 -0500
+@@ -106,10 +106,10 @@
+ len = length(infopath);
+ if (len)
+ if (len > 1 && strcmp(infopath([len-1, len]),"//"))
+- showfile = system(["find '", infopath(1:len-1), "' -name ", ...
++ [status, showfile] = system(["find '", infopath(1:len-1), "' -name ", ...
+ infofile]);
+ else
+- showfile = system(["find '", infopath, "' -name ", infofile, ...
++ [status, showfile] = system(["find '", infopath, "' -name ", infofile, ...
+ " -maxdepth 1"]);
+ endif
+ if (length(showfile))
+@@ -125,7 +125,7 @@
+ endif
+
+ if (exist("INFO_PROGAM"))
+- [testout, testret] = system(["'", INFO_PROGRAM, "' --version"]);
++ [testret, testout] = system(["'", INFO_PROGRAM, "' --version"]);
+ if (testret)
+ error("fixedpoint: info command not found");
+ else
+@@ -133,7 +133,7 @@
+ nodename, "'"]);
+ endif
+ else
+- [testout, testret] = system("info --version");
++ [testret, testout] = system("info --version");
+ if (testret)
+ error("fixedpoint: info command not found");
+ else
+diff -ru octave-forge-2006.03.17.orig/main/general/unix.m octave-forge-2006.03.17/main/general/unix.m
+--- octave-forge-2006.03.17.orig/main/general/unix.m 2002-04-19 16:59:27.000000000 -0500
++++ octave-forge-2006.03.17/main/general/unix.m 2006-04-17 11:32:11.000000000 -0500
+@@ -20,7 +20,7 @@
+ if (nargin < 1 || nargin > 2)
+ usage ( "[status, text] = unix (cmd, '-echo')");
+ else
+- [text, status] = system (cmd);
++ [status, text] = system (cmd);
+ if (nargin > 1 || nargout == 0) disp (text); endif
+ endif
+
+diff -ru octave-forge-2006.03.17.orig/main/image/imginfo.m octave-forge-2006.03.17/main/image/imginfo.m
+--- octave-forge-2006.03.17.orig/main/image/imginfo.m 2005-05-24 22:43:40.000000000 -0500
++++ octave-forge-2006.03.17/main/image/imginfo.m 2006-04-17 09:03:23.000000000 -0500
+@@ -28,7 +28,7 @@
+
+ function [h,w] = imginfo (fn)
+
+-[res,status] = system(sprintf("convert -verbose '%s' /dev/null",fn),1);
++[status, res] = system(sprintf("convert -verbose '%s' /dev/null",fn),1);
+
+ if status,
+ error (["imginfo : 'convert' exited with status %i ",\
+diff -ru octave-forge-2006.03.17.orig/main/image/imread.m octave-forge-2006.03.17/main/image/imread.m
+--- octave-forge-2006.03.17.orig/main/image/imread.m 2006-02-27 06:46:40.000000000 -0600
++++ octave-forge-2006.03.17/main/image/imread.m 2006-04-17 09:31:09.000000000 -0500
+@@ -64,7 +64,7 @@
+ break
+ endif
+
+- [ident, sys] = system(sprintf('identify -verbose %s | grep -e "Red: " -e Type',
++ [sys, ident] = system(sprintf('identify -verbose %s | grep -e "Red: " -e Type',
+ fn));
+ if (sys != 0)
+ error("imread: error running ImageMagick's 'identify' on %s", fn)
+@@ -98,7 +98,7 @@
+ cmd = sprintf("convert -flatten -strip +compress '%s' '%s' 2>/dev/null",
+ fn, tmpf);
+
+- [ignored, sys] = system(cmd);
++ sys = system(cmd);
+ if (sys != 0)
+ error("imread: error running ImageMagick's 'convert'");
+ unlink(tmpf);
+diff -ru octave-forge-2006.03.17.orig/main/image/imwrite.m octave-forge-2006.03.17/main/image/imwrite.m
+--- octave-forge-2006.03.17.orig/main/image/imwrite.m 2005-09-07 21:00:17.000000000 -0500
++++ octave-forge-2006.03.17/main/image/imwrite.m 2006-04-17 09:36:16.000000000 -0500
+@@ -221,7 +221,7 @@
+
+ fclose(fid);
+ if ~usepipe
+- [jnk,retcode] = system(cmd);
++ retcode = system(cmd);
+ if retcode !=0
+ error('could not call imagemagick convert');
+ end
+diff -ru octave-forge-2006.03.17.orig/main/miscellaneous/edit.m octave-forge-2006.03.17/main/miscellaneous/edit.m
+--- octave-forge-2006.03.17.orig/main/miscellaneous/edit.m 2005-08-22 09:56:13.000000000 -0500
++++ octave-forge-2006.03.17/main/miscellaneous/edit.m 2006-04-17 09:36:40.000000000 -0500
+@@ -163,7 +163,7 @@
+ if (isempty(FUNCTION.EMAIL))
+ host=getenv("HOSTNAME");
+ if isempty(host),
+- host = system("uname -n");
++ [status, host] = system("uname -n");
+ # trim newline from end of hostname
+ if !isempty(host) host = host(1:length(host)-1); endif
+ endif
+diff -ru octave-forge-2006.03.17.orig/main/miscellaneous/slurp_file.m octave-forge-2006.03.17/main/miscellaneous/slurp_file.m
+--- octave-forge-2006.03.17.orig/main/miscellaneous/slurp_file.m 2005-09-07 21:00:18.000000000 -0500
++++ octave-forge-2006.03.17/main/miscellaneous/slurp_file.m 2006-04-17 09:37:05.000000000 -0500
+@@ -39,4 +39,4 @@
+ end
+
+ ## I'll even get decent error messages!
+-s = system (sprintf ("cat '%s'",f), 1);
++[status, s] = system (sprintf ("cat '%s'",f), 1);
+diff -ru octave-forge-2006.03.17.orig/main/miscellaneous/units.m octave-forge-2006.03.17/main/miscellaneous/units.m
+--- octave-forge-2006.03.17.orig/main/miscellaneous/units.m 2005-12-29 19:51:05.000000000 -0600
++++ octave-forge-2006.03.17/main/miscellaneous/units.m 2006-04-17 09:37:24.000000000 -0500
+@@ -43,7 +43,7 @@
+ usage('units(fromUnit, toUnit [, x])')
+ endif
+
+- [rawoutput, status] = system(sprintf('units "%s" "%s"', fromUnit, toUnit), 1);
++ [status, rawoutput] = system(sprintf('units "%s" "%s"', fromUnit, toUnit), 1);
+ (0 == status) || error([rawoutput,
+ 'Verify that GNU units is installed in the current path.']);
+
+diff -ru octave-forge-2006.03.17.orig/main/plot/legend.m octave-forge-2006.03.17/main/plot/legend.m
+--- octave-forge-2006.03.17.orig/main/plot/legend.m 2005-09-07 21:00:18.000000000 -0500
++++ octave-forge-2006.03.17/main/plot/legend.m 2006-04-17 11:30:55.000000000 -0500
+@@ -190,7 +190,8 @@
+ while (~stat(tmpfilename).size)
+ usleep(1e5);
+ end
+- plot_cmd = split(system(shell_cmd),"\n");
++ [status, out] = system(shell_cmd);
++ plot_cmd = split(out,"\n");
+
+ if (~length(deblank(plot_cmd(rows(plot_cmd), :))))
+ plot_cmd = plot_cmd ([1:rows(plot_cmd)-1],:);
+diff -ru octave-forge-2006.03.17.orig/main/plot/print.m.in octave-forge-2006.03.17/main/plot/print.m.in
+--- octave-forge-2006.03.17.orig/main/plot/print.m.in 2006-03-12 14:39:10.000000000 -0600
++++ octave-forge-2006.03.17/main/plot/print.m.in 2006-04-17 11:29:54.000000000 -0500
+@@ -373,7 +373,7 @@
+
+ if !isempty(convertname)
+ command = [ "convert '", name, "' '", convertname, "'" ];
+- [output, errcode] = system (command);
++ [errcode, output] = system (command);
+ unlink (name);
+ if (errcode)
+ error ("print: could not convert");
+diff -ru octave-forge-2006.03.17.orig/main/vrml/select_3D_points.m octave-forge-2006.03.17/main/vrml/select_3D_points.m
+--- octave-forge-2006.03.17.orig/main/vrml/select_3D_points.m 2005-08-13 22:15:54.000000000 -0500
++++ octave-forge-2006.03.17/main/vrml/select_3D_points.m 2006-04-17 09:01:57.000000000 -0500
+@@ -117,7 +117,7 @@
+ perlcmd = "print qq{$1,$2;} if /^TAG:\\s*(\\d+)\\s*STATE:\\s*(\\d+)/";
+ cmd = sprintf ("perl -ne '%s' %s", perlcmd, data_out);
+
+-res = system (cmd, 1);
++[status, res] = system (cmd, 1);
+ res = res(1:length(res)-1); # Remove last ";"
+ stl = eval (["[",res,"];"])'; # List of clicks
+
+diff -ru octave-forge-2006.03.17.orig/main/vrml/vrml_browse.m octave-forge-2006.03.17/main/vrml/vrml_browse.m
+--- octave-forge-2006.03.17.orig/main/vrml/vrml_browse.m 2005-08-13 22:15:54.000000000 -0500
++++ octave-forge-2006.03.17/main/vrml/vrml_browse.m 2006-04-17 09:02:39.000000000 -0500
+@@ -86,7 +86,7 @@
+
+ # Check that browser is really alive
+
+- [dum,status]=system (sprintf ("kill -CONT %d &> /dev/null",vrml_b_pid));
++ status = system (sprintf ("kill -CONT %d &> /dev/null",vrml_b_pid));
+
+ if ! status
+ if verbose
+@@ -104,7 +104,7 @@
+
+ # ####################################
+ # Check that temp file exists ########
+-[dum,status] = system (["test -e ",b_temp]);
++status = system (["test -e ",b_temp]);
+ if !length (s)
+
+ if verbose
+@@ -195,7 +195,7 @@
+ # ####################################
+ # Send USR1 signal to browser to tell it to
+ # raise itself.
+- [dum,status]=system (sprintf ("kill -USR1 %d &> /dev/null",vrml_b_pid));
++ status = system (sprintf ("kill -USR1 %d &> /dev/null",vrml_b_pid));
+
+ if status,
+ printf ("vrml_browse : browser pid=%d can't be signaled\n",vrml_b_pid);
Modified: branches/2.9transition/packages/octave-forge/debian/rules
===================================================================
--- branches/2.9transition/packages/octave-forge/debian/rules 2006-05-01 12:18:09 UTC (rev 597)
+++ branches/2.9transition/packages/octave-forge/debian/rules 2006-05-02 15:28:29 UTC (rev 598)
@@ -2,219 +2,70 @@
# -*- makefile -*-
# debian.rules file for the Debian/GNU Linux octave-forge package
# Copyright 2000 - 2004 by Dirk Eddelbuettel <edd at debian.org>
+# Copyright 2005 - 2006 by Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>
-PACKAGE = octave-forge
-common_pkg = $(PACKAGE)-common
-2.1_pkg = $(PACKAGE)2.1
-2.9_pkg = $(PACKAGE)2.9
-include /usr/share/dpatch/dpatch.make
+# TODO:
+# - examples and docs
+# - call dh_shlibdeps ?
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/octave/debian/defs.make
+ # If one (and only one) of Octave 2.1 or 2.9 (-headers) is installed,
+ # defs.make points to the correct defs.make-x.y.z
+ # We ensure the correct version by build-conflicts in control
-2.1 = 2.1.72
-2.9 = 2.9.4
-altname = octave-forge-alternatives
-debtmp := $(CURDIR)/debian/$(PACKAGE)
-debdoc := $(debtmp)/usr/share/doc/$(PACKAGE)
-2.9octdir := $(shell octave-config-$(2.9) -p LOCALAPIOCTFILEDIR)
-2.1octdir := $(shell octave-config-$(2.1) -p LOCALAPIOCTFILEDIR)
-octdir := $(OCTDIR)
-2.9mdir := $(shell octave-config-$(2.9) -p LOCALAPIFCNFILEDIR)
-2.1mdir := $(shell octave-config-$(2.1) -p LOCALAPIFCNFILEDIR)
-mdir := $(MDIR)
-altoctdir := /usr/lib/$(altname)
-altmdir := /usr/share/$(altname)
-octbin := $(shell octave-config-2.9.4 -p LOCALARCHLIBDIR)
+PACKAGE := $(DEB_SOURCE_PACKAGE)
+ # octave-forge
+PACKAGEV := $(DEB_PACKAGES)
+ # octave-forge2.1 or octave-forge2.9
+ # As we have only one binary package, we can use $(DEB_PACKAGES)
+
+# We should probably exchange LOCALAPIFCNFILEDIR for LOCALFCNFILEDIR in defs.make
+# Unless this happens, overwrite it here
+# FIXME
+MDIR := $(shell octave-config --print LOCALAPIFCNFILEDIR)
-mycheck:
- @echo "debtmp $(debtmp)"
- @echo "debdic $(debdoc)"
- @echo "otdir $(octdir)"
- @echo "2.1otdir $(2.1octdir)"
- @echo "2.9otdir $(2.9octdir)"
- @echo "mdir $(mdir)"
- @echo "2.1mdir $(2.1mdir)"
- @echo "2.9mdir $(2.9mdir)"
- @echo "octbin $(octbin)"
+altname := $(PACKAGEV)-alternatives
+altmdir := /usr/share/$(altname)
+altoctdir := /usr/lib/$(altname)
+octbin := $(shell octave-config -p LOCALARCHLIBDIR)
-arch := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-compilerpath = /usr/bin/gcc
-cpppath = /usr/bin/g++
-fcpath = /usr/bin/gfortran
-compilerflags = "-O2"
-linkerflags = "-s"
-define l_configure
- patch-stamp
- chmod 0755 admin/octlink.sh
- dh_testdir
- touch extra/MacOSX/NOINSTALL
- [ -f autogen.sh ] && ./autogen.sh && chmod 0755 configure
- CC=$(compilerpath) \
- CXX=$(cpppath) \
- FC=$(fcpath) \
- F77=$(fcpath) \
- CFLAGS=$(compilerflags) \
- CXXFLAGS=$(compilerflags) \
- FFLAGS=$(compilerflags) \
- OCTAVE=octave-__OCTVERS__ \
- MKOCTFILE=mkoctfile-__OCTVERS__ \
- touch configure-stamp__OCTVERS__
-endef
-define l_install
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
- strip */*/*.oct
- $(MAKE) install MPATH=$(debtmp)/$(mdir)/$(PACKAGE) \
- OPATH=$(debtmp)/$(__VERS__octdir)/$(PACKAGE) \
- XPATH=$(debtmp)/$(octbin) \
- ALTMPATH=$(debtmp)/$(altmdir) \
- ALTOPATH=$(debtmp)/$(altoctdir) \
- prefix=$(debtmp)/usr \
- mandir=$(debtmp)/usr/share/man
- rm -vf $(debtmp)/rasmol.sh
- touch install-stamp__VERS__
-endef
-get-orig-source: upstream
-upstream:
- links http://octave.sf.net
+# Installation paths, handed to configure
+# in order: m-files, oct-files, executables, alternative m-files, alternative
+# oct-files,
+MPATH:=$(DESTDIR)/$(MDIR)/$(PACKAGE)
+OPATH:=$(DESTDIR)/$(OCTDIR)/$(PACKAGE)
+ # These two have api versions in their path, so no further distinction
+ # is necessary
+XPATH:=$(DESTDIR)/$(octbin)/$(PACKAGEV)
+ALTMPATH:=$(DESTDIR)/$(altmdir)
+ALTOPATH:=$(DESTDIR)/$(altoctdir)
+ # These three need a package version in their path
-upstreamcvs:
- # see the script cvs_checkout.sh instead
+DEB_CONFIGURE_EXTRA_FLAGS := --with-mpath=$(MPATH) \
+ --with-opath=$(OPATH) \
+ --with-xpath=$(XPATH) \
+ --with-altmpath=$(ALTMPATH) \
+ --with-altopath=$(ALTOPATH)
-configure: configure-stamp
+# run the check commands
+# DEB_MAKE_CHECK_TARGET := check
+# currently disabled, the checks fail with a crash!
-configure-stamp2.1: $(subst __OCTVERS__,$(2.1),$(l_configure))
+# calculate correct dependencies
+install/$(PACKAGEV)::
+ octave-depends
-configure-stamp2.9: touch main/sparse/NOINSTALL
- $(subst __OCTVERS__,$(2.9),$(l_configure))
+# what we don't want in the package
+makebuilddir/$(PACKAGEV)::
+ touch $(CURDIR)/extra/MacOSX/NOINSTALL
+ # we aren't MacOS, honest
+ touch $(CURDIR)/main/sparse/NOINSTALL
+ touch $(CURDIR)/extra/testfun/NOINSTALL
+ # sparse code and testfunctions are in Octave 2.9
-configure-stamp: patch-stamp
- chmod 0755 admin/octlink.sh
- dh_testdir
- mv configure configure-orig
- touch extra/MacOSX/NOINSTALL
- touch main/sparse/NOINSTALL
- [ -f autogen.sh ] && ./autogen.sh && chmod 0755 configure
- CC=$(compilerpath) \
- CXX=$(cpppath) \
- FC=$(fcpath) \
- F77=$(fcpath) \
- CFLAGS=$(compilerflags) \
- CXXFLAGS=$(compilerflags) \
- FFLAGS=$(compilerflags) \
- OCTAVE="octave-2.9.4" \
- MKOCTFILE="mkoctfile-2.9.4" \
- ./configure --prefix=/usr --with-altmpath=$(altmdir)
- # clean the tsa/ directory
- # ( cd extra/tsa && ../../debian/tsacleanup.pl )
- touch configure-stamp
-
-build: configure-stamp build-stamp
-build-stamp:
- $(MAKE)
- # $(MAKE) index.html
- touch build-stamp
-
-install: install-stamp
-install-stamp:
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
- strip */*/*.oct
- $(MAKE) install MPATH=$(debtmp)/$(mdir)/$(PACKAGE) \
- OPATH=$(debtmp)/$(octdir)/$(PACKAGE) \
- XPATH=$(debtmp)/$(octbin) \
- ALTMPATH=$(debtmp)/$(altmdir) \
- ALTOPATH=$(debtmp)/$(altoctdir) \
- prefix=$(debtmp)/usr \
- mandir=$(debtmp)/usr/share/man
- rm -vf $(debtmp)/rasmol.sh
- touch install-stamp
-
-install-stamp2.1: $(subst __VERS__,2.1,$(l_install))
-install-stamp2.9: $(subst __VERS__,2.9,$(l_install))
-
-check: check-stamp
-check-stamp:
- dh_testdir
- -$(MAKE) check OCTAVE=octave-2.9.4
- touch check-stamp
-
-clean: unpatch
- dh_testdir
- dh_testroot
- -test -f configure-orig && mv configure-orig configure
- rm -f configure-stamp build-stamp install-stamp check-stamp
- -test -f Makefile && $(MAKE) clean && $(MAKE) distclean
- -( cd main/fixed/doc ; $(MAKE) realclean )
- -rm -rf *~ $(debtmp) debian/*~ debian/files* \
- fntests.* admin/RPM/octave-forge.spec
- -rm -f `find . -name PKG_ADD`
- rm -f extra/MacOSX/NOINSTALL main/sparse/NOINSTALL
- # The following should be dropped when the
- # main/set/Makefile is included in the upstream tarball
- -rm -f main/set/ismember.m main/set/setdiff.m \
- main/set/unique.m
-
- dh_clean
-
-binary-indep: build install check
-
-binary-arch: build install check
-# dh_testversion
- dh_testdir
- dh_testroot
-# dh_installdebconf
- dh_installdocs AUTHORS TODO README RELEASE-NOTES
- dh_installexamples extra/pdb/bin/rasmol.sh
-# dh_installmenu
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installman debian/aurecord.1
-# dh_installinfo
-# dh_undocumented
- dh_installchangelogs
- dh_link $(mdir)/$(PACKAGE) \
- /usr/share/doc/$(PACKAGE)/scripts
- dh_strip
- strip --remove-section=.comment \
- --remove-section=.note \
- $(debtmp)$(octdir)/$(PACKAGE)/*.oct
- # this only affects one file (mex.o) and it needs
- # symbols (c.f. #207542)
- ## strip --remove-section=.comment \
- ## --remove-section=.note \
- ## $(debtmp)$(octdir)/$(PACKAGE)/*.o
- dh_compress
- dh_fixperms
-# dh_suidregister
-# dh_makeshlibs
- dh_installdeb
-# dh_perl
- # call with three explicit files to cover our bases
-
- octave-depends
- dh_shlibdeps $(debtmp)$(octdir)/$(PACKAGE)/convhulln.oct \
- $(debtmp)$(octdir)/$(PACKAGE)/jpgwrite.oct \
- $(debtmp)$(octdir)/$(PACKAGE)/gsl_sf.oct \
- $(debtmp)$(octdir)/$(PACKAGE)/symbols.oct
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary-arch: build
-
-source diff:
- @echo >&2 'obsolete targets - use dpkg-source -b'; false
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary upstream upstreamcvs
-
More information about the Pkg-octave-commit
mailing list