[qhull] 02/10: Imported Debian patch 2003.1-3
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-10
in repository qhull.
commit 4d04e4ac938eef44fd94f01afb0f512bc26e2a6e
Author: Rafael Laboissiere <rafael at debian.org>
Date: Mon Apr 2 00:45:20 2007 +0200
Imported Debian patch 2003.1-3
---
debian/changelog | 22 ++++
debian/compat | 1 +
debian/control | 13 ++-
debian/install-src-html.sh | 62 ----------
debian/libqhull-dev.doc-base | 4 +-
debian/libqhull-dev.docs | 1 +
debian/libqhull-dev.examples | 1 +
debian/libqhull-dev.install | 3 +
debian/libqhull-dev.preinst | 27 +++++
debian/libqhull5.install | 1 +
debian/manpage.in | 6 +-
debian/patches/00list | 2 -
debian/patches/QHpointer.dpatch | 35 ------
debian/patches/QHpointer.patch | 11 ++
.../{make-new-msg.dpatch => make-new-msg.patch} | 24 ----
debian/{qhull-bin.files => qhull-bin.install} | 0
debian/qhull-bin.manpages | 1 +
debian/rules | 130 +++++----------------
debian/source.lintian-overrides | 2 +
19 files changed, 113 insertions(+), 233 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e515c1a..4a5854c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+qhull (2003.1-3) unstable; urgency=low
+
+ * debian/control:
+ + Changed maintainer to Debian Scientific Computing Team
+ + Added my name to the Uploaders list
+ + Added XS-Vcs-Svn and XS-Vcs-Browser fields
+ + Upgraded build-dependency on debhelper to >= 5
+ + Added build-dependency to cdbs and dropped dpatch
+ * debian/compat: New file
+ * debian/manpage.in: Fixed directory for URL links
+ * debian/source.lintian-overrides: Add a lintian override for
+ outdated-autotools-helper-file, since we patch this via CDBS'
+ autotools.mk
+ * debian/libqhull-dev.preinst: Remove symlink /usr/share/doc/libqhull-dev
+ which may cause problem in upgrading the package
+ * debian/libqhull-dev.examples: Install examples
+ * debian/rules:
+ + Switched to CDBS
+ + Install source.lintian-overrides
+
+ -- Rafael Laboissiere <rafael at debian.org> Mon, 2 Apr 2007 00:45:20 +0200
+
qhull (2003.1-2) unstable; urgency=low
* debian/control:
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/debian/control b/debian/control
index 31ce018..7866da0 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,12 @@
Source: qhull
Section: math
Priority: optional
-Maintainer: Rafael Laboissiere <rafael at debian.org>
+Maintainer: Debian Scientific Computing Team <pkg-scicomp-devel at lists.alioth.debian.org>
+Uploaders: Rafael Laboissiere <rafael at debian.org>
Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 4), docbook2x, eperl, dpatch
+Build-Depends: debhelper (>= 5), docbook2x, eperl, cdbs
+XS-Vcs-Svn: ssh://svn.debian.org/svn/pkg-scicomp/qhull/
+XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-scicomp/qhull/
Package: libqhull5
Section: libs
@@ -17,7 +20,7 @@ Description: Calculate convex hulls and related structures (shared library)
.
This package contains the shared C library.
.
- Homepage: http://www.qhull.org
+ Homepage: http://www.qhull.org
Package: libqhull-dev
Section: libdevel
@@ -32,7 +35,7 @@ Description: Calculate convex hulls and related structures (development files)
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
+ Homepage: http://www.qhull.org
Package: qhull-bin
Section: math
@@ -53,4 +56,4 @@ Description: Calculate convex hulls and related structures (utilities)
Qhull produces graphical output for Geomview. This helps with
understanding the output (http://www.geomview.org).
.
- Homepage: http://www.qhull.org
+ Homepage: http://www.qhull.org
diff --git a/debian/install-src-html.sh b/debian/install-src-html.sh
deleted file mode 100644
index 1633c7d..0000000
--- a/debian/install-src-html.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/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 --git a/debian/libqhull-dev.doc-base b/debian/libqhull-dev.doc-base
index cbd01a3..6e85f37 100644
--- a/debian/libqhull-dev.doc-base
+++ b/debian/libqhull-dev.doc-base
@@ -9,5 +9,5 @@ Abstract: This manual describes Qhull, a general dimension convex hull
Section: math
Format: HTML
-Index: /usr/share/doc/libqhull5/html/qh-man.htm
-Files: /usr/share/doc/libqhull5/html/*.htm
+Index: /usr/share/doc/libqhull-dev/html/index.htm
+Files: /usr/share/doc/libqhull-dev/html/*.htm
diff --git a/debian/libqhull-dev.docs b/debian/libqhull-dev.docs
new file mode 100644
index 0000000..660a815
--- /dev/null
+++ b/debian/libqhull-dev.docs
@@ -0,0 +1 @@
+debian/tmp/usr/share/doc/qhull/html
diff --git a/debian/libqhull-dev.examples b/debian/libqhull-dev.examples
new file mode 100644
index 0000000..e718002
--- /dev/null
+++ b/debian/libqhull-dev.examples
@@ -0,0 +1 @@
+debian/tmp/usr/share/doc/qhull/examples/*
diff --git a/debian/libqhull-dev.install b/debian/libqhull-dev.install
new file mode 100644
index 0000000..b34d365
--- /dev/null
+++ b/debian/libqhull-dev.install
@@ -0,0 +1,3 @@
+usr/lib/libqhull.so
+usr/lib/libqhull.*a
+usr/include/qhull
diff --git a/debian/libqhull-dev.preinst b/debian/libqhull-dev.preinst
new file mode 100644
index 0000000..077c62f
--- /dev/null
+++ b/debian/libqhull-dev.preinst
@@ -0,0 +1,27 @@
+#!/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
+ fi
+
+ ;;
+
+ abort-upgrade)
+ ;;
+
+ *)
+ echo "preinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
+
+
diff --git a/debian/libqhull5.install b/debian/libqhull5.install
new file mode 100644
index 0000000..98c56ae
--- /dev/null
+++ b/debian/libqhull5.install
@@ -0,0 +1 @@
+usr/lib/libqhull.so.*
diff --git a/debian/manpage.in b/debian/manpage.in
index 7abab5e..cff4662 100644
--- a/debian/manpage.in
+++ b/debian/manpage.in
@@ -14,13 +14,13 @@
<!ENTITY dhpackage "<:=$command:>">
<!ENTITY debian "<productname>Debian</productname>">
- <!ENTITY docfile "/usr/share/doc/<:=$soname:>/html/<:=$command:>.htm">
+ <!ENTITY docfile "/usr/share/doc/libqhull-dev/html/<:=$command:>.htm">
]>
<!-- Template manual page for the Qhull commands, DocBook source file
(C) 2006 Rafael Laboissiere <rafael at debian.org>
- $Id$ -->
+ $Id: manpage.in 191 2006-06-27 08:42:27Z rafael $ -->
<refentry>
<refentryinfo>
@@ -64,7 +64,7 @@
<para>
This program is documented fully in <ulink
url="file://&docfile;">HTML
- format</ulink>, available in the <:=$soname:>-dev package.
+ format</ulink>, available in the libqhull-dev package.
</para>
</refsect1>
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 895e714..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-QHpointer.dpatch
-make-new-msg.dpatch
diff --git a/debian/patches/QHpointer.dpatch b/debian/patches/QHpointer.dpatch
deleted file mode 100644
index 16f04f5..0000000
--- a/debian/patches/QHpointer.dpatch
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /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 --git a/debian/patches/QHpointer.patch b/debian/patches/QHpointer.patch
new file mode 100644
index 0000000..aac1e8a
--- /dev/null
+++ b/debian/patches/QHpointer.patch
@@ -0,0 +1,11 @@
+--- 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 --git a/debian/patches/make-new-msg.dpatch b/debian/patches/make-new-msg.patch
similarity index 55%
rename from debian/patches/make-new-msg.dpatch
rename to debian/patches/make-new-msg.patch
index 8cb77cc..a983e2d 100644
--- a/debian/patches/make-new-msg.dpatch
+++ b/debian/patches/make-new-msg.patch
@@ -1,27 +1,3 @@
-#! /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 @@
diff --git a/debian/qhull-bin.files b/debian/qhull-bin.install
similarity index 100%
rename from debian/qhull-bin.files
rename to debian/qhull-bin.install
diff --git a/debian/qhull-bin.manpages b/debian/qhull-bin.manpages
new file mode 100644
index 0000000..0f65186
--- /dev/null
+++ b/debian/qhull-bin.manpages
@@ -0,0 +1 @@
+debian/*.1
diff --git a/debian/rules b/debian/rules
index 2f0fc78..8cbff6d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,104 +1,34 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-
-# This is the debhelper compatibility version to use.
-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
- ./configure --prefix=/usr --mandir=/usr/share/man
- touch config-stamp
-
-build: build-stamp
-build-stamp: patch config
- dh_testdir
-
- $(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.xml ; \
- docbook2x-man $$comm.xml ; \
+# debian/rules for Debian qhull package
+# GNU copyright 2007 by Rafael Laboissiere
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+
+htmldir := debian/tmp/usr/share/doc/qhull/html
+
+DEB_DH_INSTALL_SOURCEDIR = debian/tmp
+DEB_COMPRESS_EXCLUDE = .c .h .txt
+
+build/qhull-bin::
+ ( 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" \
+ manpage.in > $$comm.xml ; \
+ docbook2x-man $$comm.xml ; \
done )
- touch build-stamp
-
-clean: unpatch
- dh_testdir
- dh_testroot
-
- -$(MAKE) distclean
- ( cd debian ; rm -rf *.xml *.1 )
-
- rm -f install-stamp build-stamp config-stamp patch-stamp
-
- dh_clean
-
-install: install-stamp
-install-stamp: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- $(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 architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installdocs -p$(soname) debian/copyright
- dh_installchangelogs -p$(soname)
- dh_strip
- dh_compress
- dh_fixperms
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+clean::
+ rm -f debian/*.xml debian/*.1
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install config \
- patch unpatch
+install/libqhull-dev::
+ cp *.txt html/*.txt $(htmldir)
+ mkdir $(htmldir)/src
+ cp src/*.{c,h,htm,txt} $(htmldir)/src
+ sed -i 's:href="../:href=":g' $(htmldir)/*.htm
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
new file mode 100644
index 0000000..48717b2
--- /dev/null
+++ b/debian/source.lintian-overrides
@@ -0,0 +1,2 @@
+qhull source: outdated-autotools-helper-file config/config.guess 2003-10-07
+qhull source: outdated-autotools-helper-file config/config.sub 2003-10-07
--
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