[med-svn] [Git][med-team/fast5][master] 5 commits: New upstream version 0.6.5
Afif Elghraoui
gitlab at salsa.debian.org
Sun Feb 18 01:45:12 UTC 2018
Afif Elghraoui pushed to branch master at Debian Med / fast5
Commits:
895c2bf8 by Afif Elghraoui at 2018-02-17T20:34:32-05:00
New upstream version 0.6.5
- - - - -
70953e83 by Afif Elghraoui at 2018-02-17T20:34:32-05:00
Merge tag 'upstream/0.6.5'
Upstream version 0.6.5
- - - - -
5f7d7f8f by Afif Elghraoui at 2018-02-17T20:36:01-05:00
Standards-Version 4.1.3
- - - - -
fd7d95d7 by Afif Elghraoui at 2018-02-17T20:38:05-05:00
Debhelper compat 11
- - - - -
6308fbfd by Afif Elghraoui at 2018-02-17T20:44:59-05:00
releasing package fast5 version 0.6.5-1
- - - - -
5 changed files:
- debian/changelog
- debian/compat
- debian/control
- include/fast5/hdf5_tools.hpp
- src/hdf5-mod.cpp
Changes:
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+fast5 (0.6.5-1) unstable; urgency=medium
+
+ * New upstream version
+ * Standards-Version 4.1.3
+ * Debhelper compat 11
+
+ -- Afif Elghraoui <afif at debian.org> Sat, 17 Feb 2018 20:43:22 -0500
+
fast5 (0.6.4-2) unstable; urgency=low
* Allow stderr output in autpkgtests to ignore notes
=====================================
debian/compat
=====================================
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+11
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
Uploaders: Afif Elghraoui <afif at debian.org>
Build-Depends:
- debhelper (>= 9),
+ debhelper (>= 11),
dh-python,
libhdf5-dev,
libboost-python-dev,
@@ -14,7 +14,7 @@ Build-Depends:
python3-setuptools,
cython,
cython3
-Standards-Version: 4.1.2
+Standards-Version: 4.1.3
Homepage: https://github.com/mateidavid/fast5
Vcs-Git: https://anonscm.debian.org/git/debian-med/fast5.git
Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/fast5.git
=====================================
include/fast5/hdf5_tools.hpp
=====================================
--- a/include/fast5/hdf5_tools.hpp
+++ b/include/fast5/hdf5_tools.hpp
@@ -26,17 +26,13 @@
#include <type_traits>
/// Original HDF5 C API.
-namespace hdf5
-{
#ifndef DOXY
#include <hdf5.h>
#endif
-}
/// New C++ wrapper for the HDF5 C API.
namespace hdf5_tools
{
-using namespace hdf5;
/// Exception class thrown by failed hdf5 operations.
class Exception
@@ -2248,15 +2244,15 @@ public:
detail::HDF_Object_Holder src_attr_dtype_id_holder(
detail::Util::wrap(H5Aget_type, src_attr_id_holder.id),
detail::Util::wrapped_closer(H5Tclose));
- if (hdf5::H5Tget_class(src_attr_dtype_id_holder.id) == H5T_INTEGER)
+ if (H5Tget_class(src_attr_dtype_id_holder.id) == H5T_INTEGER)
{
- if (hdf5::H5Tget_sign(src_attr_dtype_id_holder.id) == H5T_SGN_NONE)
+ if (H5Tget_sign(src_attr_dtype_id_holder.id) == H5T_SGN_NONE)
{
unsigned long long tmp;
src_f.read(src_full_path, tmp);
dst_f.write_attribute(dst_full_path, tmp, src_attr_dtype_id_holder.id);
}
- else if (hdf5::H5Tget_sign(src_attr_dtype_id_holder.id) == H5T_SGN_2)
+ else if (H5Tget_sign(src_attr_dtype_id_holder.id) == H5T_SGN_2)
{
long long tmp;
src_f.read(src_full_path, tmp);
@@ -2267,17 +2263,17 @@ public:
throw Exception("error in H5Tget_sign");
}
}
- else if (hdf5::H5Tget_class(src_attr_dtype_id_holder.id) == H5T_FLOAT)
+ else if (H5Tget_class(src_attr_dtype_id_holder.id) == H5T_FLOAT)
{
long double tmp;
src_f.read(src_full_path, tmp);
dst_f.write_attribute(dst_full_path, tmp, src_attr_dtype_id_holder.id);
}
- else if (hdf5::H5Tget_class(src_attr_dtype_id_holder.id) == H5T_STRING)
+ else if (H5Tget_class(src_attr_dtype_id_holder.id) == H5T_STRING)
{
std::string tmp;
src_f.read(src_full_path, tmp);
- auto is_varlen = hdf5::H5Tis_variable_str(src_attr_dtype_id_holder.id);
+ auto is_varlen = H5Tis_variable_str(src_attr_dtype_id_holder.id);
if (is_varlen < 0) throw Exception("error in H5Tis_variable_str");
if (is_varlen)
{
@@ -2286,12 +2282,12 @@ public:
else
{
// not varlen; now deal with array-of-size-1 chars
- int sz = hdf5::H5Tget_size(src_attr_dtype_id_holder.id);
+ int sz = H5Tget_size(src_attr_dtype_id_holder.id);
if (sz == 0) throw Exception("error in H5Tget_size");
detail::HDF_Object_Holder src_attr_dspace_id_holder(
detail::Util::wrap(H5Aget_space, src_attr_id_holder.id),
detail::Util::wrapped_closer(H5Sclose));
- auto dspace_type = hdf5::H5Sget_simple_extent_type(src_attr_dspace_id_holder.id);
+ auto dspace_type = H5Sget_simple_extent_type(src_attr_dspace_id_holder.id);
if (dspace_type == H5S_SCALAR)
{
dst_f.write_attribute(dst_full_path, tmp, 0);
=====================================
src/hdf5-mod.cpp
=====================================
--- a/src/hdf5-mod.cpp
+++ b/src/hdf5-mod.cpp
@@ -12,7 +12,6 @@
#include <fast5/hdf5_tools.hpp>
using namespace std;
-using namespace hdf5;
struct B
{
View it on GitLab: https://salsa.debian.org/med-team/fast5/compare/2efdf41cdc398c86fbffe46d8e701b71a812dd06...6308fbfde60c51c3608ad262956fa55871afd48f
---
View it on GitLab: https://salsa.debian.org/med-team/fast5/compare/2efdf41cdc398c86fbffe46d8e701b71a812dd06...6308fbfde60c51c3608ad262956fa55871afd48f
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/debian-med-commit/attachments/20180218/e89a3a5b/attachment-0001.html>
More information about the debian-med-commit
mailing list