[Pkg-octave-commit] rev 652 - in trunk/packages/octave2.1-forge/debian: . patches

Fri Jul 21 08:20:08 UTC 2006

Author: thomas-guest
Date: 2006-07-21 08:20:07 +0000 (Fri, 21 Jul 2006)
New Revision: 652

Added:
   trunk/packages/octave2.1-forge/debian/patches/add_gisequal.patch
   trunk/packages/octave2.1-forge/debian/patches/drop-sparse-check.patch
Modified:
   trunk/packages/octave2.1-forge/debian/changelog
   trunk/packages/octave2.1-forge/debian/control
Log:
Use octave2.1-forge as source package
Replace octave-forge
Add patches from the (never published) 2.9 transition package


Modified: trunk/packages/octave2.1-forge/debian/changelog
===================================================================

--- trunk/packages/octave2.1-forge/debian/changelog	2006-07-21 05:55:03 UTC (rev 651)
+++ trunk/packages/octave2.1-forge/debian/changelog	2006-07-21 08:20:07 UTC (rev 652)
@@ -1,16 +1,31 @@
-octave-forge (2006.03.17-3) unstable; urgency=low
+octave2.1-forge (2006.03.17-1) unstable; urgency=low
 
   NOT YET RELEASED!
 
   [ Rafael Laboissiere ]
   * debian/control: Bumped Standards-Version to 3.7.2 (no changes needed)
+  * debian/rules: Disable installation of files in FIXES
+  * debian/patches/drop-sparse-check.patch: Patch for commenting out
+    the call of sparse checks in batch_test.m
 
   [ Thomas Weber ]
-  * debian/compat: Bumped to compatibility level 5.
-  * debian/control: Accordingly, use debhelper V5.
-  * debian/watch: Use format version 3.
-  * patches/50-leasqr.patch: use upstream CVS version for leasqr.m
-    (Closes: #366729).
+  * Package renamed to octave2.1-forge; prepare for dual builds for both 
+    Octave 2.1 and Octave 2.9
+  * debian/compat: Bumped compat level to 5
+  * debian/control:
+    - Use debhelper level 5
+    - conflict against octave-forge
+    - Depend upon Octave 2.1 and build-conflict against Octave 2.9
+    - Build-depend on graphicsmagick-libmagick-dev-compat for the libmagick++
+      intercace
+    - Drop description of octave-matcompat package; it was a transition
+      package in Sarge already
+  * debian/rules: Use CDBS for package building
+  * Patches: 
+    - add_gisequal.patch: Octave's isequal() can't handle Galois fields
+      (thanks to David Bateman for the patch)
+    - 50-leasqr.patch: use upstream CVS version for leasqr.m
+      (Closes: #366729).
 
  -- 
 

Modified: trunk/packages/octave2.1-forge/debian/control
===================================================================
--- trunk/packages/octave2.1-forge/debian/control	2006-07-21 05:55:03 UTC (rev 651)
+++ trunk/packages/octave2.1-forge/debian/control	2006-07-21 08:20:07 UTC (rev 652)
@@ -1,17 +1,15 @@
-Source: octave-forge
+Source: octave2.1-forge
 Section: math
 Priority: optional
 Maintainer: Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>
 Uploaders: Rafael Laboissiere <rafael at debian.org>
 Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 5), octave2.1-headers (>= 2.1.73-4),
- 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, cdbs
-Build-Conflicts: octave2.0-headers, octave2.0
+Build-Depends: debhelper (>= 5), octave2.1-headers (>= 1:2.1.73-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, cdbs
+Build-Conflicts: octave2.0-headers, octave2.0, octave2.9-headers, octave2.9
 
-Package: octave-forge
-Replaces: octave-matcompat
+Package: octave2.1-forge
+Replaces: octave-matcompat, octave-forge
+Conflicts: octave-matcompat, octave-forge
 Architecture: any
 Depends: ${octave:Depends}, ${shlibs:Depends}
 Suggests: grace, units
@@ -30,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.1. If you need it for Octave 2.9,
+ install octave2.9-forge.

Added: trunk/packages/octave2.1-forge/debian/patches/add_gisequal.patch
===================================================================
--- trunk/packages/octave2.1-forge/debian/patches/add_gisequal.patch	2006-07-21 05:55:03 UTC (rev 651)
+++ trunk/packages/octave2.1-forge/debian/patches/add_gisequal.patch	2006-07-21 08:20:07 UTC (rev 652)
@@ -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: trunk/packages/octave2.1-forge/debian/patches/drop-sparse-check.patch
===================================================================
--- trunk/packages/octave2.1-forge/debian/patches/drop-sparse-check.patch	2006-07-21 05:55:03 UTC (rev 651)
+++ trunk/packages/octave2.1-forge/debian/patches/drop-sparse-check.patch	2006-07-21 08:20:07 UTC (rev 652)
@@ -0,0 +1,15 @@
+diff -Nur octave-forge-2006.03.17/batch_test.m octave-forge-2006.03.17.new/batch_test.m
+--- octave-forge-2006.03.17/batch_test.m	2005-11-04 23:06:48.000000000 +0100
++++ octave-forge-2006.03.17.new/batch_test.m	2006-05-03 22:52:13.566921624 +0200
+@@ -38,9 +38,9 @@
+ try testimio
+ catch disp(__error_text__); end
+ 
+-disp("[main/sparse]");
++# disp("[main/sparse]");
+ # sp_test  # now using generated sptest
+-fem_test
++# fem_test
+ 
+ disp("=====================");
+ disp("all tests completed successfully");


