[SCM] qhull packaging files branch, master, updated. a357aa13775883243cd59aee645596bb39d40c68

Sylvestre Ledru sylvestre.ledru at scilab.org
Wed Aug 3 08:06:03 UTC 2011 

The following commit has been merged in the master branch:
commit a357aa13775883243cd59aee645596bb39d40c68
Author: Sylvestre Ledru <sylvestre.ledru at scilab.org>
Date:   Wed Aug 3 10:05:50 2011 +0200

      * Team upload
      * Standards-Version updated to 3.9.2
      * Switch to dpkg-source 3.0 (quilt) format
      * Package moved into the debian science team
      * Fix the FTBFS with binutils-gold. Thanks to Iain Lane for providing the
        patch (Closes: #556302)
      * .la file is no longer installed

diff --git a/debian/changelog b/debian/changelog
index ef0f784..5ca1218 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+qhull (2009.1-2) unstable; urgency=low
+
+  * Team upload
+  * Standards-Version updated to 3.9.2
+  * Switch to dpkg-source 3.0 (quilt) format
+  * Package moved into the debian science team
+  * Fix the FTBFS with binutils-gold. Thanks to Iain Lane for providing the
+    patch (Closes: #556302)
+  * .la file is no longer installed
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Wed, 03 Aug 2011 09:50:39 +0200
+
 qhull (2009.1-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 91d8300..7761bc5 100644
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,14 @@
 Source: qhull
 Section: math
 Priority: optional
-Maintainer: Debian Scientific Computing Team <pkg-scicomp-devel at lists.alioth.debian.org>
+Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Rafael Laboissiere <rafael at debian.org>
-Standards-Version: 3.8.1
+Standards-Version: 3.9.2
 Build-Depends: debhelper (>= 7.0.0), docbook2x (>= 0.8.8-3), xsltproc,
  cdbs, quilt, docbook-xml, autotools-dev
 Homepage: http://www.qhull.org
-Vcs-Git: git://git.debian.org/git/pkg-scicomp/qhull.git
-Vcs-Browser: http://git.debian.org/?p=pkg-scicomp/qhull.git
+Vcs-Git: git://anonscm.debian.org/debian-science/packages/qhull.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/qhull.git
 
 Package: libqhull5
 Section: libs
@@ -25,7 +25,7 @@ Description: calculate convex hulls and related structures (shared library)
 Package: libqhull-dev
 Section: libdevel
 Architecture: any
-Depends: libqhull5 (= ${binary:Version}), libc6-dev, ${misc:Depends}
+Depends: libqhull5 (= ${binary:Version}), ${misc:Depends}
 Description: calculate convex hulls and related structures (development files)
  Qhull computes convex hulls, Delaunay triangulations, halfspace
  intersections about a point, Voronoi diagrams, furthest-site
diff --git a/debian/libqhull-dev.files b/debian/libqhull-dev.files
index 71158c4..80daadc 100644
--- a/debian/libqhull-dev.files
+++ b/debian/libqhull-dev.files
@@ -1,5 +1,4 @@
 usr/lib/libqhull.a
-usr/lib/libqhull.la
 usr/lib/libqhull.so
 usr/include
 usr/share/doc/libqhull5/examples
diff --git a/debian/libqhull-dev.install b/debian/libqhull-dev.install
index b34d365..5bca52d 100644
--- a/debian/libqhull-dev.install
+++ b/debian/libqhull-dev.install
@@ -1,3 +1,3 @@
 usr/lib/libqhull.so
-usr/lib/libqhull.*a
+usr/lib/libqhull.a
 usr/include/qhull
diff --git a/debian/patches/0001-Add-patch-to-fix-FTBFS-with-no-add-needed.patch b/debian/patches/0001-Add-patch-to-fix-FTBFS-with-no-add-needed.patch
new file mode 100644
index 0000000..50bff98
--- /dev/null
+++ b/debian/patches/0001-Add-patch-to-fix-FTBFS-with-no-add-needed.patch
@@ -0,0 +1,79 @@
+From f82e13b8e955717ae21a5f002f6cc054301abcb8 Mon Sep 17 00:00:00 2001
+From: Iain Lane <laney at ubuntu.com>
+Date: Sun, 9 Jan 2011 23:22:12 +0000
+Subject: [PATCH] Add patch to fix FTBFS with --no-add-needed
+
+debian/patches/linking-no-add-needed.patch: Add new patch to
+explicitly link with the math libraries, to resolve a FTBFS with
+binutils-gold/--no-add-needed. (Closes: #556302)
+---
+ debian/changelog                           |    8 +++++++
+ debian/patches/linking-no-add-needed.patch |   31 ++++++++++++++++++++++++++++
+ debian/patches/series                      |    1 +
+ 3 files changed, 40 insertions(+), 0 deletions(-)
+ create mode 100644 debian/patches/linking-no-add-needed.patch
+
+diff --git a/debian/changelog b/debian/changelog
+index ef0f784..5aba8f5 100644
+--- a/debian/changelog
++++ b/debian/changelog
+@@ -1,3 +1,11 @@
++qhull (2009.1-2) UNRELEASED; urgency=low
++
++  * debian/patches/linking-no-add-needed.patch: Add new patch to
++    explicitly link with the math libraries, to resolve a FTBFS with
++    binutils-gold/--no-add-needed. (Closes: #556302)
++
++ -- Iain Lane <laney at ubuntu.com>  Sun, 09 Jan 2011 23:20:00 +0000
++
+ qhull (2009.1-1) unstable; urgency=low
+ 
+   * New upstream release
+diff --git a/debian/patches/linking-no-add-needed.patch b/debian/patches/linking-no-add-needed.patch
+new file mode 100644
+index 0000000..c96bc75
+--- /dev/null
++++ b/debian/patches/linking-no-add-needed.patch
+@@ -0,0 +1,31 @@
++Explicitly link with -lm for the math libraries to be available to the linker,
++required to fix FTBFS with binutils-gold/--no-add-needed
++
++  -- Iain Lane <laney at ubuntu.com>  Sun, 09 Jan 2011 23:19:48 +0000
++
++Index: qhull-2009.1/src/Makefile.am
++===================================================================
++--- qhull-2009.1.orig/src/Makefile.am	2011-01-09 23:04:26.854227305 +0000
+++++ qhull-2009.1/src/Makefile.am	2011-01-09 23:12:38.512198225 +0000
++@@ -40,7 +40,7 @@
++ 
++ # how:
++ qhull_LDADD = libqhull.la
++-rbox_LDADD = libqhull.la
+++rbox_LDADD = libqhull.la -lm
++ qconvex_LDADD = libqhull.la
++ qdelaunay_LDADD = libqhull.la
++ qvoronoi_LDADD = libqhull.la
++Index: qhull-2009.1/src/Makefile.in
++===================================================================
++--- qhull-2009.1.orig/src/Makefile.in	2011-01-09 23:12:43.582589854 +0000
+++++ qhull-2009.1/src/Makefile.in	2011-01-09 23:12:51.993239477 +0000
++@@ -263,7 +263,7 @@
++ 
++ # how:
++ qhull_LDADD = libqhull.la
++-rbox_LDADD = libqhull.la
+++rbox_LDADD = libqhull.la -lm
++ qconvex_LDADD = libqhull.la
++ qdelaunay_LDADD = libqhull.la
++ qvoronoi_LDADD = libqhull.la
+diff --git a/debian/patches/series b/debian/patches/series
+index 1b7b72a..595b1ee 100644
+--- a/debian/patches/series
++++ b/debian/patches/series
+@@ -1,2 +1,3 @@
+ make-new-msg.patch
+ QHpointer.patch
++linking-no-add-needed.patch
+-- 
+1.7.2.3
+
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
qhull packaging files

More information about the debian-science-commits mailing list