[qhull] 10/10: Imported Debian patch 2003.1-10
Barak A. Pearlmutter
barak+git at cs.nuim.ie
Thu Feb 6 14:03:27 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 70be05d80d87567e55923c2e48dec485ce106a2c
Author: Rafael Laboissiere <rafael at debian.org>
Date: Fri Jun 27 19:30:35 2008 +0200
Imported Debian patch 2003.1-10
---
debian/changelog | 24 +++++++++------------
debian/control | 13 ++++++++++-
debian/copyright | 25 ++++++++++++----------
debian/libqhull-dev.lintian | 1 -
...libqhull-dev.doc-base => libqhull-doc.doc-base} | 4 ++--
debian/{libqhull-dev.docs => libqhull-doc.docs} | 0
debian/libqhull-doc.lintian-overrides | 1 +
debian/manpage.in | 8 +++----
debian/rules | 11 +++-------
9 files changed, 46 insertions(+), 41 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7cc3b5f..345ea61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,13 @@
-qhull (2003.1-9lenny1) testing-proposed-updates; urgency=low
-
- * debian/rules: Use sed instead of eperl to generate the man pages.
- Eperl is buggy on hppa (see Bug#494191) and the package FTBFS there.
- (Closes: #494461)
- * debian/manpage.in: Adapt for using sed
- * debian.control:
- + Drop build-dependency on eperl
- + Build-depends on docbook-xml. This avoid timeouts due to the failed
- attempt to load the external entity docbookx.dtd (needed for the
- Debian-provided man pages) when network connection is not available.
- + Bump Standards-Version to 3.8.0 (no changes needed)
-
- -- Rafael Laboissiere <rafael at debian.org> Thu, 14 Aug 2008 10:43:24 +0200
+qhull (2003.1-10) unstable; urgency=low
+
+ * Create new package libqhull-doc containing the HTML documentation for
+ Qhull. This avoids a Lintian message saying that the arch-dependent
+ package libqhull-dev has a big /usr/share directory.
+ * debian/copyright: Clarify licensing conditions for the Debian
+ packaging files
+ * Bump Standards-Version to 3.8.0 (no changes needed)
+
+ -- Rafael Laboissiere <rafael at debian.org> Fri, 27 Jun 2008 19:30:35 +0200
qhull (2003.1-9) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 8001bc4..61c9235 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Scientific Computing Team <pkg-scicomp-devel at lists.alioth.deb
Uploaders: Rafael Laboissiere <rafael at debian.org>
Standards-Version: 3.8.0
Build-Depends: debhelper (>= 5), docbook2x (>= 0.8.8-3), xsltproc,
- docbook-xml, cdbs, quilt
+ eperl, cdbs, quilt
Homepage: http://www.qhull.org
Vcs-Svn: svn://svn.debian.org/svn/pkg-scicomp/qhull/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-scicomp/qhull/
@@ -35,6 +35,17 @@ 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.
+Package: libqhull-doc
+Section: doc
+Architecture: all
+Description: calculate convex hulls and related structures (documentation 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 documentation for Qhull.
+
Package: qhull-bin
Section: math
Architecture: any
diff --git a/debian/copyright b/debian/copyright
index 03c6b3c..2d706dc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -29,28 +29,31 @@ Copyright:
email: qhull at qhull.org
-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,
+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:
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
+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
+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
+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.
+The Debian packaging files are released under the terms of the GNU
+General Public License, version 3 or later. The complete text of the
+GNU GPL v3, can be found in the file /usr/share/common-licenses/GPL-3.
diff --git a/debian/libqhull-dev.lintian b/debian/libqhull-dev.lintian
deleted file mode 100644
index 5bb1778..0000000
--- a/debian/libqhull-dev.lintian
+++ /dev/null
@@ -1 +0,0 @@
-libqhull-dev: extra-license-file usr/share/doc/libqhull-dev/html/COPYING.txt
diff --git a/debian/libqhull-dev.doc-base b/debian/libqhull-doc.doc-base
similarity index 81%
rename from debian/libqhull-dev.doc-base
rename to debian/libqhull-doc.doc-base
index 8ab020a..a659902 100644
--- a/debian/libqhull-dev.doc-base
+++ b/debian/libqhull-doc.doc-base
@@ -9,5 +9,5 @@ Abstract: This manual describes Qhull, a general dimension convex hull
Section: Science/Mathematics
Format: HTML
-Index: /usr/share/doc/libqhull-dev/html/index.htm
-Files: /usr/share/doc/libqhull-dev/html/*.htm
+Index: /usr/share/doc/libqhull-doc/html/index.htm
+Files: /usr/share/doc/libqhull-doc/html/*.htm
diff --git a/debian/libqhull-dev.docs b/debian/libqhull-doc.docs
similarity index 100%
rename from debian/libqhull-dev.docs
rename to debian/libqhull-doc.docs
diff --git a/debian/libqhull-doc.lintian-overrides b/debian/libqhull-doc.lintian-overrides
new file mode 100644
index 0000000..db2cae4
--- /dev/null
+++ b/debian/libqhull-doc.lintian-overrides
@@ -0,0 +1 @@
+libqhull-doc: extra-license-file usr/share/doc/libqhull-doc/html/COPYING.txt
diff --git a/debian/manpage.in b/debian/manpage.in
index 6a2fdaf..723b672 100644
--- a/debian/manpage.in
+++ b/debian/manpage.in
@@ -10,11 +10,11 @@
<!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 dhucpackage "<refentrytitle><:=$command:></refentrytitle>">
+ <!ENTITY dhpackage "<:=$command:>">
<!ENTITY debian "<productname>Debian</productname>">
- <!ENTITY docfile "/usr/share/doc/libqhull-dev/html/#command#.htm">
+ <!ENTITY docfile "/usr/share/doc/libqhull-dev/html/<:=$command:>.htm">
]>
<!-- Template manual page for the Qhull commands, DocBook source file
@@ -45,7 +45,7 @@
<refnamediv>
<refname>&dhpackage;</refname>
- <refpurpose>#purpose#</refpurpose>
+ <refpurpose><:=$purpose:></refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
diff --git a/debian/rules b/debian/rules
index 05cee0f..fa7bf9f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,12 @@
#!/usr/bin/make -f
# debian/rules for Debian qhull package
-# GNU copyright 2007 by Rafael Laboissiere
+# GNU copyright (C) 2007, 2008 Rafael Laboissiere
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
debdir := $(CURDIR)/debian
-deblin := $(debdir)/libqhull-dev/usr/share/lintian/overrides
htmldir := $(debdir)/tmp/usr/share/doc/qhull/html
DEB_DH_INSTALL_SOURCEDIR = debian/tmp
@@ -24,7 +23,7 @@ build/qhull-bin::
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/" \
+ eperl -d command=$$comm -d purpose="$$purp" \
manpage.in > $$comm.xml ; \
docbook2x-man $$comm.xml ; \
echo " done" ; \
@@ -35,13 +34,9 @@ build/qhull-bin::
clean::
rm -f debian/*.xml debian/*.1
-install/libqhull-dev::
+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
- # Install Lintian override file
- mkdir -p $(deblin)
- install --mode=644 $(debdir)/libqhull-dev.lintian \
- $(deblin)/libqhull-dev
--
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