[qhull] 05/28: update/modify debian packaging for dh8 and current upstream
Barak A. Pearlmutter
barak+git at cs.nuim.ie
Thu Feb 6 14:06:25 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 4276516f5e2a906b90168f9ae1fdb1007dfd57c6
Author: Barak A. Pearlmutter <barak+git at cs.nuim.ie>
Date: Sun Dec 4 14:10:20 2011 +0000
update/modify debian packaging for dh8 and current upstream
Switch to dh8 in debian/rules; flush cdbs.
Various simplifications allowed by dh8.
Move all dev docs to -doc; remove contrary stanza in README.Debian.
Update many paths according to upstream changes.
Port quilt patches to new upstream.
Swizzle uploader in debian/control.
Update symbols file.
Activate single-debian-patch source option; see git for patch breakdown.
Gentler preinst /usr/share/doc/libqhull-dev symlink excision, and add
preinst to similarly excise any /usr/share/doc/qhull-bin symlink.
---
debian/README.Debian | 16 ++----
debian/TODO | 6 +--
debian/compat | 2 +-
debian/control | 6 +--
debian/libqhull-dev.examples | 1 -
debian/libqhull-dev.files | 7 ---
debian/libqhull-dev.install | 4 +-
debian/libqhull-dev.preinst | 16 ++----
debian/libqhull-doc.docs | 1 +
debian/libqhull-doc.examples | 1 +
debian/libqhull-doc.lintian-overrides | 4 --
debian/libqhull5.files | 1 -
debian/libqhull5.symbols | 26 ++++++++++
debian/{libqhull-dev.preinst => qhull-bin.preinst} | 16 ++----
debian/rules | 59 ++++++++++------------
debian/source/local-options | 1 +
16 files changed, 76 insertions(+), 91 deletions(-)
diff --git a/debian/README.Debian b/debian/README.Debian
index 55dc41b..667cb6f 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -13,18 +13,8 @@ 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.
+software. Look at /usr/share/doc/qhull/REGISTER.txt to see how to
+send them feedback.
-Documentation
--------------
-
-Documentation in HTML format is available starting in the file
-/usr/share/doc/libqhull-dev/qh-man.htm. There are also some examples
-in the directory /usr/share/doc/libqhull-dev/examples. Note that
-these files are available in the libqhull-dev package.
-
-
- -- Rafael Laboissiere <rafael at debian.org>, Sat, 19 Apr 2008 19:46:22 +0200
-
+ -- Barak A. Pearlmutter <bap at debian.org>, Sun, 4 Dec 2011 20:01:06 +0000
diff --git a/debian/TODO b/debian/TODO
index 912892f..c51cf80 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -1,13 +1,9 @@
-[This file was originally written by Barak Pearlmutter <bap at cs.unm.edu>]
-
-The random number generator in src/geom2.c makes me suspicious.
+The random number generator in src/libqhull/random.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.
diff --git a/debian/compat b/debian/compat
index 7f8f011..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+8
diff --git a/debian/control b/debian/control
index b29c4de..9a57c07 100644
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,10 @@ Source: qhull
Section: math
Priority: optional
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
-Uploaders: Rafael Laboissiere <rafael at debian.org>
+Uploaders: Barak A. Pearlmutter <bap at debian.org>
Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 7.0.0), docbook2x (>= 0.8.8-3), xsltproc,
- cdbs, docbook-xml, autotools-dev
+Build-Depends: debhelper (>= 8), dh-autoreconf,
+ docbook2x (>= 0.8.8-3), xsltproc, docbook-xml
Homepage: http://www.qhull.org
Vcs-Git: git://anonscm.debian.org/debian-science/packages/qhull.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/qhull.git
diff --git a/debian/libqhull-dev.examples b/debian/libqhull-dev.examples
deleted file mode 100644
index e718002..0000000
--- a/debian/libqhull-dev.examples
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/share/doc/qhull/examples/*
diff --git a/debian/libqhull-dev.files b/debian/libqhull-dev.files
deleted file mode 100644
index 80daadc..0000000
--- a/debian/libqhull-dev.files
+++ /dev/null
@@ -1,7 +0,0 @@
-usr/lib/libqhull.a
-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 --git a/debian/libqhull-dev.install b/debian/libqhull-dev.install
index 5bca52d..a0a5a09 100644
--- a/debian/libqhull-dev.install
+++ b/debian/libqhull-dev.install
@@ -1,3 +1,3 @@
-usr/lib/libqhull.so
usr/lib/libqhull.a
-usr/include/qhull
+usr/lib/libqhull.so
+usr/include
diff --git a/debian/libqhull-dev.preinst b/debian/libqhull-dev.preinst
old mode 100644
new mode 100755
index 077c62f..6a61be2
--- a/debian/libqhull-dev.preinst
+++ b/debian/libqhull-dev.preinst
@@ -1,27 +1,21 @@
#!/bin/sh
-# preinst script for libqhull-dev
set -e
case "$1" in
install|upgrade)
- if test -L /usr/share/doc/libqhull-dev ; then
- rm -rf /usr/share/doc/libqhull-dev
+ if test -L /usr/share/doc/libqhull-dev; then
+ rm -f /usr/share/doc/libqhull-dev
fi
-
- ;;
+ ;;
abort-upgrade)
- ;;
+ ;;
*)
echo "preinst called with unknown argument \`$1'" >&2
exit 1
- ;;
+ ;;
esac
#DEBHELPER#
-
-exit 0
-
-
diff --git a/debian/libqhull-doc.docs b/debian/libqhull-doc.docs
index 660a815..d52b779 100644
--- a/debian/libqhull-doc.docs
+++ b/debian/libqhull-doc.docs
@@ -1 +1,2 @@
debian/tmp/usr/share/doc/qhull/html
+debian/tmp/usr/share/doc/qhull/*.htm
diff --git a/debian/libqhull-doc.examples b/debian/libqhull-doc.examples
new file mode 100644
index 0000000..31907a5
--- /dev/null
+++ b/debian/libqhull-doc.examples
@@ -0,0 +1 @@
+usr/share/doc/qhull/examples/*
diff --git a/debian/libqhull-doc.lintian-overrides b/debian/libqhull-doc.lintian-overrides
deleted file mode 100644
index 17493e0..0000000
--- a/debian/libqhull-doc.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-# The COPYING.txt file is necessary for browsing the documentation
-# in HTML form
-
-libqhull-doc: extra-license-file usr/share/doc/libqhull-doc/html/COPYING.txt
diff --git a/debian/libqhull5.files b/debian/libqhull5.files
deleted file mode 100644
index 73752c9..0000000
--- a/debian/libqhull5.files
+++ /dev/null
@@ -1 +0,0 @@
-usr
diff --git a/debian/libqhull5.symbols b/debian/libqhull5.symbols
index d8cf461..285510b 100644
--- a/debian/libqhull5.symbols
+++ b/debian/libqhull5.symbols
@@ -1,6 +1,9 @@
libqhull.so.5 libqhull5 #MINVER#
dfacet at Base 2003.1
dvertex at Base 2003.1
+ out1 at Base 2011.2
+ out2n at Base 2011.2
+ out3n at Base 2011.2
qh_addhash at Base 2003.1
qh_addpoint at Base 2003.1
qh_all_merges at Base 2003.1
@@ -19,6 +22,8 @@ libqhull.so.5 libqhull5 #MINVER#
qh_appendmergeset at Base 2003.1
qh_appendprint at Base 2003.1
qh_appendvertex at Base 2003.1
+ qh_argv_to_command at Base 2011.2
+ qh_argv_to_command_size at Base 2011.2
qh_attachnewfacets at Base 2003.1
qh_backnormal at Base 2003.1
qh_basevertices at Base 2003.1
@@ -39,6 +44,7 @@ libqhull.so.5 libqhull5 #MINVER#
qh_checkpolygon at Base 2003.1
qh_checkvertex at Base 2003.1
qh_checkzero at Base 2003.1
+ qh_clear_outputflags at Base 2011.2
qh_clearcenters at Base 2003.1
qh_clock at Base 2003.1
qh_collectstatistics at Base 2003.1
@@ -49,6 +55,7 @@ libqhull.so.5 libqhull5 #MINVER#
qh_compareangle at Base 2003.1
qh_comparemerge at Base 2003.1
qh_comparevisit at Base 2003.1
+ qh_copyfilename at Base 2011.2
qh_copynonconvex at Base 2003.1
qh_copypoints at Base 2003.1
qh_countfacets at Base 2003.1
@@ -75,7 +82,9 @@ libqhull.so.5 libqhull5 #MINVER#
qh_eachvoronoi_all at Base 2003.1
qh_errexit2 at Base 2003.1
qh_errexit at Base 2003.1
+ qh_errexit_rbox at Base 2011.2
qh_errprint at Base 2003.1
+ qh_exit at Base 2011.2
qh_facet2point at Base 2003.1
qh_facet3vertex at Base 2003.1
qh_facetarea at Base 2003.1
@@ -98,8 +107,12 @@ libqhull.so.5 libqhull5 #MINVER#
qh_findhorizon at Base 2003.1
qh_flippedmerges at Base 2003.1
qh_forcedmerges at Base 2003.1
+ qh_fprintf at Base 2011.2
+ qh_fprintf_rbox at Base 2011.2
+ qh_free at Base 2011.2
qh_freebuffers at Base 2003.1
qh_freebuild at Base 2003.1
+ qh_freeqhull2 at Base 2011.2
qh_freeqhull at Base 2003.1
qh_freestatistics at Base 2003.1
qh_furthestnext at Base 2003.1
@@ -128,6 +141,8 @@ libqhull.so.5 libqhull5 #MINVER#
qh_initqhull_buffers at Base 2003.1
qh_initqhull_globals at Base 2003.1
qh_initqhull_mem at Base 2003.1
+ qh_initqhull_outputflags at Base 2011.2
+ qh_initqhull_start2 at Base 2011.2
qh_initqhull_start at Base 2003.1
qh_initstatistics at Base 2003.1
qh_initthresholds at Base 2003.1
@@ -140,6 +155,7 @@ libqhull.so.5 libqhull5 #MINVER#
qh_makenewfacets at Base 2003.1
qh_makenewplanes at Base 2003.1
qh_makeridges at Base 2003.1
+ qh_malloc at Base 2011.2
qh_mark_dupridges at Base 2003.1
qh_markkeep at Base 2003.1
qh_markvoronoi at Base 2003.1
@@ -160,6 +176,7 @@ libqhull.so.5 libqhull5 #MINVER#
qh_memsetup at Base 2003.1
qh_memsize at Base 2003.1
qh_memstatistics at Base 2003.1
+ qh_memtotal at Base 2011.2
qh_merge_degenredundant at Base 2003.1
qh_merge_nonconvex at Base 2003.1
qh_mergecycle at Base 2003.1
@@ -211,6 +228,7 @@ libqhull.so.5 libqhull5 #MINVER#
qh_postmerge at Base 2003.1
qh_precision at Base 2003.1
qh_premerge at Base 2003.1
+ qh_prepare_output at Base 2011.2
qh_prependfacet at Base 2003.1
qh_printafacet at Base 2003.1
qh_printallstatistics at Base 2003.1
@@ -241,6 +259,7 @@ libqhull.so.5 libqhull5 #MINVER#
qh_printfacets at Base 2003.1
qh_printhashtable at Base 2003.1
qh_printhelp_degenerate at Base 2003.1
+ qh_printhelp_narrowhull at Base 2011.2
qh_printhelp_singular at Base 2003.1
qh_printhyperplaneintersection at Base 2003.1
qh_printline3geom at Base 2003.1
@@ -269,6 +288,7 @@ libqhull.so.5 libqhull5 #MINVER#
qh_printvnorm at Base 2003.1
qh_printvoronoi at Base 2003.1
qh_printvridge at Base 2003.1
+ qh_produce_output2 at Base 2011.2
qh_produce_output at Base 2003.1
qh_projectdim3 at Base 2003.1
qh_projectinput at Base 2003.1
@@ -281,6 +301,7 @@ libqhull.so.5 libqhull5 #MINVER#
qh_rand_seed at Base 2003.1
qh_randomfactor at Base 2003.1
qh_randommatrix at Base 2003.1
+ qh_rboxpoints at Base 2011.2
qh_readfeasible at Base 2003.1
qh_readpoints at Base 2003.1
qh_reducevertices at Base 2003.1
@@ -346,6 +367,7 @@ libqhull.so.5 libqhull5 #MINVER#
qh_setzero at Base 2003.1
qh_sharpnewfacets at Base 2003.1
qh_skipfacet at Base 2003.1
+ qh_skipfilename at Base 2011.2
qh_srand at Base 2003.1
qh_stddev at Base 2003.1
qh_strtod at Base 2003.1
@@ -372,3 +394,7 @@ libqhull.so.5 libqhull5 #MINVER#
qh_voronoi_center at Base 2003.1
qh_willdelete at Base 2003.1
qhmem at Base 2003.1
+ qhull_inuse at Base 2011.2
+ rbox at Base 2011.2
+ rbox_inuse at Base 2011.2
+ roundi at Base 2011.2
diff --git a/debian/libqhull-dev.preinst b/debian/qhull-bin.preinst
old mode 100644
new mode 100755
similarity index 55%
copy from debian/libqhull-dev.preinst
copy to debian/qhull-bin.preinst
index 077c62f..d0ca881
--- a/debian/libqhull-dev.preinst
+++ b/debian/qhull-bin.preinst
@@ -1,27 +1,21 @@
#!/bin/sh
-# preinst script for libqhull-dev
set -e
case "$1" in
install|upgrade)
- if test -L /usr/share/doc/libqhull-dev ; then
- rm -rf /usr/share/doc/libqhull-dev
+ if test -L /usr/share/doc/qhull-bin; then
+ rm -f /usr/share/doc/qhull-bin
fi
-
- ;;
+ ;;
abort-upgrade)
- ;;
+ ;;
*)
echo "preinst called with unknown argument \`$1'" >&2
exit 1
- ;;
+ ;;
esac
#DEBHELPER#
-
-exit 0
-
-
diff --git a/debian/rules b/debian/rules
index de33269..4360910 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,43 +1,38 @@
#!/usr/bin/make -f
-# debian/rules for Debian qhull package
-# GNU copyright (C) 2007, 2008 Rafael Laboissiere
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
-debdir := $(CURDIR)/debian
-htmldir := $(debdir)/tmp/usr/share/doc/qhull/html
+# consider: GCC -fno-strict-aliasing
-DEB_DH_INSTALL_SOURCEDIR = debian/tmp
-DEB_COMPRESS_EXCLUDE = .c .h .txt
-CFLAGS := $(CFLAGS) -fno-strict-aliasing
-DEB_MAKE_CHECK_TARGET = -C debian -f rules check
+$(dh_targets) %:
+ dh $@ --with autoreconf --parallel
-build/qhull-bin:: build-stamp
-build-stamp:
- # Build man pages
- @( cd debian ; \
+override_dh_autoreconf:
+ $(SHELL) config/bootstrap.sh # robust to non-executable script
+
+override_dh_auto_build:
+ dh_auto_build
+ @echo Building man pages
+ 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` ; \
- echo -n Building man page for $$comm... ; \
+ comm=$$(echo $$info | cut -d: -f1) && \
+ purp=$$(echo $$info | cut -d: -f2) && \
+ echo -n Building man page for $$comm... && \
sed "s/#command#/$$comm/;s/#purpose#/$$purp/" \
- manpage.in > $$comm.xml ; \
- docbook2x-man $$comm.xml ; \
+ manpage.in > $$comm.xml && \
+ docbook2x-man $$comm.xml && \
echo " done" ; \
- done )
- touch build-stamp
-
-check:
- # Run tests
- cd .. ; PATH=./src/:$$PATH /bin/sh eg/q_test
-
-install/libqhull-doc::
- # Install all the needed documentation files
- cp *.txt html/*.txt $(htmldir)
- mkdir $(htmldir)/src
- cp src/*.c src/*.h src/*.htm src/*.txt $(htmldir)/src
- sed -i 's:href="../:href=":g' $(htmldir)/*.htm
+ done
+
+override_dh_auto_test:
+ env PATH=$(CURDIR)/src:$${PATH} eg/q_test
+
+override_dh_installchangelogs:
+ dh_installchangelogs src/Changes.txt
+
+override_dh_compress:
+ dh_compress -X.c -X.h -X.txt
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..7423a2d
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1 @@
+single-debian-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