Bug#368974: Intent to NMU

[Enrico Zini]

Hello,

On Mon, Sep 18, 2006 at 11:13:54PM +0200, Josselin Mouette wrote:

> You'll get things in Debian faster if you make the package yourself.

Right.  Then, since I need this bug fixed in order to upload other
software I'm working on, I'll do an NMU.

Please find the patch attached.  If you don't reject it within a week,
I'll proceed with the upload.


Regards,

Enrico

-- 
GPG key: 1024D/797EBFAB 2000-12-05 Enrico Zini <[EMAIL PROTECTED]>

diff -Naur hdf5-1.6.5.orig/debian/changelog hdf5-1.6.5/debian/changelog
--- hdf5-1.6.5.orig/debian/changelog    2006-09-20 10:26:45.000000000 +0200
+++ hdf5-1.6.5/debian/changelog 2006-09-20 10:34:56.886668250 +0200
@@ -1,3 +1,9 @@
+hdf5 (1.6.5-2.1) unstable; urgency=low
+
+  * Added patch to fix CommonFG::getObjnameByIdx.  Closes: #368974
+
+ -- Enrico Zini <[EMAIL PROTECTED]>  Wed, 20 Sep 2006 10:34:22 +0200
+
 hdf5 (1.6.5-2) unstable; urgency=medium
 
   * config/gnu-flags: don't use -fomit-frame-pointer on m68k, to avoid 
diff -Naur hdf5-1.6.5.orig/debian/patches/10-getObjnameByIdx.dpatch 
hdf5-1.6.5/debian/patches/10-getObjnameByIdx.dpatch
--- hdf5-1.6.5.orig/debian/patches/10-getObjnameByIdx.dpatch    1970-01-01 
01:00:00.000000000 +0100
+++ hdf5-1.6.5/debian/patches/10-getObjnameByIdx.dpatch 2006-09-20 
10:39:54.353258750 +0200
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10-getObjnameByIdx.dpatch by  <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
[EMAIL PROTECTED]@
+diff -urNad hdf5-1.6.5~/c++/src/H5CommonFG.cpp 
hdf5-1.6.5/c++/src/H5CommonFG.cpp
+--- hdf5-1.6.5~/c++/src/H5CommonFG.cpp 2005-10-01 17:30:03.000000000 +0200
++++ hdf5-1.6.5/c++/src/H5CommonFG.cpp  2006-09-20 10:39:51.949108500 +0200
+@@ -898,8 +898,8 @@
+     }
+ 
+     // now, allocate C buffer to get the name
+-    char* name_C = new char[name_len];
+-    name_len = H5Gget_objname_by_idx(getLocId(), idx, name_C, name_len);
++    char* name_C = new char[name_len + 1];
++    name_len = H5Gget_objname_by_idx(getLocId(), idx, name_C, name_len + 1);
+ 
+     // clean up and return the string
+     string name = string(name_C);
diff -Naur hdf5-1.6.5.orig/debian/rules hdf5-1.6.5/debian/rules
--- hdf5-1.6.5.orig/debian/rules        2006-09-20 10:26:45.000000000 +0200
+++ hdf5-1.6.5/debian/rules     2006-09-20 10:38:26.959797000 +0200
@@ -111,7 +111,8 @@
        $(MAKE) -C debian/build-mpich/
        touch build-stamp-mpich
 
-clean:
+clean: clean-patched unpatch
+clean-patched:
        test -f debian/control.in
        dh_testroot
        -rm -rf debian/build-serial
@@ -121,6 +122,14 @@
        grep -v ^\% debian/control.in | sed "s/@VERSION@/$(version)/g" > 
debian/control
        dh_clean configure-stamp* build-stamp* install-stamp* debian/*.shlibs
 
+patch: patch-stamp
+patch-stamp:
+       dpatch apply-all
+       dpatch call-all -a=pkg-info > patch-stamp
+unpatch:
+       dpatch deapply-all
+       rm -rf patch-stamp debian/patched
+
 install: install-serial install-lam install-mpich install-doc
 
 install-serial: build-stamp-serial

signature.asc
Description: Digital signature