[nexus] 01/01: Fix patch hdf5-1.10-support.patch

Gilles Filippini pini at debian.org
Thu Nov 2 08:26:15 UTC 2017


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

pini pushed a commit to branch master
in repository nexus.

commit 73e411241428ac6aa0b9dc6b64b482cfc88ddcbb
Author: Gilles Filippini <pini at debian.org>
Date:   Thu Nov 2 01:27:32 2017 +0100

    Fix patch hdf5-1.10-support.patch
    
    NexusFile5::iVref is hid_t.
---
 debian/changelog                       |  9 +++++++--
 debian/patches/hdf5-1.10-support.patch | 13 +++++++++----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 422b7c9..ec074f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,15 @@
-nexus (4.3.2-svn1921-6) UNRELEASED; urgency=medium
+nexus (4.3.2-svn1921-6) unstable; urgency=medium
 
   * Team upload
+
+  [ Andreas Tille ]
   * Switch Build-Depends from libhdf4g-dev to libhdf4-dev
     Closes: #866925
 
- -- Andreas Tille <tille at debian.org>  Sat, 26 Aug 2017 23:43:29 +0200
+  [ Gilles Filippini ]
+  * Fix patch hdf5-1.10-support.patch (closes: #861736)
+
+ -- Gilles Filippini <pini at debian.org>  Wed, 01 Nov 2017 19:30:46 +0100
 
 nexus (4.3.2-svn1921-5) unstable; urgency=medium
 
diff --git a/debian/patches/hdf5-1.10-support.patch b/debian/patches/hdf5-1.10-support.patch
index e496327..1dbf887 100644
--- a/debian/patches/hdf5-1.10-support.patch
+++ b/debian/patches/hdf5-1.10-support.patch
@@ -1,11 +1,16 @@
 Description: HDF5 1.10.x uses 64 bit handles. They're not int anymore.
 Author: Gilles Filippini <pini at debian.org>
 Bug-Debian: https://bugs.debian.org/861736
-Index: nexus-4.3.2-svn1921/src/napi5.c
+Index: nexus/src/napi5.c
 ===================================================================
---- nexus-4.3.2-svn1921.orig/src/napi5.c
-+++ nexus-4.3.2-svn1921/src/napi5.c
-@@ -54,12 +54,12 @@ extern  void *NXpData;
+--- nexus.orig/src/napi5.c
++++ nexus/src/napi5.c
+@@ -50,16 +50,16 @@ extern  void *NXpData;
+   typedef struct __NexusFile5 {
+         struct iStack5 {
+           char irefn[1024];
+-          int iVref;
++          hid_t iVref;
            hsize_t iCurrentIDX;
          } iStack5[NXMAXSTACK];
          struct iStack5 iAtt5;

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



More information about the debian-science-commits mailing list