[Pkg-octave-commit] [SCM] octave-msh branch, master, updated. a7a2c26a4e977725422942f57fa5bb0189904c81

[Thomas Weber]

The following commit has been merged in the master branch:
commit 921c87b964f1d1b693c7b886e45f6531ffe8d7a9
Author: Thomas Weber <thomas.weber.mail at gmail.com>
Date:   Sat May 1 23:36:11 2010 +0200

    Drop patch fix_tests_for_MSH2Mgmsh

diff --git a/debian/changelog b/debian/changelog
index d4be728..56c1c0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ octave-msh (1.0.1-1) UNRELEASED; urgency=low
     - Remove Ólafur Jens Sigurðsson <ojsbug at gmail.com> from Uploaders 
   * Bump Standards-Version to 3.8.4, no changes needed
   * Switch to dpkg-source 3.0 (quilt) format
+  * Drop patch fix_tests_for_MSH2Mgmsh, applied upstream
 
  -- Thomas Weber <thomas.weber.mail at gmail.com>  Sun, 28 Feb 2010 22:37:46 +0100
 
diff --git a/debian/patches/fix_tests_for_MSH2Mgmsh b/debian/patches/fix_tests_for_MSH2Mgmsh
deleted file mode 100644
index 9bb151f..0000000
--- a/debian/patches/fix_tests_for_MSH2Mgmsh
+++ /dev/null
@@ -1,30 +0,0 @@
-Fixes a problem with the unit tests. Taken from upstream SVN rev 6004 and rev 6461
---- a/inst/MSH2Mgmsh.m
-+++ b/inst/MSH2Mgmsh.m
-@@ -136,17 +136,16 @@
- 
- %!test
- %! fid = fopen("circle.geo","w");
--%! fprintf(fid,"Point(1) = {0, 0, 0, 1e+22};\n");
--%! fprintf(fid,"Point(2) = {1, 0, 0, 1e+22};\n");
--%! fprintf(fid,"Point(3) = {-1, 0, 0, 1e+22};\n");
-+%! fprintf(fid,"Point(1) = {0, 0, 0, 1};\n");
-+%! fprintf(fid,"Point(2) = {1, 0, 0, 1};\n");
-+%! fprintf(fid,"Point(3) = {-1, 0, 0, 1};\n");
- %! fprintf(fid,"Circle(1) = {3, 1, 2};\n");
- %! fprintf(fid,"Circle(2) = {2, 1, 3};\n");
- %! fprintf(fid,"Line Loop(4) = {2, 1};\n");
- %! fprintf(fid,"Plane Surface(4) = {4};");
- %! fclose(fid);
--%! mesh = msh2m_gmsh("circle","v",0);
-+%! mesh = MSH2Mgmsh("circle","v",0);
- %! system("rm circle.geo");
--%! xidx = find(mesh.p(1,:) == 0);
--%! yidx = find(mesh.p(2,:) == 0);
--%! tmp  = intersect(xidx,yidx);
--%! assert(isempty(tmp));
-\ No newline at end of file
-+%! nnodest = length(unique(mesh.t));
-+%! nnodesp = columns(mesh.p);
-+%! assert(nnodest,nnodesp);
-\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
index 4255790..6f889c5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-fix_tests_for_MSH2Mgmsh
 autoload-yes.diff

-- 
octave-msh