[qhull] 01/01: Imported Debian patch 2009.1-3

[Barak A. Pearlmutter]

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

bap pushed a commit to annotated tag debian/2009.1-3
in repository qhull.

commit 9c1b613c2ebd9a81a6685746e8dca5759e1f1c8e
Author: Salvatore Bonaccorso <carnil at debian.org>
Date:   Wed Nov 23 09:03:46 2011 +0100

    Imported Debian patch 2009.1-3
---
 debian/README.source                                  |  8 --------
 debian/changelog                                      | 12 ++++++++++++
 debian/control                                        |  2 +-
 debian/patches/fix-FTBFS-643461-format-security.patch | 18 ++++++++++++++++++
 debian/patches/series                                 |  1 +
 debian/rules                                          |  1 -
 6 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 04aef5b..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,8 +0,0 @@
-README.source for qhull
-=======================
-
-This package uses quilt to manage all modifications to the upstream sources.
-See `/usr/share/doc/quilt/README.source' to get more information on how to
-use it.
-
- -- Rafael Laboissiere <rafael at debian.org>, Sun,  7 Jun 2009 02:17:10 +0200
diff --git a/debian/changelog b/debian/changelog
index 5ca1218..b049b94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+qhull (2009.1-3) unstable; urgency=low
+
+  * Team upload.
+  * Add fix-FTBFS-643461-format-security.patch patch.
+    Fix format-security compiler warnings.
+    Thanks to peter green <plugwash at p10link.net> for the patch (Closes: #643461)
+  * Drop quilt framework.
+    Explicit dependencies on quilt is not needed as we use '3.0 (quilt)'
+    source package format.
+
+ -- Salvatore Bonaccorso <carnil at debian.org>  Wed, 23 Nov 2011 09:03:46 +0100
+
 qhull (2009.1-2) unstable; urgency=low
 
   * Team upload
diff --git a/debian/control b/debian/control
index 7761bc5..b29c4de 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.
 Uploaders: Rafael Laboissiere <rafael at debian.org>
 Standards-Version: 3.9.2
 Build-Depends: debhelper (>= 7.0.0), docbook2x (>= 0.8.8-3), xsltproc,
- cdbs, quilt, docbook-xml, autotools-dev
+ cdbs, docbook-xml, autotools-dev
 Homepage: http://www.qhull.org
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/qhull.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/qhull.git
diff --git a/debian/patches/fix-FTBFS-643461-format-security.patch b/debian/patches/fix-FTBFS-643461-format-security.patch
new file mode 100644
index 0000000..34be027
--- /dev/null
+++ b/debian/patches/fix-FTBFS-643461-format-security.patch
@@ -0,0 +1,18 @@
+Description: Fix FTBFS when building with hardening flags as used by
+ dpkg 1.16.0.
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/643461
+Author: peter green <plugwash at p10link.net>
+Last-Update: 2011-11-23
+
+--- a/src/io.c
++++ b/src/io.c
+@@ -2166,7 +2166,7 @@
+     qh_memfree (point, qh normal_size);
+   qh_settempfree(&points);
+   qh_settempfree(&vertices);
+-  fprintf(fp, endfmt);
++  fprintf(fp, "%s", endfmt);
+ } /* printfacet3math */
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 1b7b72a..1f97522 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 make-new-msg.patch
 QHpointer.patch
+fix-FTBFS-643461-format-security.patch
diff --git a/debian/rules b/debian/rules
index d448816..de33269 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,6 @@
 
 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
 htmldir	:= $(debdir)/tmp/usr/share/doc/qhull/html

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