[qhull] 01/10: Imported Debian patch 2003.1-2

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 364a57d3c8bc1cd4a87e8b460128b451b196c239
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Tue Jun 27 10:28:17 2006 +0200

    Imported Debian patch 2003.1-2
---
 debian/changelog  | 17 +++++++++++++++++
 debian/control    |  6 +++---
 debian/manpage.in | 53 ++++++++++++++++++++++++++++-------------------------
 debian/rules      |  6 +++---
 debian/watch      |  2 ++
 5 files changed, 53 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d2b75d1..e515c1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+qhull (2003.1-2) unstable; urgency=low
+
+  * debian/control:
+    - Bumped Standards-Version to 3.7.2 (no chnages needed)
+    - Fixed typo in the libqhull5 long description
+    - Build-Depends on docbook2x instead of docbook-utils
+  * debian/watch: Added file
+  * debian/rules: Use docbook2x-man instead of docbook2man to produce the
+    man pages
+  * debian/manpage.in:
+    - Converted to XML
+    - Added "See Also" section (added the name of the HTML file contianing
+      the full documentation)
+    - Improved "Authors" section (added the names of the upstream authors)
+
+ -- Rafael Laboissiere <rafael at debian.org>  Tue, 27 Jun 2006 10:28:17 +0200
+
 qhull (2003.1-1) unstable; urgency=low
 
   * New upstream release.  There are backward incompatibilities in the code
diff --git a/debian/control b/debian/control
index 462bbe3..31ce018 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: qhull
 Section: math
 Priority: optional
 Maintainer: Rafael Laboissiere <rafael at debian.org>
-Standards-Version: 3.6.1
-Build-Depends: debhelper (>= 4), docbook-utils, eperl, dpatch
+Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 4), docbook2x, eperl, dpatch
 
 Package: libqhull5
 Section: libs
@@ -15,7 +15,7 @@ Description: Calculate convex hulls and related structures (shared library)
  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.
+ This package contains the shared C library.
  .
  Homepage: http://www.qhull.org
 
diff --git a/debian/manpage.in b/debian/manpage.in
index bb5155e..7abab5e 100644
--- a/debian/manpage.in
+++ b/debian/manpage.in
@@ -1,22 +1,6 @@
-<!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. -->
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
   <!ENTITY dhfirstname "<firstname>Rafael</firstname>">
   <!ENTITY dhsurname   "<surname>Laboissiere</surname>">
   <!-- Please adjust the date whenever revising the manpage. -->
@@ -24,16 +8,20 @@ manpage.1: manpage.sgml
   <!-- 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 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>">
+  <!ENTITY docfile     "/usr/share/doc/<:=$soname:>/html/<:=$command:>.htm">
 ]>
 
+<!-- Template manual page for the Qhull commands, DocBook source file
+     (C) 2006  Rafael Laboissiere <rafael at debian.org>
+
+     $Id$ -->
+
 <refentry>
   <refentryinfo>
     <address>
@@ -75,16 +63,33 @@ manpage.1: manpage.sgml
 
     <para>
       This program is documented fully in <ulink
-      url="file:///usr/share/doc/<:=$soname:>/html/<:=$command:>.htm">HTML
+      url="file://&docfile;">HTML
       format</ulink>, available in the <:=$soname:>-dev package.
+    </para>
+
   </refsect1>
+
+  <refsect1>
+    <title>SEE ALSO</title>
+
+    <para>
+      &docfile;
+    </para>
+  </refsect1>
+
   <refsect1>
     <title>AUTHOR</title>
 
     <para>
+      The Qhull library is authored by C. Bradford Barber and Hannu
+      Huhdanpaa.
+    </para>
+
+    <para>
       This manual page was written by &dhusername; &dhemail; for the
       &debian; system (but may be used by others withouth any
       restrictions).
+    </para>
 
   </refsect1>
 </refentry>
@@ -105,5 +110,3 @@ sgml-local-catalogs:nil
 sgml-local-ecat-files:nil
 End:
 -->
-
-
diff --git a/debian/rules b/debian/rules
index 1bee78b..2f0fc78 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,8 +36,8 @@ build-stamp: patch config
 	    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 ; \
+	      manpage.in > $$comm.xml ; \
+	    docbook2x-man $$comm.xml ; \
 	  done )
 
 	touch build-stamp
@@ -47,7 +47,7 @@ clean: unpatch
 	dh_testroot
 
 	-$(MAKE) distclean
-	( cd debian ; rm -rf *.sgml *.1 manpage.links manpage.refs )
+	( cd debian ; rm -rf *.xml *.1 )
 
 	rm -f install-stamp build-stamp config-stamp patch-stamp
 
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..88789d2
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://www.qhull.org/download/ (?:.*/)?qhull-([\d+\.]+|\d+)\.tar.*

-- 
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