[Pkg-octave-commit] [SCM] octave-io branch, master, updated. 5d80d73bb60e6dd3503350a09ba1d20d9f85089c

[Rafael Laboissiere]

The following commit has been merged in the master branch:
commit 5d80d73bb60e6dd3503350a09ba1d20d9f85089c
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Fri May 22 21:27:30 2009 +0200

    Add patch to make dlmwrite test succeed
    
    Also, build-depend on quilt and include patchsys-quilt.mk in debian/rules.

diff --git a/debian/changelog b/debian/changelog
index 428e668..b3ab5ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 octave-io (1.0.8-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * patches/dlmwrite-succeed-test.diff: New patch for making the test of
+    dlmwrite succeed
   * debian/control:
     + (Standards-Version): Bump to 3.8.1 (no changes needed)
     + (Depends): Add ${misc:Depends}
diff --git a/debian/control b/debian/control
index a554274..a7fd4d9 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ 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 (>= 6), cdbs, octave-pkg-dev (>= 0.6.4)
+Build-Depends: debhelper (>= 6), cdbs, octave-pkg-dev (>= 0.6.4), quilt
 Standards-Version: 3.8.1
 Homepage: http://octave.sourceforge.net/io
 Vcs-Git: git://git.debian.org/git/pkg-octave/octave-io.git
diff --git a/debian/patches/dlmwrite-succeed-test.diff b/debian/patches/dlmwrite-succeed-test.diff
new file mode 100644
index 0000000..a993331
--- /dev/null
+++ b/debian/patches/dlmwrite-succeed-test.diff
@@ -0,0 +1,13 @@
+Give the correct comparison value to assert, otherwise the test of
+dlmwrite will fail.
+
+ -- Rafael Laboissiere <rafael at debian.org>  Fri, 22 May 2009 21:21:59 +0200
+
+--- a/inst/dlmwrite.m
++++ b/inst/dlmwrite.m
+@@ -194,4 +194,4 @@
+ %! unlink(f);
+ %!
+ %! assert(f1,",,\n, 1.00, 2.00\n, 3.00, 4.00\n");
+-%! assert(f2,",,\n, 1.00, 2.00\n, 3.00, 4.00\n, 5.00, 6.00\n");
++%! assert(f2,",,\n, 1.00, 2.00\n, 3.00, 4.00\n, 5.00, 6.00\n 5.00\t 6.00\n");
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b8fc46e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+dlmwrite-succeed-test.diff
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-io