[qhull] 27/28: quilt patches for spelling and man page
Barak A. Pearlmutter
barak+git at cs.nuim.ie
Thu Feb 6 14:06:27 UTC 2014
This is an automated email from the git hooks/post-receive script.
bap pushed a commit to branch master
in repository qhull.
commit db0eef3e9ff4cd56677fe1cc1db68c6e8564a3fb
Author: Barak A. Pearlmutter <barak+git at cs.nuim.ie>
Date: Thu Feb 6 14:02:43 2014 +0000
quilt patches for spelling and man page
---
debian/patches/0004-spelling.patch | 72 +++++++++++++++++++++++++++++++
debian/patches/0005-QJN-not-a-macro.patch | 26 +++++++++++
debian/patches/series | 2 +
3 files changed, 100 insertions(+)
diff --git a/debian/patches/0004-spelling.patch b/debian/patches/0004-spelling.patch
new file mode 100644
index 0000000..1bbf8f9
--- /dev/null
+++ b/debian/patches/0004-spelling.patch
@@ -0,0 +1,72 @@
+From: "Barak A. Pearlmutter" <barak+git at cs.nuim.ie>
+Date: Thu, 6 Feb 2014 12:41:50 +0000
+Subject: spelling
+
+---
+ eg/q_eg | 2 +-
+ eg/q_test-ok.txt | 4 ++--
+ src/libqhull/libqhull.h | 2 +-
+ src/qhull/unix.c | 2 +-
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/eg/q_eg b/eg/q_eg
+index 4d8dd74..01c134e 100755
+--- a/eg/q_eg
++++ b/eg/q_eg
+@@ -66,7 +66,7 @@ rbox 10 r s Z1 G0.3 | qconvex FQ FV n | qhalf FQ s Fp | qconvex G >eg/eg.33c.con
+
+ echo ==the following should generate flipped and concave facets== >/dev/null
+ rbox 200 s | qhull Q0 s R0.014 Gav Po >eg/eg.21a.roundoff.errors
+-echo ==the preceeding should report flipped and concave facets== >/dev/null
++echo ==the preceding should report flipped and concave facets== >/dev/null
+
+
+
+diff --git a/eg/q_test-ok.txt b/eg/q_test-ok.txt
+index c9024ea..1906eea 100644
+--- a/eg/q_test-ok.txt
++++ b/eg/q_test-ok.txt
+@@ -789,7 +789,7 @@ precision problems (corrected unless 'Q0' or an error)
+ 3 flipped facets
+ 125 coplanar horizon facets for new vertices
+ 62 coplanar points during partitioning
+-echo ==the preceeding should report flipped and concave facets== >/dev/null
++echo ==the preceding should report flipped and concave facets== >/dev/null
+
+
+
+@@ -10634,7 +10634,7 @@ input (stdin):
+ other lines: point coordinates, best if one point per line
+ comments: start with a non-numeric character
+ halfspaces: use dim plus one and put offset after coefficients.
+- May be preceeded by a single interior point ('H').
++ May be preceded by a single interior point ('H').
+
+ options:
+ d - Delaunay triangulation by lifting points to a paraboloid
+diff --git a/src/libqhull/libqhull.h b/src/libqhull/libqhull.h
+index 7a13226..f2a1e2b 100644
+--- a/src/libqhull/libqhull.h
++++ b/src/libqhull/libqhull.h
+@@ -642,7 +642,7 @@ struct qhT {
+ previous facets do not have outside sets
+ NARROWhull: previous facets may have coplanar outside sets for qh_outcoplanar */
+ facetT *newfacet_list; /* list of new facets to end of facet_list */
+- facetT *visible_list; /* list of visible facets preceeding newfacet_list,
++ facetT *visible_list; /* list of visible facets preceding newfacet_list,
+ facet->visible set */
+ int num_visible; /* current number of visible facets */
+ unsigned tracefacet_id; /* set at init, then can print whenever */
+diff --git a/src/qhull/unix.c b/src/qhull/unix.c
+index 551c59a..63680bb 100644
+--- a/src/qhull/unix.c
++++ b/src/qhull/unix.c
+@@ -61,7 +61,7 @@ input (stdin):\n\
+ other lines: point coordinates, best if one point per line\n\
+ comments: start with a non-numeric character\n\
+ halfspaces: use dim plus one and put offset after coefficients.\n\
+- May be preceeded by a single interior point ('H').\n\
++ May be preceded by a single interior point ('H').\n\
+ \n\
+ options:\n\
+ d - Delaunay triangulation by lifting points to a paraboloid\n\
diff --git a/debian/patches/0005-QJN-not-a-macro.patch b/debian/patches/0005-QJN-not-a-macro.patch
new file mode 100644
index 0000000..18da09c
--- /dev/null
+++ b/debian/patches/0005-QJN-not-a-macro.patch
@@ -0,0 +1,26 @@
+From: "Barak A. Pearlmutter" <barak+git at cs.nuim.ie>
+Date: Thu, 6 Feb 2014 13:35:16 +0000
+Subject: QJN not a macro
+
+change line break to space to avoid this and consequent lost text
+
+manpage-has-errors-from-man
+usr/share/man/man1/qhull.1.gz 750: warning: macro `QJn'' not defined
+---
+ html/qhull.man | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/html/qhull.man b/html/qhull.man
+index 4ede521..733982e 100644
+--- a/html/qhull.man
++++ b/html/qhull.man
+@@ -746,8 +746,7 @@ not increase n beyond a certain value, and it stops after a certain number
+ of attempts [see user.h]. Option 'QJ'
+ selects a default value for n. The output will be simplicial. For
+ Delaunay triangulations, 'QJn' sets 'Qbb' to scale the last coordinate
+-(not if 'Qbk:n' or 'QBk:n' is set).
+-'QJn' is deprecated for Voronoi diagrams. See also 'Qt'.
++(not if 'Qbk:n' or 'QBk:n' is set). 'QJn' is deprecated for Voronoi diagrams. See also 'Qt'.
+ .TP
+ Qm
+ Only process points that would otherwise increase max_outside. Other
diff --git a/debian/patches/series b/debian/patches/series
index d10f049..2c2f7b2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
0001-debianize-test-failure-msg.patch
0002-format-string-security.patch
0003-QHpointer.patch
+0004-spelling.patch
+0005-QJN-not-a-macro.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/qhull.git
More information about the debian-science-commits
mailing list