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

[Thomas Weber]

Author: thomas-guest
Date: 2006-12-21 10:44:38 +0100 (Thu, 21 Dec 2006)
New Revision: 824

Added:
   trunk/packages/octave2.9-forge/debian/patches/50-correct-is-nan.patch
   trunk/packages/octave2.9-forge/debian/patches/50-grayscale-image.patch
Modified:
   trunk/packages/octave2.9-forge/debian/changelog
   trunk/packages/octave2.9-forge/debian/control
Log:
Bug fixes for #403864 and #403734
Add pcre to build-deps (I don't know where it is exactly needed, but the
configure script checks for it)
Prepare for texlive as TeX environment.


Modified: trunk/packages/octave2.9-forge/debian/changelog
===================================================================
--- trunk/packages/octave2.9-forge/debian/changelog	2006-12-18 22:42:24 UTC (rev 823)
+++ trunk/packages/octave2.9-forge/debian/changelog	2006-12-21 09:44:38 UTC (rev 824)
@@ -1,3 +1,17 @@
+octave2.9-forge (2006.07.09+dfsg1-6) unstable; urgency=low
+
+  NOT YET RELEASED!
+
+  [ Thomas Weber ]
+  * debian/patches/50-correct-is-nan.patch: correct usage of is_nan_or_na
+    in boxplot.m (closes: #403734). Patch taken from upstreams's CVS.
+  * debian/patches/50-grayscale-image.patch: fix imread for grayscale images
+    (closes: #403864).
+  * debian/control: Add libpcre3-dev to build-dependencies and depend on
+    either tetex or texlive.
+
+ --
+
 octave2.9-forge (2006.07.09+dfsg1-5) unstable; urgency=low
 
   * debian/patches/50-leasqr-doc.patch: Improved documentation for leasqr.

Modified: trunk/packages/octave2.9-forge/debian/control
===================================================================
--- trunk/packages/octave2.9-forge/debian/control	2006-12-18 22:42:24 UTC (rev 823)
+++ trunk/packages/octave2.9-forge/debian/control	2006-12-21 09:44:38 UTC (rev 824)
@@ -7,8 +7,9 @@
 Build-Depends: debhelper (>= 5), octave2.9-headers (>= 2.9.9),
  libxt-dev, gfortran, libqhull-dev, libginac-dev (>= 1.3.3-2+b1),
  libgmp3-dev, libjpeg62-dev, libpng12-dev, libncurses5-dev,
- libreadline5-dev, tetex-bin, libgsl0-dev, netcdfg-dev,
- graphicsmagick-libmagick-dev-compat, units, cdbs
+ libreadline5-dev, tetex-bin | texlive-base-bin, libgsl0-dev,
+ netcdfg-dev, graphicsmagick-libmagick-dev-compat, units,
+ libpcre3-dev, cdbs
 Build-Conflicts: octave2.0-headers, octave2.0, octave2.1-headers, octave2.1
 
 Package: octave2.9-forge

Added: trunk/packages/octave2.9-forge/debian/patches/50-correct-is-nan.patch
===================================================================
--- trunk/packages/octave2.9-forge/debian/patches/50-correct-is-nan.patch	2006-12-18 22:42:24 UTC (rev 823)
+++ trunk/packages/octave2.9-forge/debian/patches/50-correct-is-nan.patch	2006-12-21 09:44:38 UTC (rev 824)
@@ -0,0 +1,25 @@
+diff -Nur octave2.9-forge-2006.07.09+dfsg1/main/statistics/boxplot.m octave2.9-forge-2006.07.09+dfsg1.new/main/statistics/boxplot.m
+--- octave2.9-forge-2006.07.09+dfsg1/main/statistics/boxplot.m	2003-02-12 20:58:33.000000000 +0100
++++ octave2.9-forge-2006.07.09+dfsg1.new/main/statistics/boxplot.m	2006-12-19 15:26:21.000000000 +0100
+@@ -65,6 +65,12 @@
+ ## Version: 1.4
+ ## Created: 6 January 2002
+ 
++## Version: 1.4.1
++## Author: Alberto Pose <apose at alu.itba.edu.ar>
++## Updated: 3 September 2006 
++## - Replaced deprecated is_nan_or_na(X) with (isnan(X) | isna(X)) 
++## (now works with Octave 2.9.7 and foward)
++
+ function s = boxplot (data,notched,symbol,vertical,maxwhisker)
+ 
+ ## assign parameter defaults
+@@ -111,7 +117,7 @@
+     col = data(:,i);
+   endif
+   ## Skip missing data
+-  col(is_nan_or_na (col)) = [];
++  col(isnan(col) | isna (col)) = [];
+   ## Remember the data length
+   nd = length(col);
+   box(i) = nd;

Added: trunk/packages/octave2.9-forge/debian/patches/50-grayscale-image.patch
===================================================================
--- trunk/packages/octave2.9-forge/debian/patches/50-grayscale-image.patch	2006-12-18 22:42:24 UTC (rev 823)
+++ trunk/packages/octave2.9-forge/debian/patches/50-grayscale-image.patch	2006-12-21 09:44:38 UTC (rev 824)
@@ -0,0 +1,31 @@
+diff -Nur octave2.9-forge-2006.07.09+dfsg1/main/image/imread.m octave2.9-forge-2006.07.09+dfsg1.new/main/image/imread.m
+--- octave2.9-forge-2006.07.09+dfsg1/main/image/imread.m	2006-05-12 15:25:45.000000000 +0200
++++ octave2.9-forge-2006.07.09+dfsg1.new/main/image/imread.m	2006-12-20 15:49:22.000000000 +0100
+@@ -28,6 +28,11 @@
+ ##
+ ## Modified: Stefan van der Walt <stefan at sun.ac.za>
+ ## Date: 24 January 2005
++##
++## Modified: Thomas Weber <thomas.weber.mail at gmail.com>
++## Date: 20 December 2006
++## Change parsing of imagemagick's output to get the 'color' depth for grayscale
++## images
+ 
+ function varargout = imread(filename, varargin)
+     if (nargin != 1)
+@@ -64,12 +69,12 @@
+       break
+     endif
+     
+-    [sys, ident] = system(sprintf('identify -verbose %s | grep -e "Red: " -e Type',
+-				  fn));
++    [sys, ident] = system(sprintf('identify -verbose %s | grep -e "bits" -e Type',
++				  fn))
+     if (sys != 0)
+ 	error("imread: error running ImageMagick's 'identify' on %s", fn)
+     endif
+-    depth = re_grab("Red: ([[:digit:]]{1,2})", ident);
++    depth = re_grab("([[:digit:]]{1,2})-bits", ident)
+     imtype = re_grab("Type: ([[:alpha:]]*)", ident);
+ 
+     depth = str2num(depth);