[qhull] 07/10: Imported Debian patch 2003.1-8

[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-10
in repository qhull.

commit 64c54eb273d5ee1b1790c8161e842805000382a9
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Fri Dec 14 10:48:45 2007 +0100

    Imported Debian patch 2003.1-8
---
 debian/changelog | 18 ++++++++++++++++++
 debian/control   | 17 ++++++-----------
 debian/rules     |  8 ++++++--
 3 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e1e0c66..457ae55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+qhull (2003.1-8) unstable; urgency=low
+
+  * debian/control:
+    + Use the substitution variable ${binary:Version} instead of the
+      deprecated ${Source-Version}
+    + Added Homepage field
+    + Use the now official Vcs-* fields instead of the obsolete XS-Vcs-*
+    + Dropped the Homepage pseudo-header for the extended descriptions
+    + Bumped Standards-Version to 3.7.3
+  * debian/rules:
+    + Include the -fno-strict-aliasing option into CFLAGS, otherwise the
+      qhull library does not work correctly.  This has to do with some
+      change in the toolchain (gcc 4.1.* series).
+    + Call the test suite after building the qhull-bin package
+    + Removed bashism in the install/libqhull-dev rule
+
+ -- Rafael Laboissiere <rafael at debian.org>  Fri, 14 Dec 2007 10:48:45 +0100
+
 qhull (2003.1-7) unstable; urgency=low
 
   * debian/control: Tighten build-dependency on docbook2x >= 0.8.8-3,
diff --git a/debian/control b/debian/control
index 3ef3387..c2061e7 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,11 @@ Section: math
 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.7.2
+Standards-Version: 3.7.3
 Build-Depends: debhelper (>= 5), docbook2x (>= 0.8.8-3), xsltproc, eperl, cdbs
-XS-Vcs-Svn: ssh://svn.debian.org/svn/pkg-scicomp/qhull/
-XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-scicomp/qhull/
+Homepage: http://www.qhull.org
+Vcs-Svn: ssh://svn.debian.org/svn/pkg-scicomp/qhull/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-scicomp/qhull/
 
 Package: libqhull5
 Section: libs
@@ -19,13 +20,11 @@ Description: calculate convex hulls and related structures (shared library)
  runs in 2-d, 3-d, 4-d, and higher dimensions.
  .
  This package contains the shared C library.
- .
-  Homepage: http://www.qhull.org
 
 Package: libqhull-dev
 Section: libdevel
 Architecture: any
-Depends: libqhull5 (= ${Source-Version}), libc6-dev
+Depends: libqhull5 (= ${binary:Version}), libc6-dev
 Description: calculate convex hulls and related structures (development files)
  Qhull computes convex hulls, Delaunay triangulations, halfspace
  intersections about a point, Voronoi diagrams, furthest-site
@@ -34,13 +33,11 @@ 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
 
 Package: qhull-bin
 Section: math
 Architecture: any
-Depends: libqhull5 (= ${Source-Version})
+Depends: libqhull5 (= ${binary:Version})
 Suggests: geomview
 Description: calculate convex hulls and related structures (utilities)
  Qhull computes convex hulls, Delaunay triangulations, halfspace
@@ -55,5 +52,3 @@ 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
diff --git a/debian/rules b/debian/rules
index 863d1f2..9f63eeb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,8 +12,10 @@ htmldir	:= $(debdir)/tmp/usr/share/doc/qhull/html
 
 DEB_DH_INSTALL_SOURCEDIR = debian/tmp
 DEB_COMPRESS_EXCLUDE = .c .h .txt
+CFLAGS := $(CFLAGS) -fno-strict-aliasing
 
 build/qhull-bin::
+	# Build man pages
 	@( cd debian ;							\
 	  for info in "qconvex:compute the convex hull"			\
 	              "qdelaunay:compute the Delaunay triangulation"	\
@@ -27,6 +29,8 @@ build/qhull-bin::
 	      docbook2x-man $$comm.xml ;				\
 	      echo " done" ;						\
 	  done )
+	# Run tests
+	PATH=./src/:$$PATH /bin/sh eg/q_test
 
 clean::
 	rm -f debian/*.xml debian/*.1
@@ -35,9 +39,9 @@ install/libqhull-dev::
 	# Install all the needed documentation files
 	cp *.txt html/*.txt $(htmldir)
 	mkdir $(htmldir)/src
-	cp src/*.{c,h,htm,txt} $(htmldir)/src
+	cp src/*.c src/*.h src/*.htm src/*.txt $(htmldir)/src
 	sed -i 's:href="../:href=":g' $(htmldir)/*.htm
-	# Isntall Lintian override file
+	# 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