From: Aaron M. Ucko <ucko@debian.org>
Date: Mon, 30 Jun 2014 15:02:48 +0000 (+0000)
Subject: debian/patches/include_typeinfo: Patch include/corelib/ncbistl.hpp to
X-Git-Tag: archive/raspbian/2.16.0+ds-7+rpi1~1^2~260
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=87e34e9cae6567b8dec0124a6a6f60f50348f3ee;p=ncbi-blast%2B.git

debian/patches/include_typeinfo: Patch include/corelib/ncbistl.hpp to
ensure sufficient coverage; fix typos in patch headers.  (Closes: #753190.)
---

diff --git a/debian/changelog b/debian/changelog
index c39c2360..b9199e9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 ncbi-blast+ (2.2.29-3) UNRELEASED; urgency=medium
 
   * NOT YET RELEASED.
+  * debian/patches/include_typeinfo: Patch include/corelib/ncbistl.hpp to
+    ensure sufficient coverage; fix typos in patch headers.  (Closes: #753190.)
 
- -- Aaron M. Ucko <ucko@debian.org>  Mon, 30 Jun 2014 10:59:14 -0400
+ -- Aaron M. Ucko <ucko@debian.org>  Mon, 30 Jun 2014 11:02:45 -0400
 
 ncbi-blast+ (2.2.29-2) unstable; urgency=medium
 
diff --git a/debian/patches/include_typeinfo b/debian/patches/include_typeinfo
index 8885642f..e9fe46ac 100644
--- a/debian/patches/include_typeinfo
+++ b/debian/patches/include_typeinfo
@@ -1,16 +1,16 @@
 Subject: include required by recent compiler
-Descrpition: a recent gcc version requires an include
+Description: a recent gcc version requires an include
 Author: Olivier Sallou <osallou@debian.org>
 Forwarded: yes
 Bug: sent by mail
-Last-Updated: 2014-0-30
---- a/c++/src/corelib/ncbi_os_unix.cpp
-+++ b/c++/src/corelib/ncbi_os_unix.cpp
-@@ -29,6 +29,7 @@
-  *
-  */
- 
-+#include <typeinfo>
- #include <ncbi_pch.hpp>
- #include <corelib/error_codes.hpp>
- #include <corelib/ncbistr.hpp>
+Last-Updated: 2014-06-30
+--- a/c++/include/corelib/ncbistl.hpp
++++ b/c++/include/corelib/ncbistl.hpp
+@@ -215,6 +215,7 @@ END_NCBI_SCOPE
+ #  elif defined(_GLIBCXX_DEPRECATED)
+ #    include <ext/concurrence.h>
+ #    ifdef _GLIBCXX_THROW_OR_ABORT /* using libstdc++ from GCC 4.8 or later */
++#      include <typeinfo>
+ #      include <bits/unique_ptr.h>
+ #      include <bits/shared_ptr.h>
+ #    endif