[Pkg-octave-commit] [SCM] octave-symbolic branch, master, updated. 67f86a335f3fb1b8fbc32bcf487585163ac49d07

[Rafael Laboissiere]

The following commit has been merged in the master branch:
commit d0a7e25a22a9ef2ed888fa7add9017c3058da432
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Sat May 23 14:10:04 2009 +0200

    Add tests to function symfsolve
    
    Also, add the Policy-required README.source file, build-depends on quilt,
    include patchsys-quilt.mk in debian/rules, and adjust the list of
    exclusions in .gitignore accordingly.

diff --git a/.gitignore b/.gitignore
index 69f57ed..400b13b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.pc/
 COPYING
 ChangeLog
 DESCRIPTION
@@ -7,6 +8,7 @@ PKG_ADD
 configure
 debian/files
 debian/octave-symbolic*
+debian/stamp-patched
 doc/
 global-list
 inst/
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..3c8a1fa
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,8 @@
+README.source for octave-symbolic
+=================================
+
+This package uses quilt to manage all modifications to the upstream sources.
+See `/usr/share/doc/quilt/README.source' to get more information on how to
+use it.
+
+ -- Rafael Laboissiere <rafael at debian.org>, Sat, 23 May 2009 13:06:34 +0200
diff --git a/debian/changelog b/debian/changelog
index 9f40701..e4b6bb8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
 octave-symbolic (1.0.8-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * debian/patches/symfsolve-tests.diff: Add tests to function symfsolve
   * debian/control:
+    + (Build-Depends): Add quilt
     + (Standards-Version): Bump to 3.8.1 (no changes needed)
     + (Depends): Add ${misc:Depends}
     + (Vcs-Git, Vcs-Browser): Adjust to new Git repository
@@ -9,6 +11,9 @@ octave-symbolic (1.0.8-1) UNRELEASED; urgency=low
     +  Use DEP5 URL in Format-Specification
     + Use separate License stanzas for instructing about the location of
       the different licenses used in the package
+  * debian/rules: Include patchsys-quilt.mk
+  * debian/README.source: Add file explaining the quilt patch system, as
+    required by the Policy
 
  -- Rafael Laboissiere <rafael at debian.org>  Sun, 12 Apr 2009 17:47:23 +0200
 
diff --git a/debian/control b/debian/control
index 0207637..728fada 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.6.4), libginac-dev, pkg-config
+Build-Depends: debhelper (>= 7.0.0), cdbs, octave-pkg-dev (>= 0.6.4),
+ libginac-dev, pkg-config, quilt
 Standards-Version: 3.8.1
 Homepage: http://octave.sourceforge.net/symbolic
 Vcs-Git: git://git.debian.org/git/pkg-octave/octave-symbolic.git
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..95a5ed0
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+symfsolve-tests.diff
diff --git a/debian/patches/symfsolve-tests.diff b/debian/patches/symfsolve-tests.diff
new file mode 100644
index 0000000..4f087db
--- /dev/null
+++ b/debian/patches/symfsolve-tests.diff
@@ -0,0 +1,26 @@
+Add tests to function symfsolve
+
+ -- Rafael Laboissiere <rafael at debian.org>  Sat, 23 May 2009 13:07:00 +0200
+
+--- a/inst/symfsolve.m
++++ b/inst/symfsolve.m
+@@ -158,3 +158,19 @@
+ 	[x,inf,msg] = fsolve("symfn",X0);
+ 
+ endfunction
++
++%!shared
++% x = sym ("x");
++% y = sym ("y");
++% f = x ^ 2 + 3 * x - 1;
++% g = x * y - y ^ 2 + 3;
++%!test
++% assert (symfsolve (f, g), [0.30278; -1.58727]', 1e-5);
++%!test
++% assert (symfsolve (f, g, x, 1, y, 5), [0.30278; 1.89004]', 1e-5);
++%!test
++% assert (symfsolve (f, g, {x==1,y==5}), [0.30278; 1.89004]', 1e-5);
++%!test
++% assert (symfsolve (f, g, [1 5]), [0.30278; 1.89004]', 1e-5);
++%!test
++% assert (symfsolve ({f, g}, {y==1,x==2}), [1.89004; 0.30278]', 1e-5);
diff --git a/debian/rules b/debian/rules
index c0a726d..eea3ea7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,7 @@
 # -*- makefile -*-
 
 include /usr/share/cdbs/1/class/octave-pkg.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 install/octave-symbolic::
 	rm -f debian/octave-symbolic/usr/share/doc/octave-symbolic/INSTALL

-- 
octave-symbolic