[libdap] 21/48: 72008

[Alastair McKinstry]

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

mckinstry pushed a commit to tag unstable/3.12.0-1
in repository libdap.

commit 3a0ba3065d637ef65c205d9b7d2f88ff0d2994c4
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue May 8 17:16:49 2012 +0100

    72008
---
 debian/changelog               |  7 +++++++
 debian/patches/g++47-fix.patch | 18 ++++++++++++++++++
 debian/patches/series          |  1 +
 3 files changed, 26 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index fea83c1..759399a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdap (3.11.1-11)  unstable; urgency=low
+
+  * Fix for gcc-4.7, which is stricter on including prototypes.
+    Closes: #672008 
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Tue, 08 May 2012 17:15:36 +0100
+
 libdap (3.11.1-10) unstable; urgency=low
 
   * Switch to dh_autoreconf --as-needed for ltmain-as-needed instead of
diff --git a/debian/patches/g++47-fix.patch b/debian/patches/g++47-fix.patch
new file mode 100644
index 0000000..83d8395
--- /dev/null
+++ b/debian/patches/g++47-fix.patch
@@ -0,0 +1,18 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Forwwarded: no
+Description: GCC-4.7 is more strict on including headers.
+Bug-Debian: http://bugs.debian.org/672008
+
+Index: libdap-3.11.1/ResponseBuilder.cc
+===================================================================
+--- libdap-3.11.1.orig/ResponseBuilder.cc	2012-05-08 16:57:16.000000000 +0100
++++ libdap-3.11.1/ResponseBuilder.cc	2012-05-08 16:57:50.000000000 +0100
+@@ -29,7 +29,7 @@
+ #include <signal.h>
+ 
+ #ifndef WIN32
+-// #include <unistd.h>   // for getopt
++#include <unistd.h>   // for getopt, and alarm()
+ #include <sys/wait.h>
+ #else
+ #include <io.h>
diff --git a/debian/patches/series b/debian/patches/series
index 3b2120f..42d8253 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ curl-types-remove.patch
 xml_libs.patch
 testsuite-failures.patch
 pkgconfig.patch
+g++47-fix.patch

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