[SCM] admesh - a tool for processing triangulated solid meshes branch, master, updated. debian/0.95-14-12-gcff9d65

[Anton Gladky]

The following commit has been merged in the master branch:
commit 6937c796ac99a74f795e513d9a34b0516e2fd15f
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Wed Jul 3 18:10:21 2013 +0200

    Update patches, remove, applied by upstream.

diff --git a/debian/patches/add-regression-test b/debian/patches/add-regression-test
index 22dc734..f4c030b 100644
--- a/debian/patches/add-regression-test
+++ b/debian/patches/add-regression-test
@@ -9,7 +9,7 @@ Last-Update: 2011-02-06
 --- /dev/null
 +++ b/regression_test/regression_test_output_etalon
 @@ -0,0 +1,36 @@
-+ADMesh version 0.95, Copyright (C) 1995, 1996 Anthony D. Martin
++ADMesh version 0.96, Copyright (C) 1995, 1996 Anthony D. Martin
 +ADMesh comes with NO WARRANTY.  This is free software, and you are welcome to
 +redistribute it under certain conditions.  See the file COPYING for details.
 +Opening block.stl
@@ -22,7 +22,7 @@ Last-Update: 2011-02-06
 +Calculating volume...
 +Verifying neighbors...
 +
-+================= Results produced by ADMesh version 0.95 ================
++================= Results produced by ADMesh version 0.96 ================
 +Input file         : block.stl
 +File type          : ASCII STL file
 +Header             : SOLID  Untitled1
diff --git a/debian/patches/bug_597159_missing_fclose.diff b/debian/patches/bug_597159_missing_fclose.diff
deleted file mode 100644
index 1ea4fa6..0000000
--- a/debian/patches/bug_597159_missing_fclose.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: fclose added at the end of stl_print_neighbors function
-Bug-Debian: http://bugs.debian.org/597159
-Author: Bilal Akhtar <bilalakhtar at ubuntu.com>
-
---- a/stl_io.c
-+++ b/stl_io.c
-@@ -197,6 +197,7 @@
- 	      stl->neighbors_start[i].neighbor[2],
- 	      (int)stl->neighbors_start[i].which_vertex_not[2]);
-     }
-+    fclose(fp);
- }
- 
- static void
diff --git a/debian/patches/series b/debian/patches/series
index 5a15e4a..00871b2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 add-regression-test
-bug_597159_missing_fclose.diff

-- 
admesh - a tool for processing triangulated solid meshes