[qhull] 10/28: forward port quilt patches

[Barak A. Pearlmutter]

This is an automated email from the git hooks/post-receive script.

bap pushed a commit to branch master
in repository qhull.

commit a00a1843a5ae335d1dbd8ed9b9d549bae6515b58
Author: Barak A. Pearlmutter <barak+git at cs.nuim.ie>
Date:   Tue Feb 4 22:01:26 2014 +0000

    forward port quilt patches
---
 debian/patches/0001-debianize-test-failure-msg.patch |  7 +++----
 debian/patches/0002-format-string-security.patch     |  7 +++----
 debian/patches/0003-QHpointer.patch                  | 17 ++++++++---------
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/debian/patches/0001-debianize-test-failure-msg.patch b/debian/patches/0001-debianize-test-failure-msg.patch
index 00aa150..729cf8a 100644
--- a/debian/patches/0001-debianize-test-failure-msg.patch
+++ b/debian/patches/0001-debianize-test-failure-msg.patch
@@ -4,11 +4,11 @@ Subject: debianize test failure msg
 
 Redirect users to the Debian BTS in the error message of rbox.
 ---
- src/libqhull/io.c |    5 +----
- 1 files changed, 1 insertions(+), 4 deletions(-)
+ src/libqhull/io.c | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
 
 diff --git a/src/libqhull/io.c b/src/libqhull/io.c
-index 520835b..9dcde52 100644
+index 09a0079..6601ffd 100644
 --- a/src/libqhull/io.c
 +++ b/src/libqhull/io.c
 @@ -3932,10 +3932,7 @@ qhull warning: instead of %d %d-dimensional points, input contains\n\
@@ -23,4 +23,3 @@ index 520835b..9dcde52 100644
  \n\
  Type 'qhull' for a short list of options.\n");
    }
--- 
diff --git a/debian/patches/0002-format-string-security.patch b/debian/patches/0002-format-string-security.patch
index 0f64bff..f114ff1 100644
--- a/debian/patches/0002-format-string-security.patch
+++ b/debian/patches/0002-format-string-security.patch
@@ -8,11 +8,11 @@ in fact no security issue.  However we will work around it anyway.
 
 Bug-Debian: http://bugs.debian.org/643461
 ---
- src/libqhull/io.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ src/libqhull/io.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/libqhull/io.c b/src/libqhull/io.c
-index 9dcde52..45ef7bc 100644
+index 6601ffd..fb1a7fd 100644
 --- a/src/libqhull/io.c
 +++ b/src/libqhull/io.c
 @@ -2238,7 +2238,7 @@ void qh_printfacet3math(FILE *fp, facetT *facet, qh_PRINT format, int notfirst)
@@ -24,4 +24,3 @@ index 9dcde52..45ef7bc 100644
  } /* printfacet3math */
  
  
--- 
diff --git a/debian/patches/0003-QHpointer.patch b/debian/patches/0003-QHpointer.patch
index d4a733c..517283a 100644
--- a/debian/patches/0003-QHpointer.patch
+++ b/debian/patches/0003-QHpointer.patch
@@ -4,20 +4,19 @@ Subject: QHpointer
 
 Access globals via a pointer to allocated memory.
 ---
- src/libqhull/user.h |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ src/libqhull/user.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/libqhull/user.h b/src/libqhull/user.h
-index 84e7b5f..7c50205 100644
+index a3322aa..e5063c7 100644
 --- a/src/libqhull/user.h
 +++ b/src/libqhull/user.h
-@@ -595,7 +595,7 @@ stop after qh_JOGGLEmaxretry attempts
-     user_eg.c for an example
- */
- #ifndef qh_QHpointer
+@@ -599,7 +599,7 @@ stop after qh_JOGGLEmaxretry attempts
+ #error QH6207 Qhull error: Use qh_QHpointer_dllimport instead of qh_dllimport with qh_QHpointer
+ #endif
+ #else
 -#define qh_QHpointer 0
 +#define qh_QHpointer 1
  #if qh_QHpointer_dllimport
- #error QH6234 Qhull error: qh_QHpointer must be defined when using qh_QHpointer_dllimport.
+ #error QH6234 Qhull error: Use qh_dllimport instead of qh_QHpointer_dllimport when qh_QHpointer is not defined
  #endif
--- 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/qhull.git