[Pkg-octave-commit] [SCM] octave-octcdf branch, master, updated. de92109f7a5f7b6e3156faad3130573fe49a2463

[Thomas Weber]

The following commit has been merged in the master branch:
commit 98cb4c4c4dcb9112f10a244d08a32f6cb07986d0
Author: Thomas Weber <thomas.weber.mail at gmail.com>
Date:   Wed Dec 30 22:14:18 2009 +0100

    New patch: update-tests and quilt infrastructure for it

diff --git a/debian/changelog b/debian/changelog
index 3792ba0..919bd40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,17 @@
-octave-octcdf (1.0.12-2) UNRELEASED; urgency=low
+octave-octcdf (1.0.13-1) UNRELEASED; urgency=low
 
+  [ Rafael Laboissiere ]
   * debian/control: Build-depend on octave-pkg-dev >= 0.7.0, such that the
     package is built against octave3.2
 
- -- Rafael Laboissiere <rafael at debian.org>  Sun, 07 Jun 2009 21:06:52 +0200
+  [ Thomas Weber ]
+  * New upstream release
+  * Use quilt for patches
+  * New patch: update-tests, fixes failing tests. Taken from upstream SVN.
+    Unfortunately, the tests still don't pass due to a bug in Octave, see
+    http://old.nabble.com/writing-ncdf-file-with-octcdf-to26238983.html
+
+ -- Thomas Weber <thomas.weber.mail at gmail.com>  Sat, 12 Dec 2009 19:41:44 +0100
 
 octave-octcdf (1.0.12-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index fa43445..0de64fd 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,8 @@ Uploaders: Ólafur Jens Sigurðsson <ojsbug at gmail.com>,
  Thomas Weber <thomas.weber.mail at gmail.com>,
  Rafael Laboissiere <rafael at debian.org>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.0), cdbs, octave-pkg-dev (>= 0.7.0), libnetcdf-dev
+Build-Depends: debhelper (>= 7.0.0), cdbs, octave-pkg-dev (>= 0.7.0), 
+ libnetcdf-dev, quilt
 Standards-Version: 3.8.1
 Homepage: http://octave.sourceforge.net/octcdf
 Vcs-Git: git://git.debian.org/git/pkg-octave/octave-octcdf.git
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a61a38a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+update-tests
diff --git a/debian/patches/update-tests b/debian/patches/update-tests
new file mode 100644
index 0000000..2042e21
--- /dev/null
+++ b/debian/patches/update-tests
@@ -0,0 +1,21 @@
+Update tests to upstream SVN rev 5954
+--- a/inst/nctest.m
++++ b/inst/nctest.m
+@@ -53,7 +53,7 @@
+ %! assert(nc.short_att,123)
+ %! assert(nc.int_att,123)
+ %! assert(nc.long_att,123)
+-%! assert(nc.float_att,123)
++%! assert(nc.float_att,single(123))
+ %! assert(nc.double_att,123.4)
+ %! assert(nc.string_att,"test string")
+ 
+@@ -120,7 +120,7 @@
+ %! assert(nv.short_att,123)
+ %! assert(nv.int_att,123)
+ %! assert(nv.long_att,123)
+-%! assert(nv.float_att,123)
++%! assert(nv.float_att,single(123))
+ %! assert(nv.double_att,123.4)
+ %! assert(nv.string_att,"test string")
+ 
diff --git a/debian/rules b/debian/rules
index 71fb86c..038c30c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,3 +2,4 @@
 # -*- makefile -*-
 
 include /usr/share/cdbs/1/class/octave-pkg.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk

-- 
octave-octcdf