[qhull] 01/01: Imported Debian patch 2003.1-11

[Barak A. Pearlmutter]

This is an automated email from the git hooks/post-receive script.

bap pushed a commit to annotated tag debian/2003.1-11
in repository qhull.

commit cb4e8312ad73129ddaf9057ca15e3c86f47c2fe1
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Thu Aug 14 13:26:11 2008 +0200

    Imported Debian patch 2003.1-11
---
 debian/changelog  | 25 +++++++++++++++++++++++++
 debian/clean      |  1 +
 debian/compat     |  2 +-
 debian/control    |  4 ++--
 debian/manpage.in |  8 ++++----
 debian/rules      |  5 +----
 6 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5c9ca96..7ea5fe2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+qhull (2003.1-11) unstable; urgency=low
+
+  * debian/rules: Use debian/clean instead of manually cleaning files
+  * debian/compat, debian/control: Bump build-dependency on debhelper to
+    >= 7.0.0, otherwise debian/clean is moot
+  * debian/clean: New file
+
+ -- Rafael Laboissiere <rafael at debian.org>  Thu, 14 Aug 2008 13:26:11 +0200
+
+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-10lenny1) unstable; urgency=low
 
   * debian/control: Build-depends on docbook-xml.  This avoid FTBFS due to
@@ -7,6 +31,7 @@ qhull (2003.1-10lenny1) unstable; urgency=low
 
  -- Rafael Laboissiere <rafael at debian.org>  Sat, 02 Aug 2008 22:00:22 +0200
 
+
 qhull (2003.1-10) unstable; urgency=low
 
   * Create new package libqhull-doc containing the HTML documentation for
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..caf9104
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+debian/*.xml debian/*.1
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index a5201b8..0f92b02 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ Priority: optional
 Maintainer: Debian Scientific Computing Team <pkg-scicomp-devel at lists.alioth.debian.org>
 Uploaders: Rafael Laboissiere <rafael at debian.org>
 Standards-Version: 3.8.0
-Build-Depends: debhelper (>= 5), docbook2x (>= 0.8.8-3), xsltproc,
- eperl, cdbs, quilt, docbook-xml
+Build-Depends: debhelper (>= 7.0.0), docbook2x (>= 0.8.8-3), xsltproc,
+ cdbs, quilt, docbook-xml
 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/
diff --git a/debian/manpage.in b/debian/manpage.in
index 723b672..6a2fdaf 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 fa7bf9f..13cf04e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,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... ;			\
-	      eperl -d command=$$comm -d purpose="$$purp"		\
+	      sed "s/#command#/$$comm/;s/#purpose#/$$purp/"		\
 	          manpage.in > $$comm.xml ;				\
 	      docbook2x-man $$comm.xml ;				\
 	      echo " done" ;						\
@@ -31,9 +31,6 @@ build/qhull-bin::
 	# Run tests
 	PATH=./src/:$$PATH /bin/sh eg/q_test
 
-clean::
-	rm -f debian/*.xml debian/*.1
-
 install/libqhull-doc::
 	# Install all the needed documentation files
 	cp *.txt html/*.txt $(htmldir)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/qhull.git