[qhull] 03/03: Imported Debian patch 2002.1-2
Barak A. Pearlmutter
barak+git at cs.nuim.ie
Thu Feb 6 14:03:25 UTC 2014
This is an automated email from the git hooks/post-receive script.
bap pushed a commit to annotated tag debian/2002.1-2
in repository qhull.
commit ea6c0a972590ac2da21baebc61d3b0d0a8e55d72
Merge: 4b328cd 57fbb55
Author: Barak Pearlmutter <bap at cs.unm.edu>
Date: Sat Sep 7 10:34:13 2002 -0600
Imported Debian patch 2002.1-2
Announce.txt | 27 ++--
COPYING.txt | 4 +-
File_id.diz => FILE_ID.DIZ | 2 +-
QHULL-GO.pif => Qhull-go.pif | Bin
README.txt | 112 ++++++++++-------
REGISTER.txt | 2 +-
debian/changelog | 12 ++
debian/copyright | 5 +-
eg/q_test | 12 +-
eg/q_test.bat | 2 +-
html/index.htm | 35 ++----
html/qconvex.htm | 14 ++-
html/qdelau_f.htm | 12 +-
html/qdelaun.htm | 14 ++-
html/qh-eg.htm | 9 +-
html/qh-faq.htm | 41 ++++---
html/qh-get.htm | 108 ++++++++++++++++
html/qh-home.htm | 80 +++++++-----
html/qh-impre.htm | 11 +-
html/qh-in.htm | 13 +-
html/qh-optc.htm | 9 +-
html/qh-optf.htm | 20 +--
html/qh-optg.htm | 9 +-
html/qh-opto.htm | 9 +-
html/qh-optp.htm | 9 +-
html/qh-optq.htm | 13 +-
html/qh-optt.htm | 9 +-
html/qh-quick.htm | 9 +-
html/qhalf.htm | 14 ++-
html/qhull.htm | 14 ++-
html/qhull.man | 18 ++-
html/qhull.txt | 56 ++++-----
html/qvoron_f.htm | 12 +-
html/qvoronoi.htm | 14 ++-
html/rbox.htm | 7 +-
src/Changes.txt | 44 ++++++-
src/{Mborland => MBorland} | 0
src/Make-config.sh | 285 +++++++++++++++++++++++++++++++++++++++++++
src/Makefile.bins | 4 +-
src/Makefile.txt | 5 +-
src/geom.c | 2 +-
src/geom.h | 2 +-
src/geom2.c | 2 +-
src/global.c | 189 ++++++++++++++--------------
src/index.htm | 11 +-
src/io.c | 17 +--
src/io.h | 2 +-
src/libso/Makefile | 2 +-
src/mem.c | 2 +-
src/mem.h | 2 +-
src/merge.c | 2 +-
src/merge.h | 2 +-
src/poly.c | 2 +-
src/poly.h | 2 +-
src/poly2.c | 2 +-
src/qconvex.c | 8 +-
src/qdelaun.c | 6 +-
src/qh-geom.htm | 9 +-
src/qh-globa.htm | 9 +-
src/qh-io.htm | 9 +-
src/qh-mem.htm | 9 +-
src/qh-merge.htm | 9 +-
src/qh-poly.htm | 9 +-
src/qh-qhull.htm | 10 +-
src/qh-set.htm | 9 +-
src/qh-stat.htm | 9 +-
src/qh-user.htm | 9 +-
src/qhalf.c | 4 +-
src/qhull.c | 4 +-
src/qhull.h | 176 ++++++++++++++------------
src/qhull_a.h | 2 +-
src/qhull_interface.cpp | 1 -
src/qset.c | 2 +-
src/qset.h | 2 +-
src/qvoronoi.c | 6 +-
src/stat.c | 2 +-
src/stat.h | 2 +-
src/unix.c | 36 ++----
src/user.c | 3 -
79 files changed, 1072 insertions(+), 589 deletions(-)
diff --cc debian/changelog
index 4e0f1b1,0000000..9bdc49e
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,31 -1,0 +1,43 @@@
++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/copyright
index 5c8f5c5,0000000..a27bb24
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,67 -1,0 +1,68 @@@
+This package was debianized by Barak Pearlmutter <bap at cs.unm.edu> on
+Sun, 24 Mar 2002 21:53:13 -0700.
+
+It was downloaded from
+
- http://www.geom.umn.edu/locate/qhull
- http://www.geom.umn.edu/software/qhull/qhull3.1.tgz
++ http://www.geom.umn.edu/software/download/qhull.html
++ http://www.geom.umn.edu/software/qhull/qhull2002.1.tgz
++ and renamed qhull_2002.1.orig.tar.gz
+
+Upstream Authors:
+
+ C. Bradford Barber <bradb at geom.umn.edu>
+ Hannu Huhdanpaa <hannu at geom.umn.edu>
+
+ 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
+
+ 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 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 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.
+
+ 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.
+
+ 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 geom.umn.edu; the authors may or may not act on them as
+ they desire.
diff --cc src/Makefile.bins
index 31e568a,0000000..6c9223a
mode 100644,000000..100644
--- a/src/Makefile.bins
+++ b/src/Makefile.bins
@@@ -1,27 -1,0 +1,27 @@@
+# -*- makefile -*-
+
+psrc = qconvex.c qhalf.c qvoronoi.c rbox.c user_eg.c user_eg2.c
+bins = $(psrc:.c=) qhull qdelaunay
+
+all: $(bins)
+
+CFLAGS += -Wall -O2 -g
- LOADLIBES += -lqhull
++LOADLIBES += -lqhull -lm
+LDFLAGS += -Llibso
+
+qhull: unix
+ cp -a unix qhull
+
+qdelaunay: qdelaun
+ cp -a qdelaun qdelaunay
+
+include ../Makefile.prefix
+
+install: $(bins)
+ -install --directory $(DESTDIR)$(bindir)
+ $(INSTALL_PROGRAM) $(bins) $(DESTDIR)$(bindir)
+
+clean:
- -rm -f $(bins) unix
++ -rm -f $(bins) unix qdelaun
+
+.PHONY: all install install-strip clean uninstall
diff --cc src/libso/Makefile
index 2a841f7,0000000..c588d7c
mode 100644,000000..100644
--- a/src/libso/Makefile
+++ b/src/libso/Makefile
@@@ -1,38 -1,0 +1,38 @@@
+l=qhull
+
+major=3
- minor=1
++minor=1.1
+
+shlib=lib$(l).so.$(major).$(minor)
+
+all: $(shlib) lib$(l).so.$(major) lib$(l).so
+
+VPATH=..
+
+include ../../Makefile.prefix
+include ../Makefile.libs.common
+
+# See the Linux GCC HOWTO section 6.4.2.2, "ELF shared libraries"
+
+CFLAGS += -fPIC
+LDFLAGS += --shared -Wl,-soname=lib$(l).so.$(major) -s
+
+$(shlib): $(ofiles)
+ $(CC) $(LDFLAGS) -o $@ $^ $(LOADLIBES)
+
+lib$(l).so.$(major):
+ ln -sf $(shlib) lib$(l).so.$(major)
+
+lib$(l).so:
+ ln -sf lib$(l).so.$(major) lib$(l).so
+
+clean::
+ -rm -f lib$(l).so{.$(major){.$(minor),},}
+
+install: $(shlib) lib$(l).so.$(major) lib$(l).so
+ -install --directory $(DESTDIR)$(libdir)
+ $(INSTALL_DATA) $(shlib) $(DESTDIR)$(libdir)/
+ cp -af lib$(l).so{.$(major),} $(DESTDIR)$(libdir)/
+
+uninstall:
+ -rm -f $(DESTDIR)$(libdir)/lib$(l).so{.$(major){,.$(minor)},}
diff --cc src/qdelaun.c
index 95f5255,0e49d9c..c6b3007
--- a/src/qdelaun.c
+++ b/src/qdelaun.c
@@@ -278,7 -278,7 +278,7 @@@ int main(int argc, char *argv[])
exit(qh_ERRnone);
}
if (argc > 1 && *argv[1] == '-' && !*(argv[1]+1)) {
- fprintf(stdout, qh_prompta, qh_version,
- fprintf(stdout, qh_prompta, qh_VERSION,
++ fprintf(stdout, qh_prompta, qh_version,
qh_promptb, qh_promptc, qh_promptd, qh_prompte);
exit(qh_ERRnone);
}
diff --cc src/qh-qhull.htm
index 2149331,5f20cb6..c328565
--- a/src/qh-qhull.htm
+++ b/src/qh-qhull.htm
@@@ -83,6 -83,7 +83,7 @@@ codes for indicating errors </li
<li><a href="unix.c#prompt">qh_prompt</a> version and long prompt for Qhull</li>
<li><a href="unix.c#prompt2">qh_prompt2</a> synopsis for Qhull</li>
<li><a href="unix.c#prompt3">qh_prompt3</a> concise prompt for Qhull</li>
-<li><a href="qhull.h#qh_VERSION">qh_VERSION</a> version stamp</li>
++<li><a href="qhull.h#qh_version">qh_version</a> version stamp</li>
</ul>
<h3><a href="qh-qhull.htm#TOC">�</a><a name="qmacro">qhull.h other
diff --cc src/qhull.c
index 99780c3,dc835bb..38ccd23
--- a/src/qhull.c
+++ b/src/qhull.c
@@@ -54,9 -54,6 +54,9 @@@
error if temporary sets exist
record end time
*/
+
- char qh_version[]= "version 3.1 2001/10/04"; /* used for error messages */
++char *qh_version = "2002.1 2002/8/20";
+
void qh_qhull (void) {
int numoutside;
diff --cc src/qhull.h
index 27fcaee,896ec1e..9cc6a7a
--- a/src/qhull.h
+++ b/src/qhull.h
@@@ -55,9 -53,29 +53,29 @@@
/*============ constants and basic types ====================*/
+ /*-<a href="qh-qhull.htm#TOC"
- >--------------------------------</a><a name="qh_VERSION">-</a>
++ >--------------------------------</a><a name="qh_version">-</a>
+
- qh_VERSION
++ qh_version
+ version string by year and date
+
+ the revision increases on code changes only
+
+ notes:
+ change date: Changes.txt, Announce.txt, README.txt, qhull.man
+ qhull-news.html, Eudora signatures,
+ change version: README.txt, qhull.html, file_id.diz, Makefile
+ change year: Copying.txt
+ check download size
+ recompile user_eg.c, rbox.c, qhull.c, qconvex.c, qdelaun.c qvoronoi.c, qhalf.c
+ make copy of qhull-news.html as qh-news.htm
+ */
+
-#define qh_VERSION "2002.1 2002/8/20"
++extern char *qh_version;
+
/*-<a href="qh-geom.htm#TOC"
>--------------------------------</a><a name="coordT">-</a>
-
+
coordT
coordinates and coefficients are stored as realT (i.e., double)
diff --cc src/qvoronoi.c
index 4176888,ebeb736..78a632f
--- a/src/qvoronoi.c
+++ b/src/qvoronoi.c
@@@ -273,7 -273,7 +273,7 @@@ int main(int argc, char *argv[])
exit(qh_ERRnone);
}
if (argc > 1 && *argv[1] == '-' && !*(argv[1]+1)) {
- fprintf(stdout, qh_prompta, qh_version,
- fprintf(stdout, qh_prompta, qh_VERSION,
++ fprintf(stdout, qh_prompta, qh_version,
qh_promptb, qh_promptc, qh_promptd, qh_prompte);
exit(qh_ERRnone);
}
diff --cc src/unix.c
index cee8f29,5ec5fea..7a1f06f
--- a/src/unix.c
+++ b/src/unix.c
@@@ -347,12 -335,12 +335,12 @@@ int main(int argc, char *argv[])
argc= ccommand(&argv);
#endif
- if ((argc == 1) && isatty( 0 /*stdin*/)) {
+ if ((argc == 1) && isatty( 0 /*stdin*/)) {
- fprintf(stdout, qh_prompt2, qh_VERSION);
+ fprintf(stdout, qh_prompt2, qh_version);
exit(qh_ERRnone);
}
if (argc > 1 && *argv[1] == '-' && !*(argv[1]+1)) {
- fprintf(stdout, qh_prompta, qh_version, qh_DEFAULTbox,
- fprintf(stdout, qh_prompta, qh_VERSION, qh_DEFAULTbox,
++ fprintf(stdout, qh_prompta, qh_version, qh_DEFAULTbox,
qh_promptb, qh_promptc, qh_promptd, qh_prompte);
exit(qh_ERRnone);
}
--
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