[qhull] 01/01: Imported Debian patch 2003.1-1
Barak A. Pearlmutter
barak+git at cs.nuim.ie
Thu Feb 6 14:03:26 UTC 2014
This is an automated email from the git hooks/post-receive script.
bap pushed a commit to annotated tag debian/2003.1-1
in repository qhull.
commit 0a4146b3ce7780eddd65d3a5f1755081a3077e73
Merge: 4b328cd 8d41314
Author: Rafael Laboissiere <rafael at debian.org>
Date: Sun Feb 1 01:14:13 2004 +0100
Imported Debian patch 2003.1-1
.cvsignore | 2 -
Announce.txt | 35 +-
COPYING.txt | 11 +-
File_id.diz | 6 +-
Makefile.am | 27 +
Makefile.in | 575 +
Makefile.prefix | 15 -
README.txt | 170 +-
REGISTER.txt | 8 +-
aclocal.m4 | 6742 ++++++++++++
config/Makefile-am-eg | 21 +
config/Makefile-am-html | 56 +
config/Makefile-am-main | 27 +
config/Makefile-am-src | 97 +
config/Makefile.am | 14 +
config/Makefile.in | 296 +
config/README | 19 +
config/bootstrap.sh | 26 +
config/config.guess | 1415 +++
config/config.sub | 1510 +++
config/configure.ac | 24 +
config/depcomp | 479 +
config/install-sh | 294 +
config/ltmain.sh | 6357 +++++++++++
config/missing | 336 +
config/mkinstalldirs | 111 +
configure | 20202 +++++++++++++++++++++++++++++++++++
configure.ac | 24 +
debian/.cvsignore | 7 -
debian/README.Debian | 29 +-
debian/TODO | 2 +
debian/changelog | 61 +
debian/control | 77 +-
debian/copyright | 75 +-
debian/install-src-html.sh | 62 +
debian/libqhull-dev.dirs | 2 -
debian/libqhull-dev.doc-base | 18 +-
debian/libqhull-dev.docs | 4 -
debian/libqhull-dev.files | 11 +-
debian/libqhull3.dirs | 1 -
debian/libqhull3.docs | 1 -
debian/libqhull3.files | 1 -
debian/libqhull5.files | 1 +
debian/manpage.in | 109 +
debian/patches/00list | 2 +
debian/patches/QHpointer.dpatch | 35 +
debian/patches/make-new-msg.dpatch | 40 +
debian/qhull-bin.dirs | 1 -
debian/qhull-bin.docs | 1 -
debian/qhull-bin.files | 8 +-
debian/qhull-bin.manpages | 2 -
debian/qhull-bin.undocumented | 4 -
debian/rules | 132 +-
debian/shlibs.local | 1 -
eg/Makefile.am | 21 +
eg/Makefile.in | 323 +
eg/q_eg | 0
eg/q_egtest | 2 +-
eg/q_test | 16 +-
eg/q_test.bat | 10 +-
html/Makefile.am | 56 +
html/Makefile.in | 413 +
html/index.htm | 144 +-
html/qconvex.htm | 46 +-
html/qdelau_f.htm | 52 +-
html/qdelaun.htm | 70 +-
html/qh-eg.htm | 34 +-
html/qh-faq.htm | 65 +-
html/qh-get.htm | 124 +
html/qh-home.htm | 197 -
html/qh-impre.htm | 61 +-
html/qh-in.htm | 93 +-
html/qh-optc.htm | 13 +-
html/qh-optf.htm | 96 +-
html/qh-optg.htm | 13 +-
html/qh-opto.htm | 13 +-
html/qh-optp.htm | 13 +-
html/qh-optq.htm | 25 +-
html/qh-optt.htm | 13 +-
html/qh-quick.htm | 41 +-
html/qhalf.htm | 60 +-
html/qhull.htm | 55 +-
html/qhull.man | 45 +-
html/qhull.txt | 93 +-
html/qvoron_f.htm | 22 +-
html/qvoronoi.htm | 26 +-
html/rbox.htm | 11 +-
html/rbox.man | 2 +-
html/rbox.txt | 4 +-
index.htm | 252 +
src/.cvsignore | 10 -
src/Changes.txt | 108 +-
src/Makefile | 16 -
src/Makefile.am | 97 +
src/Makefile.bins | 27 -
src/Makefile.in | 697 ++
src/Makefile.libs.common | 21 -
src/Makefile.txt | 6 +-
src/geom.c | 20 +-
src/geom.h | 2 +-
src/geom2.c | 4 +-
src/global.c | 218 +-
src/index.htm | 21 +-
src/io.c | 86 +-
src/io.h | 11 +-
src/liba/Makefile | 24 -
src/libso/.cvsignore | 2 -
src/libso/Makefile | 38 -
src/mem.c | 5 +-
src/mem.h | 4 +-
src/merge.c | 15 +-
src/merge.h | 5 +-
src/poly.c | 2 +-
src/poly.h | 3 +-
src/poly2.c | 77 +-
src/qconvex.c | 10 +-
src/qdelaun.c | 11 +-
src/qh-geom.htm | 13 +-
src/qh-globa.htm | 12 +-
src/qh-io.htm | 15 +-
src/qh-mem.htm | 11 +-
src/qh-merge.htm | 11 +-
src/qh-poly.htm | 15 +-
src/qh-qhull.htm | 12 +-
src/qh-set.htm | 11 +-
src/qh-stat.htm | 11 +-
src/qh-user.htm | 11 +-
src/qhalf.c | 9 +-
src/qhull.c | 4 +-
src/qhull.h | 162 +-
src/qhull_a.h | 2 +-
src/qhull_interface.cpp | 1 -
src/qset.c | 2 +-
src/qset.h | 2 +-
src/qvoronoi.c | 10 +-
src/stat.c | 8 +-
src/stat.h | 4 +-
src/unix.c | 43 +-
src/user.c | 5 +-
src/user_eg.c | 13 +-
src/user_eg2.c | 12 +-
141 files changed, 42567 insertions(+), 1482 deletions(-)
diff --cc debian/README.Debian
index 56af8ed,0000000..8ba1170
mode 100644,000000..100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@@ -1,11 -1,0 +1,30 @@@
+qhull for Debian
- ----------------
++================
+
- The library's functionality can be accessed from the command line
++Usage
++-----
++
++The library's functionality can be accessed from the command line
+using the executable "qhull". Random distributions of points can be
+drawn for testing and experimentation using "rbox".
+
- These executables are so small that they didn't seem worth their own
- package, so I just put them in with the library.
+
- -- Barak Pearlmutter <bap at cs.unm.edu>, Sun, 24 Mar 2002 21:53:13 -0700
++Registering
++-----------
++
++The upstream authors would like to find out how you are using their
++software. Look at /usr/share/doc/qhull/REGISTER.txt to know how to send
++them feedback.
++
++
++Documentation
++-------------
++
++Documentation in HTML format is available starting in the file
++/usr/share/doc/qhull/qh-man.htm. There are also some exemples in the
++directory /usr/share/doc/qhull/examples.
++
++
++
++ -- Rafael Laboissiere <rafael at debian.org>, Mon Dec 3 20:20:07 CET 2001
++
diff --cc debian/TODO
index c2f0724,0000000..912892f
mode 100644,000000..100644
--- a/debian/TODO
+++ b/debian/TODO
@@@ -1,12 -1,0 +1,14 @@@
++[This file was originally written by Barak Pearlmutter <bap at cs.unm.edu>]
++
+The random number generator in src/geom2.c makes me suspicious.
+Maybe it would be better to switch to random(3).
+
+The include files used in user code have lots of stuff in them that
+really only the library needs. These could be split out.
+
+Hook into that debian library-switches gizmo.
+
+Separate versions of all functions for various floating point
+precisions. Perhaps via multiple #include's.
+
+Convert executables to getopt and --help, and stop using isatty.
diff --cc debian/changelog
index 4e0f1b1,0000000..d2b75d1
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,31 -1,0 +1,92 @@@
++qhull (2003.1-1) unstable; urgency=low
++
++ * New upstream release. There are backward incompatibilities in the code
++ and the soversion was bumped to libqhull5.
++ * debian/rules:
++ - Major rewrite of build and install rules, since we are using now the
++ upstream tarball generated with "make dist".
++ - Added config rule.
++ - Use dpatch to patch src/user.h (enable qh_QHpointer).
++ * debian/control:
++ - Removed build-dependencies on autoconf, automake, and libtool.
++ - Build-depends on dpatch.
++ - Changed section of libqhull-dev package to libdevel.
++ * debian/libqhull-dev.files: Added usr/share/doc/libqhull5/src
++ directory.
++
++ -- Rafael Laboissiere <rafael at debian.org> Sun, 1 Feb 2004 01:14:13 +0100
++
++qhull (2002.1-4) unstable; urgency=low
++
++ * src/Make-config.sh: Patched upstream file for proper initialization of
++ the Autotools.
++ * debian/install-src-html.sh: Added script for including src/*.htm
++ source documentation files into html doc dir.
++ * debian/control:
++ - Bumped Standards-Version to 3.6.1 (no changes needed).
++ - Changed build-dependencies to autoconf and automake1.7 (instead of
++ autoconf2.13 and automake1.6). Added eperl.
++ * debian/libqhull-dev.files: Added dir usr/share/doc/libqhull4/src.
++ * debian/manpage.in: Added template for missing man pages.
++ * debian/rules:
++ - Call debian/install-src-html.sh.
++ - Generate manpages for qconvex, qdelaunay, qhalf, and qvoronoi
++ commands. Lintian is happy now.
++
++ -- Rafael Laboissiere <rafael at debian.org> Thu, 18 Dec 2003 21:20:14 +0100
++
++qhull (2002.1-3) unstable; urgency=low
++
++ * New maintainer (as per http://lists.debian.org/debian-devel/1999
++ /debian-devel-199911/msg01061.html).
++ * debian/rules: Use the upstream script Make-config.sh, which sets up
++ the autoconf/automake/libtool files. Also, clean up all the generated
++ files in the clean rule.
++ * debian/control: Bumped Standards-Version to 3.5.7. Added
++ Build-Dependencies to autoconf/automake/libtool.
++
++ -- Rafael Laboissiere <rafael at debian.org> Wed, 25 Sep 2002 10:39:30 +0200
++
++qhull (2002.1-2) unstable; urgency=low
++
++ * use shared char* qh_version in library
++
++ -- Barak Pearlmutter <bap at cs.unm.edu> Sat, 7 Sep 2002 10:34:13 -0600
++
++qhull (2002.1-1) unstable; urgency=low
++
++ * new upstream source
++
++ -- Barak Pearlmutter <bap at cs.unm.edu> Thu, 5 Sep 2002 20:51:10 -0600
++
+qhull (3.1-5) unstable; urgency=low
+
+ * rephrase descriptions (closes: #141027)
+
+ -- Barak Pearlmutter <bap at cs.unm.edu> Thu, 11 Apr 2002 22:12:33 -0600
+
+qhull (3.1-4) unstable; urgency=low
+
+ * include executables qconvex, qhalf, qvoronoi, qdelaunay
+ * break executables out into separate package qhull-bin
+
+ -- Barak Pearlmutter <bap at cs.unm.edu> Wed, 27 Mar 2002 20:26:44 -0700
+
+qhull (3.1-3) unstable; urgency=low
+
+ * rename executable qhull-rbox back to rbox
+
+ -- Barak Pearlmutter <bap at cs.unm.edu> Mon, 25 Mar 2002 09:13:57 -0700
+
+qhull (3.1-2) unstable; urgency=low
+
+ * src/qconvex.c did not belong in the library
+ * qh_version was multiply defined, now defined only in qhull.c
+
+ -- Barak Pearlmutter <bap at cs.unm.edu> Mon, 25 Mar 2002 08:55:45 -0700
+
+qhull (3.1-1) unstable; urgency=low
+
+ * Initial Release. (closes: #108115)
+
+ -- Barak Pearlmutter <bap at cs.unm.edu> Sun, 24 Mar 2002 21:53:13 -0700
diff --cc debian/control
index ec31daf,0000000..462bbe3
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,41 -1,0 +1,56 @@@
+Source: qhull
++Section: math
+Priority: optional
- Maintainer: Barak Pearlmutter <bap at cs.unm.edu>
- Build-Depends: debhelper (>> 3.0.0)
- Standards-Version: 3.5.2
-
- Package: libqhull-dev
- Section: devel
- Architecture: any
- Depends: libqhull3 (= ${Source-Version}), libc6-dev
- Description: Library for calculating convex hulls and related structures
- This library (development files) implements a practical convex hull
- algorithm that combines the two-dimensional Quickhull Algorithm with
- the general dimension Beneath-Beyond Algorithm. This algorithm is
- robust against floating point errors, often a problem for less
- sophisticated computational geometry algorithms. The library also
- performs related computations, such as Delaunay triangulation.
++Maintainer: Rafael Laboissiere <rafael at debian.org>
++Standards-Version: 3.6.1
++Build-Depends: debhelper (>= 4), docbook-utils, eperl, dpatch
+
- Package: libqhull3
++Package: libqhull5
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
- Description: Library for calculating convex hulls and related structures
- This library (runtime files) implements a practical convex hull
- algorithm that combines the two-dimensional Quickhull Algorithm with
- the general dimension Beneath-Beyond Algorithm. This algorithm is
- robust against floating point errors, often a problem for less
- sophisticated computational geometry algorithms. The library also
- performs related computations, such as Delaunay triangulation.
++Description: Calculate convex hulls and related structures (shared library)
++ Qhull computes convex hulls, Delaunay triangulations, halfspace
++ intersections about a point, Voronoi diagrams, furthest-site
++ Delaunay triangulations, and furthest-site Voronoi diagrams. It
++ runs in 2-d, 3-d, 4-d, and higher dimensions.
++ .
++ This package contain the shared C library.
++ .
++ Homepage: http://www.qhull.org
++
++Package: libqhull-dev
++Section: libdevel
++Architecture: any
++Depends: libqhull5 (= ${Source-Version}), libc6-dev
++Description: Calculate convex hulls and related structures (development files)
++ Qhull computes convex hulls, Delaunay triangulations, halfspace
++ intersections about a point, Voronoi diagrams, furthest-site
++ Delaunay triangulations, and furthest-site Voronoi diagrams. It
++ runs in 2-d, 3-d, 4-d, and higher dimensions.
++ .
++ This package contains the files necessary for development (headers and
++ libraries), as well as the library documentation in HTML format.
++ .
++ Homepage: http://www.qhull.org
+
+Package: qhull-bin
+Section: math
+Architecture: any
- Depends: ${shlibs:Depends}
- Description: Calculate convex hulls and related structures
- These executables use a practical convex hull algorithm that combines
- the two-dimensional Quickhull Algorithm with the general dimension
- Beneath-Beyond Algorithm. This algorithm is robust against floating
- point errors, often a problem for less sophisticated computational
- geometry algorithms. There are also programs that perform related
- computations, such as Delaunay triangulation.
++Depends: libqhull5 (= ${Source-Version})
++Suggests: geomview
++Description: Calculate convex hulls and related structures (utilities)
++ Qhull computes convex hulls, Delaunay triangulations, halfspace
++ intersections about a point, Voronoi diagrams, furthest-site
++ Delaunay triangulations, and furthest-site Voronoi diagrams. It
++ runs in 2-d, 3-d, 4-d, and higher dimensions.
++ .
++ This package contains the qhull executable that gives a pipe interface to
++ some of the functionality of the library. Also included is rbox is a
++ useful tool in generating input for Qhull; it generates hypercubes,
++ diamonds, cones, circles, simplices, spirals, lattices, and random points.
++ .
++ Qhull produces graphical output for Geomview. This helps with
++ understanding the output (http://www.geomview.org).
++ .
++ Homepage: http://www.qhull.org
diff --cc debian/copyright
index 5c8f5c5,0000000..03c6b3c
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,67 -1,0 +1,56 @@@
- This package was debianized by Barak Pearlmutter <bap at cs.unm.edu> on
- Sun, 24 Mar 2002 21:53:13 -0700.
++This package was debianized by Rafael Laboissiere <rafael at debian.org> on
++Mon Mar 1 00:28:18 CET 2004
+
- It was downloaded from
++It was downloaded from:
+
- http://www.geom.umn.edu/locate/qhull
- http://www.geom.umn.edu/software/qhull/qhull3.1.tgz
++ http://www.qhull.org/download/qhull-2003.1.tar.gz
+
+Upstream Authors:
+
- C. Bradford Barber <bradb at geom.umn.edu>
- Hannu Huhdanpaa <hannu at geom.umn.edu>
++ C. Bradford Barber <bradb at qhull.org>
++ Hannu Huhdanpaa <hannu at qhull.org>
+
+ c/o The Geometry Center
+ University of Minnesota
+ 400 Lind Hall
+ 207 Church Street S.E.
+ Minneapolis, MN 55455
+
+Copyright:
+
- In addition to the formal license, the authors ask a favor in
- http://www.geom.umn.edu/~bradb/qhull-news.html
-
- If you find Qhull helpful, please let me know about your
- application. Send e-mail to bradb at geom.umn.edu and I'll add you
- to the list below. If you publish a paper that mentions Qhull,
- please send a reference and abstract.
-
+ The formal license is in the source file COPYING.txt
+
- Qhull, Copyright (c) 1993-2001
++ Qhull, Copyright (c) 1993-2003
++
++ The National Science and Technology Research Center for
++ Computation and Visualization of Geometric Structures
++ (The Geometry Center)
++ University of Minnesota
+
- The National Science and Technology Research Center for
- Computation and Visualization of Geometric Structures
- (The Geometry Center)
- University of Minnesota
- 400 Lind Hall
- 207 Church Street S.E.
- Minneapolis, MN 55455 USA
++ email: qhull at qhull.org
+
- email: qhull at geom.umn.edu
++This software includes Qhull from The Geometry Center. Qhull is
++copyrighted as noted above. Qhull is free software and may be obtained
++via http from www.qhull.org. It may be freely copied, modified,
++and redistributed under the following conditions:
+
- This software includes Qhull from The Geometry Center. Qhull is
- copyrighted as noted above. Qhull is free software and may be obtained
- via anonymous ftp from geom.umn.edu. It may be freely copied, modified,
- and redistributed under the following conditions:
++1. All copyright notices must remain intact in all files.
+
- 1. All copyright notices must remain intact in all files.
++2. A copy of this text file must be distributed along with any copies
++ of Qhull that you redistribute; this includes copies that you have
++ modified, or copies of programs or other software products that
++ include Qhull.
+
- 2. A copy of this text file must be distributed along with any copies
- of Qhull that you redistribute; this includes copies that you have
- modified, or copies of programs or other software products that
- include Qhull.
++3. If you modify Qhull, you must include a notice giving the
++ name of the person performing the modification, the date of
++ modification, and the reason for such modification.
+
- 3. If you modify Qhull, you must include a notice giving the
- name of the person performing the modification, the date of
- modification, and the reason for such modification.
++4. When distributing modified versions of Qhull, or other software
++ products that include Qhull, you must provide notice that the original
++ source code may be obtained as noted above.
+
- 4. When distributing modified versions of Qhull, or other software
- products that include Qhull, you must provide notice that the original
- source code may be obtained as noted above.
++5. There is no warranty or other guarantee of fitness for Qhull, it is
++ provided solely "as is". Bug reports or fixes may be sent to
++ qhull_bug at qhull.org; the authors may or may not act on them as
++ they desire.
+
- 5. There is no warranty or other guarantee of fitness for Qhull, it is
- provided solely "as is". Bug reports or fixes may be sent to
- qhull_bug at geom.umn.edu; the authors may or may not act on them as
- they desire.
diff --cc debian/install-src-html.sh
index 0000000,0000000..1633c7d
new file mode 100644
--- /dev/null
+++ b/debian/install-src-html.sh
@@@ -1,0 -1,0 +1,62 @@@
++#!/bin/sh
++
++html=htm
++dir=$1
++mkdir -p $1
++src= \
++
++for i in geom.h \
++ mem.h \
++ merge.h \
++ poly.h \
++ io.h \
++ qhull_a.h \
++ qhull.h \
++ qset.h \
++ stat.h \
++ user.h \
++ geom2.c \
++ geom.c \
++ global.c \
++ io.c \
++ mem.c \
++ merge.c \
++ poly2.c \
++ poly.c \
++ qconvex.c \
++ qdelaun.c \
++ qhalf.c \
++ qhull.c \
++ qset.c \
++ qvoronoi.c \
++ stat.c \
++ unix.c \
++ user.c \
++ user_eg.c ; do
++
++ cp src/$i $dir/$i.$html
++ perl -pi -e 'BEGIN{$f=1} if ($f) {s:^/\*::; $f=0}' $dir/$i.$html
++
++done
++
++for i in index.htm \
++ qh-geom.htm \
++ qh-globa.htm \
++ qh-io.htm \
++ qh-mem.htm \
++ qh-merge.htm \
++ qh-poly.htm \
++ qh-qhull.htm \
++ qh-set.htm \
++ qh-stat.htm \
++ qh-user.htm ; do
++
++ cp src/$i $dir
++
++done
++
++for i in $dir/*.htm ; do
++
++ perl -pi -e 's/(href="[a-z2_]+.)(c|h)/$1$2.'$html'/' $i
++
++done
diff --cc debian/libqhull-dev.doc-base
index 7f697d7,0000000..cbd01a3
mode 100644,000000..100644
--- a/debian/libqhull-dev.doc-base
+++ b/debian/libqhull-dev.doc-base
@@@ -1,9 -1,0 +1,13 @@@
- Document: libqhull
- Title: Debian QHULL Manual
- Author: Brad Barber <qhull at geom.umn.edu>
- Abstract: This manual describes the qhull convex hull library
- Section: devel
++Document: qhull
++Title: QHull Manual
++Author: C. Bradford Barber
++Abstract: This manual describes Qhull, a general dimension convex hull
++ program that reads a set of points from stdin, and outputs the smallest
++ convex set that contains the points to stdout. It also generates Delaunay
++ triangulations, Voronoi diagrams, furthest-site Voronoi diagrams, and
++ halfspace intersections about a point.
++Section: math
+
+Format: HTML
- Index: /usr/share/doc/libqhull-dev/html/index.htm
- Files: /usr/share/doc/libqhull-dev/html/*.htm
++Index: /usr/share/doc/libqhull5/html/qh-man.htm
++Files: /usr/share/doc/libqhull5/html/*.htm
diff --cc debian/libqhull-dev.files
index d1bffed,0000000..71158c4
mode 100644,000000..100644
--- a/debian/libqhull-dev.files
+++ b/debian/libqhull-dev.files
@@@ -1,3 -1,0 +1,8 @@@
- usr/include/*
- usr/lib/lib*.a
- usr/lib/lib*.so
++usr/lib/libqhull.a
++usr/lib/libqhull.la
++usr/lib/libqhull.so
++usr/include
++usr/share/doc/libqhull5/examples
++usr/share/doc/libqhull5/*htm*
++usr/share/doc/libqhull5/src
++usr/share/doc/libqhull5/*.txt
diff --cc debian/libqhull5.files
index 0000000,0000000..73752c9
new file mode 100644
--- /dev/null
+++ b/debian/libqhull5.files
@@@ -1,0 -1,0 +1,1 @@@
++usr
diff --cc debian/manpage.in
index 0000000,0000000..bb5155e
new file mode 100644
--- /dev/null
+++ b/debian/manpage.in
@@@ -1,0 -1,0 +1,109 @@@
++<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
++
++<!-- Process this file with docbook-to-man to generate an nroff manual
++ page: `docbook-to-man manpage.sgml > manpage.1'. You may view
++ the manual page with: `docbook-to-man manpage.sgml | nroff -man |
++ less'. A typical entry in a Makefile or Makefile.am is:
++
++manpage.1: manpage.sgml
++ docbook-to-man $< > $@
++
++
++ The docbook-to-man binary is found in the docbook-to-man package.
++ Please remember that if you create the nroff version in one of the
++ debian/rules file targets (such as build), you will need to include
++ docbook-to-man in your Build-Depends control field.
++
++ -->
++
++ <!-- Fill in your name for FIRSTNAME and SURNAME. -->
++ <!ENTITY dhfirstname "<firstname>Rafael</firstname>">
++ <!ENTITY dhsurname "<surname>Laboissiere</surname>">
++ <!-- Please adjust the date whenever revising the manpage. -->
++ <!ENTITY dhdate "<date>2004-02-06</date>">
++ <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
++ allowed: see man(7), man(1). -->
++ <!ENTITY dhsection "<manvolnum>1</manvolnum>">
++ <!ENTITY dhemail "<email>rafael at debian.org</email>">
++ <!ENTITY dhusername "Rafael Laboissiere">
++ <!ENTITY dhucpackage "<refentrytitle><:=$command:></refentrytitle>">
++ <!ENTITY dhpackage "<:=$command:>">
++
++ <!ENTITY debian "<productname>Debian</productname>">
++ <!ENTITY gnu "<acronym>GNU</acronym>">
++ <!ENTITY gpl "&gnu; <acronym>GPL</acronym>">
++]>
++
++<refentry>
++ <refentryinfo>
++ <address>
++ &dhemail;
++ </address>
++ <author>
++ &dhfirstname;
++ &dhsurname;
++ </author>
++ <copyright>
++ <year>2003</year>
++ <holder>&dhusername;</holder>
++ </copyright>
++ &dhdate;
++ </refentryinfo>
++ <refmeta>
++ &dhucpackage;
++
++ &dhsection;
++ </refmeta>
++ <refnamediv>
++ <refname>&dhpackage;</refname>
++
++ <refpurpose><:=$purpose:></refpurpose>
++ </refnamediv>
++ <refsynopsisdiv>
++ <cmdsynopsis>
++ <command>&dhpackage;</command>
++ <arg><option><replaceable>options</replaceable></option></arg>
++ </cmdsynopsis>
++ </refsynopsisdiv>
++ <refsect1>
++ <title>DESCRIPTION</title>
++
++ <para>
++ This manual page was written for the &debian; distribution
++ because the original program does not have a manual page.
++ </para>
++
++ <para>
++ This program is documented fully in <ulink
++ url="file:///usr/share/doc/<:=$soname:>/html/<:=$command:>.htm">HTML
++ format</ulink>, available in the <:=$soname:>-dev package.
++ </refsect1>
++ <refsect1>
++ <title>AUTHOR</title>
++
++ <para>
++ This manual page was written by &dhusername; &dhemail; for the
++ &debian; system (but may be used by others withouth any
++ restrictions).
++
++ </refsect1>
++</refentry>
++
++<!-- Keep this comment at the end of the file
++Local variables:
++mode: sgml
++sgml-omittag:t
++sgml-shorttag:t
++sgml-minimize-attributes:nil
++sgml-always-quote-attributes:t
++sgml-indent-step:2
++sgml-indent-data:t
++sgml-parent-document:nil
++sgml-default-dtd-file:nil
++sgml-exposed-tags:nil
++sgml-local-catalogs:nil
++sgml-local-ecat-files:nil
++End:
++-->
++
++
diff --cc debian/patches/00list
index 0000000,0000000..895e714
new file mode 100644
--- /dev/null
+++ b/debian/patches/00list
@@@ -1,0 -1,0 +1,2 @@@
++QHpointer.dpatch
++make-new-msg.dpatch
diff --cc debian/patches/QHpointer.dpatch
index 0000000,0000000..16f04f5
new file mode 100644
--- /dev/null
+++ b/debian/patches/QHpointer.dpatch
@@@ -1,0 -1,0 +1,35 @@@
++#! /bin/sh -e
++## QHpointer.dpatch by Rafael Laboissiere <rafael at debian.org>
++##
++## All lines beginning with `## DP:' are a description of the patch.
++## DP: Access Qhull globals via a pointer to allocated memory
++
++[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
++patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
++
++if [ $# -ne 1 ]; then
++ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
++ exit 1
++fi
++case "$1" in
++ -patch)
++ patch $patch_opts -p1 < $0;;
++ -unpatch)
++ patch $patch_opts -p1 -R < $0;;
++ *)
++ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
++ exit 1;;
++esac
++
++exit 0
++--- qhull-orig/src/user.h 2002-04-29 11:01:46.000000000 +0200
+++++ qhull/src/user.h 2004-02-02 11:04:47.000000000 +0100
++@@ -509,7 +509,7 @@
++ see:
++ user_eg.c for an example
++ */
++-#define qh_QHpointer 0
+++#define qh_QHpointer 1
++ #if 0 /* sample code */
++ qhT *oldqhA, *oldqhB;
++
diff --cc debian/patches/make-new-msg.dpatch
index 0000000,0000000..8cb77cc
new file mode 100644
--- /dev/null
+++ b/debian/patches/make-new-msg.dpatch
@@@ -1,0 -1,0 +1,40 @@@
++#! /bin/sh -e
++## QHpointer.dpatch by Rafael Laboissiere <rafael at debian.org>
++##
++## All lines beginning with `## DP:' are a description of the patch.
++## DP: Access Qhull globals via a pointer to allocated memory
++
++[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
++patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
++
++if [ $# -ne 1 ]; then
++ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
++ exit 1
++fi
++case "$1" in
++ -patch)
++ patch $patch_opts -p1 < $0;;
++ -unpatch)
++ patch $patch_opts -p1 -R < $0;;
++ *)
++ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
++ exit 1;;
++esac
++
++exit 0
++--- qhull-orig/src/io.c 2004-01-31 12:00:15.000000000 +0100
+++++ qhull/src/io.c 2004-02-06 09:54:18.000000000 +0100
++@@ -4017,11 +4017,8 @@
++ qh rbox_command[strlen(qh rbox_command)-1]= '\0';
++ if (!strcmp (qh rbox_command, "./rbox D4"))
++ fprintf (qh ferr, "\n\
++-This is the qhull test case. If any errors or core dumps occur,\n\
++-recompile qhull with 'make new'. If errors still occur, there is\n\
++-an incompatibility. You should try a different compiler. You can also\n\
++-change the choices in user.h. If you discover the source of the problem,\n\
++-please send mail to qhull_bug at qhull.org.\n\
+++This is the qhull test case. If any errors or core dumps occur,\n\
+++fill a bug report against the libqhull<soversion> Debian package.\n\
++ \n\
++ Type 'qhull' for a short list of options.\n");
++ }
diff --cc debian/qhull-bin.files
index c0fabda,0000000..a65408f
mode 100644,000000..100644
--- a/debian/qhull-bin.files
+++ b/debian/qhull-bin.files
@@@ -1,6 -1,0 +1,2 @@@
- usr/bin/qhull
- usr/bin/rbox
- usr/bin/qconvex
- usr/bin/qhalf
- usr/bin/qvoronoi
- usr/bin/qdelaunay
++usr/bin
++usr/share/man
diff --cc debian/rules
index 0310d55,0000000..1bee78b
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,98 -1,0 +1,104 @@@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
- # Uncomment this to turn on verbose mode.
- #export DH_VERBOSE=1
-
+# This is the debhelper compatibility version to use.
- export DH_COMPAT=3
-
- # These are used for cross-compiling and for saving the configure script
- # from having to guess our platform (since we know it already)
- DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
- DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-
- ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -g
- endif
- ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
- endif
-
- # shared library versions, option 1
- version=2.0.5
- major=2
- # option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
- #version=`ls src/.libs/lib*.so.* | \
- # awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
- #major=`ls src/.libs/lib*.so.* | \
- # awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
-
- configure: configure-stamp
- configure-stamp:
++export DH_COMPAT=4
++
++PACKAGE := qhull
++
++soversion := 5
++soname := libqhull$(soversion)
++instdir := debian/$(soname)
++destdir := $(shell pwd)/debian/tmp
++debdoc := $(destdir)/usr/share/doc
++debdoclib := $(destdir)/usr/share/doc/$(soname)
++
++include /usr/share/dpatch/dpatch.make
++
++config: config-stamp
++config-stamp:
+ dh_testdir
- # Add here commands to configure the package.
- touch configure-stamp
++ ./configure --prefix=/usr --mandir=/usr/share/man
++ touch config-stamp
+
+build: build-stamp
- build-stamp: configure-stamp
++build-stamp: patch config
+ dh_testdir
- # Add here commands to compile the package.
- $(MAKE) -Csrc prefix=/usr
++
++ $(MAKE)
++
++ ( cd debian ; \
++ for info in "qconvex:compute the convex hull" \
++ "qdelaunay:compute the Delaunay triangulation" \
++ "qhalf:halfspace intersection about a point" \
++ "qvoronoi:compute the Voronoi diagram" ; do \
++ comm=`echo $$info | cut -d: -f1` ; \
++ purp=`echo $$info | cut -d: -f2` ; \
++ eperl -d command=$$comm -d purpose="$$purp" -d soname=$(soname) \
++ manpage.in > $$comm.sgml ; \
++ docbook2man $$comm.sgml ; \
++ done )
++
+ touch build-stamp
+
- clean:
++clean: unpatch
+ dh_testdir
- rm -f build-stamp configure-stamp
- # Add here commands to clean up after the build process.
- -$(MAKE) -Csrc clean
++ dh_testroot
++
++ -$(MAKE) distclean
++ ( cd debian ; rm -rf *.sgml *.1 manpage.links manpage.refs )
++
++ rm -f install-stamp build-stamp config-stamp patch-stamp
++
+ dh_clean
+
- install: build
++install: install-stamp
++install-stamp: build
+ dh_testdir
++ dh_testroot
+ dh_clean -k
+ dh_installdirs
- # Add here commands to install the package into debian/tmp
- $(MAKE) -Csrc install DESTDIR=$(CURDIR)/debian/tmp prefix=/usr
- -mkdir -p debian/tmp/usr/doc/html
- cp -a html/*.htm html/*.gif debian/tmp/usr/doc/html/
++
++ $(MAKE) install DESTDIR=$(destdir)
++ rm -f $(debdoc)/qhull/COPYING.txt
++ mv $(debdoc)/qhull/Changes.txt $(debdoc)/qhull/changelog
++
++ mv $(debdoc)/qhull $(debdoclib)
++ for i in libqhull-dev qhull-bin ; do \
++ mkdir -p debian/$$i/usr/share/doc ; \
++ ln -s $(soname) debian/$$i/usr/share/doc/$$i ; \
++ done
++
++ chmod +x debian/install-src-html.sh
++ debian/install-src-html.sh $(debdoclib)/src
++
++ dh_movefiles --no-package=$(soname)
++ dh_movefiles --package=$(soname)
++
++ dh_installman --package=qhull-bin debian/*.1
++
++ touch install-stamp
+
+# Build architecture-independent files here.
- binary-indep: build install
- # We have nothing to do by default.
++binary-indep:
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
- dh_movefiles
- # dh_installdebconf
- dh_installdocs
- dh_installexamples
- dh_installmenu
- # dh_installlogrotate
- # dh_installemacsen
- # dh_installpam
- # dh_installmime
- # dh_installinit
- dh_installcron
- dh_installman
- dh_installinfo
- dh_undocumented
- dh_installchangelogs
- dh_link
++ dh_installdocs -p$(soname) debian/copyright
++ dh_installchangelogs -p$(soname)
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_makeshlibs
+ dh_installdeb
- # dh_perl
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
- .PHONY: build clean binary-indep binary-arch binary install configure
++.PHONY: build clean binary-indep binary-arch binary install config \
++ patch unpatch
--
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