From: Olivier Sallou <osallou@debian.org>
Date: Fri, 11 Dec 2015 08:50:24 +0000 (+0000)
Subject: fix missing colon causing FTBS on some archs
X-Git-Tag: archive/raspbian/2.16.0+ds-7+rpi1~1^2~239
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=08f1d9509acfacc887ed1852dd1a6f972bef398c;p=ncbi-blast%2B.git

fix missing colon causing FTBS on some archs
---

diff --git a/debian/changelog b/debian/changelog
index e8da3291..f58361c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ncbi-blast+ (2.2.31-2) unstable; urgency=medium
+
+  * Fix a long-standing typo for GNU/kFreeBSD FTBS (Aaron M. Ucko) 
+
+ -- Olivier Sallou <osallou@debian.org>  Fri, 11 Dec 2015 09:44:43 +0100
+
 ncbi-blast+ (2.2.31-1) unstable; urgency=medium
 
   * New upstream release 
diff --git a/debian/patches/fix_kfreebsd_ftbs.patch b/debian/patches/fix_kfreebsd_ftbs.patch
new file mode 100644
index 00000000..8a82e614
--- /dev/null
+++ b/debian/patches/fix_kfreebsd_ftbs.patch
@@ -0,0 +1,34 @@
+Subject: Fix missing colon
+Description: colon missing causing FTBS on some archs
+Author: Olivier Sallou <olivier.sallou@irisa.fr>
+Forwarded: yes
+Comment: updated upstream at revision 70194
+--- a/c++/src/corelib/ncbifile.cpp
++++ b/c++/src/corelib/ncbifile.cpp
+@@ -4423,7 +4423,7 @@
+     if (statvfs(path.c_str(), &st) != 0) {                     \
+         NCBI_THROW(CFileErrnoException, eFileSystemInfo, msg); \
+     }                                                          \
+-    info->total_space  = (Uint8)st.f_bsize * st.f_blocks       \
++    info->total_space  = (Uint8)st.f_bsize * st.f_blocks;      \
+     if (st.f_frsize) {                                         \
+         info->free_space = (Uint8)st.f_frsize * st.f_bavail;   \
+         info->block_size = (unsigned long)st.f_frsize;         \
+@@ -4431,7 +4431,7 @@
+         info->free_space = (Uint8)st.f_bsize * st.f_bavail;    \
+         info->block_size = (unsigned long)st.f_bsize;          \
+     }                                                          \
+-    info->used_space   = info->total_space - info->free_space
++    info->used_space   = info->total_space - info->free_space;
+ 
+ 
+ #define GET_STATFS_INFO                                        \
+@@ -4443,7 +4443,7 @@
+     info->total_space  = (Uint8)st.f_bsize * st.f_blocks;      \
+     info->free_space   = (Uint8)st.f_bsize * st.f_bavail;      \
+     info->used_space   = info->total_space - info->free_space; \
+-    info->block_size   = (unsigned long)st.f_bsize
++    info->block_size   = (unsigned long)st.f_bsize;
+ 
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 0c3e318a..f60154b6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ skip_services_unit_test
 fix_configure
 fix_compilation
 allow_gcc5
+fix_kfreebsd_ftbs.patch