[Pkg-octave-commit] [SCM] Debian packaging for octave-fixed branch, master, updated. 0.7.10-1-23-g66fa395
Rafael Laboissiere
rafael at laboissiere.net
Thu Mar 29 20:37:16 UTC 2012
The following commit has been merged in the master branch:
commit 65e92ed5cf3961cc0f8608e8a6671c0b9cb0e111
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date: Thu Mar 29 19:43:27 2012 +0200
debian/patches/adjust-for-hdf5-1.8.patch: New patch
diff --git a/debian/patches/adjust-for-hdf5-1.8.patch b/debian/patches/adjust-for-hdf5-1.8.patch
new file mode 100644
index 0000000..2504695
--- /dev/null
+++ b/debian/patches/adjust-for-hdf5-1.8.patch
@@ -0,0 +1,418 @@
+Description: Make the package compile against HDF5 1.8
+Author: Rafael Laboissiere <rafael at laboissiere.net>
+Forwarded: http://permalink.gmane.org/gmane.comp.gnu.octave.devel/7227
+Last-Update: 2012-03-29
+
+--- octave-fixed-0.7.10.orig/src/ov-fixed.cc
++++ octave-fixed-0.7.10/src/ov-fixed.cc
+@@ -291,7 +291,7 @@ bool
+ octave_fixed::save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats)
+ {
+ hid_t group_hid = -1;
+- group_hid = H5Gcreate (loc_id, name, 0);
++ group_hid = H5Gcreate (loc_id, name, 0, H5P_DEFAULT, H5P_DEFAULT);
+ if (group_hid < 0 ) return false;
+
+ hsize_t dims[3];
+@@ -308,7 +308,7 @@ octave_fixed::save_hdf5 (hid_t loc_id, c
+ }
+
+ data_hid = H5Dcreate (group_hid, "int", H5T_NATIVE_UCHAR, space_hid,
+- H5P_DEFAULT);
++ H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+ if (data_hid < 0)
+ {
+ H5Sclose (space_hid);
+@@ -328,7 +328,7 @@ octave_fixed::save_hdf5 (hid_t loc_id, c
+ }
+
+ data_hid = H5Dcreate (group_hid, "dec", H5T_NATIVE_UCHAR, space_hid,
+- H5P_DEFAULT);
++ H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+ if (data_hid < 0)
+ {
+ H5Sclose (space_hid);
+@@ -348,7 +348,7 @@ octave_fixed::save_hdf5 (hid_t loc_id, c
+ }
+
+ data_hid = H5Dcreate (group_hid, "num", H5T_NATIVE_UINT, space_hid,
+- H5P_DEFAULT);
++ H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+ if (data_hid < 0)
+ {
+ H5Sclose (space_hid);
+@@ -374,10 +374,10 @@ octave_fixed::load_hdf5 (hid_t loc_id, c
+ hid_t group_hid, data_hid, space_id;
+ hsize_t rank;
+
+- group_hid = H5Gopen (loc_id, name);
++ group_hid = H5Gopen (loc_id, name, H5P_DEFAULT);
+ if (group_hid < 0 ) return false;
+
+- data_hid = H5Dopen (group_hid, "int");
++ data_hid = H5Dopen (group_hid, "int", H5P_DEFAULT);
+ space_id = H5Dget_space (data_hid);
+ rank = H5Sget_simple_extent_ndims (space_id);
+
+@@ -398,7 +398,7 @@ octave_fixed::load_hdf5 (hid_t loc_id, c
+
+
+ H5Dclose (data_hid);
+- data_hid = H5Dopen (group_hid, "dec");
++ data_hid = H5Dopen (group_hid, "dec", H5P_DEFAULT);
+ space_id = H5Dget_space (data_hid);
+ rank = H5Sget_simple_extent_ndims (space_id);
+
+@@ -418,7 +418,7 @@ octave_fixed::load_hdf5 (hid_t loc_id, c
+ }
+
+ H5Dclose (data_hid);
+- data_hid = H5Dopen (group_hid, "num");
++ data_hid = H5Dopen (group_hid, "num", H5P_DEFAULT);
+ space_id = H5Dget_space (data_hid);
+ rank = H5Sget_simple_extent_ndims (space_id);
+
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ octave-fixed (0.7.10-3) unstable; urgency=low
+ .
+ * debian/control:
+ - Remove Rafael Laboissiere from Uploaders (Closes: #571931)
+ - Remove Ólafur Jens Sigurðsson <ojsbug at gmail.com> from Uploaders
+ * Bump Standards-Version to 3.9.1, no changes needed
+ * Switch to dpkg-source 3.0 (quilt) format
+ * Update watch file to changed upstream location
+Author: Thomas Weber <tweber at debian.org>
+Bug-Debian: http://bugs.debian.org/571931
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- octave-fixed-0.7.10.orig/src/ov-fixed-mat.cc
++++ octave-fixed-0.7.10/src/ov-fixed-mat.cc
+@@ -574,7 +574,7 @@ bool
+ octave_fixed_matrix::save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats)
+ {
+ hid_t group_hid = -1;
+- group_hid = H5Gcreate (loc_id, name, 0);
++ group_hid = H5Gcreate (loc_id, name, 0, H5P_DEFAULT, H5P_DEFAULT);
+ if (group_hid < 0 ) return false;
+
+ dim_vector d = dims ();
+@@ -595,7 +595,7 @@ octave_fixed_matrix::save_hdf5 (hid_t lo
+ }
+
+ data_hid = H5Dcreate (group_hid, "int", H5T_NATIVE_UCHAR, space_hid,
+- H5P_DEFAULT);
++ H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+ if (data_hid < 0)
+ {
+ H5Sclose (space_hid);
+@@ -618,7 +618,7 @@ octave_fixed_matrix::save_hdf5 (hid_t lo
+ }
+
+ data_hid = H5Dcreate (group_hid, "dec", H5T_NATIVE_UCHAR, space_hid,
+- H5P_DEFAULT);
++ H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+ if (data_hid < 0)
+ {
+ H5Sclose (space_hid);
+@@ -640,7 +640,7 @@ octave_fixed_matrix::save_hdf5 (hid_t lo
+ }
+
+ data_hid = H5Dcreate (group_hid, "num", H5T_NATIVE_UINT, space_hid,
+- H5P_DEFAULT);
++ H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+ if (data_hid < 0)
+ {
+ H5Sclose (space_hid);
+@@ -668,10 +668,10 @@ octave_fixed_matrix::load_hdf5 (hid_t lo
+ hid_t group_hid, data_hid, space_id;
+ hsize_t rank, rank_old;
+
+- group_hid = H5Gopen (loc_id, name);
++ group_hid = H5Gopen (loc_id, name, H5P_DEFAULT);
+ if (group_hid < 0 ) return false;
+
+- data_hid = H5Dopen (group_hid, "int");
++ data_hid = H5Dopen (group_hid, "int", H5P_DEFAULT);
+ space_id = H5Dget_space (data_hid);
+ rank = H5Sget_simple_extent_ndims (space_id);
+ rank_old = rank;
+@@ -719,7 +719,7 @@ octave_fixed_matrix::load_hdf5 (hid_t lo
+ }
+ H5Dclose (data_hid);
+
+- data_hid = H5Dopen (group_hid, "dec");
++ data_hid = H5Dopen (group_hid, "dec", H5P_DEFAULT);
+ space_id = H5Dget_space (data_hid);
+ rank = H5Sget_simple_extent_ndims (space_id);
+
+@@ -766,7 +766,7 @@ octave_fixed_matrix::load_hdf5 (hid_t lo
+ }
+ H5Dclose (data_hid);
+
+- data_hid = H5Dopen (group_hid, "num");
++ data_hid = H5Dopen (group_hid, "num", H5P_DEFAULT);
+ space_id = H5Dget_space (data_hid);
+ rank = H5Sget_simple_extent_ndims (space_id);
+
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ octave-fixed (0.7.10-3) unstable; urgency=low
+ .
+ * debian/control:
+ - Remove Rafael Laboissiere from Uploaders (Closes: #571931)
+ - Remove Ólafur Jens Sigurðsson <ojsbug at gmail.com> from Uploaders
+ * Bump Standards-Version to 3.9.1, no changes needed
+ * Switch to dpkg-source 3.0 (quilt) format
+ * Update watch file to changed upstream location
+Author: Thomas Weber <tweber at debian.org>
+Bug-Debian: http://bugs.debian.org/571931
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- octave-fixed-0.7.10.orig/src/ov-fixed-complex.cc
++++ octave-fixed-0.7.10/src/ov-fixed-complex.cc
+@@ -349,7 +349,7 @@ octave_fixed_complex::save_hdf5 (hid_t l
+ bool save_as_floats)
+ {
+ hid_t group_hid = -1;
+- group_hid = H5Gcreate (loc_id, name, 0);
++ group_hid = H5Gcreate (loc_id, name, 0, H5P_DEFAULT, H5P_DEFAULT);
+ if (group_hid < 0 ) return false;
+
+ hsize_t dims[3];
+@@ -371,7 +371,8 @@ octave_fixed_complex::save_hdf5 (hid_t l
+ return false;
+ }
+
+- data_hid = H5Dcreate (group_hid, "int", type_hid, space_hid, H5P_DEFAULT);
++ data_hid = H5Dcreate (group_hid, "int", type_hid, space_hid, H5P_DEFAULT,
++ H5P_DEFAULT, H5P_DEFAULT);
+ if (data_hid < 0)
+ {
+ H5Sclose (space_hid);
+@@ -395,7 +396,8 @@ octave_fixed_complex::save_hdf5 (hid_t l
+ return false;
+ }
+
+- data_hid = H5Dcreate (group_hid, "dec", type_hid, space_hid, H5P_DEFAULT);
++ data_hid = H5Dcreate (group_hid, "dec", type_hid, space_hid, H5P_DEFAULT,
++ H5P_DEFAULT, H5P_DEFAULT);
+ if (data_hid < 0)
+ {
+ H5Sclose (space_hid);
+@@ -427,7 +429,8 @@ octave_fixed_complex::save_hdf5 (hid_t l
+ return false;
+ }
+
+- data_hid = H5Dcreate (group_hid, "num", type_hid, space_hid, H5P_DEFAULT);
++ data_hid = H5Dcreate (group_hid, "num", type_hid, space_hid, H5P_DEFAULT,
++ H5P_DEFAULT, H5P_DEFAULT);
+ if (data_hid < 0)
+ {
+ H5Sclose (space_hid);
+@@ -458,12 +461,12 @@ octave_fixed_complex::load_hdf5 (hid_t l
+ hid_t group_hid, data_hid, type_hid, space_id;
+ hsize_t rank;
+
+- group_hid = H5Gopen (loc_id, name);
++ group_hid = H5Gopen (loc_id, name, H5P_DEFAULT);
+ if (group_hid < 0 ) return false;
+
+ hid_t complex_type = hdf5_make_fixed_complex_type (H5T_NATIVE_UCHAR, 1);
+
+- data_hid = H5Dopen (group_hid, "int");
++ data_hid = H5Dopen (group_hid, "int", H5P_DEFAULT);
+ type_hid = H5Dget_type (data_hid);
+
+ if (! hdf5_types_compatible (type_hid, complex_type))
+@@ -499,7 +502,7 @@ octave_fixed_complex::load_hdf5 (hid_t l
+
+ H5Tclose(type_hid);
+ H5Dclose (data_hid);
+- data_hid = H5Dopen (group_hid, "dec");
++ data_hid = H5Dopen (group_hid, "dec", H5P_DEFAULT);
+ type_hid = H5Dget_type (data_hid);
+
+ if (! hdf5_types_compatible (type_hid, complex_type))
+@@ -539,7 +542,7 @@ octave_fixed_complex::load_hdf5 (hid_t l
+
+ complex_type = hdf5_make_fixed_complex_type (H5T_NATIVE_UINT,
+ sizeof(unsigned int));
+- data_hid = H5Dopen (group_hid, "num");
++ data_hid = H5Dopen (group_hid, "num", H5P_DEFAULT);
+ type_hid = H5Dget_type (data_hid);
+
+ if (! hdf5_types_compatible (type_hid, complex_type))
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ octave-fixed (0.7.10-3) unstable; urgency=low
+ .
+ * debian/control:
+ - Remove Rafael Laboissiere from Uploaders (Closes: #571931)
+ - Remove Ólafur Jens Sigurðsson <ojsbug at gmail.com> from Uploaders
+ * Bump Standards-Version to 3.9.1, no changes needed
+ * Switch to dpkg-source 3.0 (quilt) format
+ * Update watch file to changed upstream location
+Author: Thomas Weber <tweber at debian.org>
+Bug-Debian: http://bugs.debian.org/571931
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- octave-fixed-0.7.10.orig/src/ov-fixed-cx-mat.cc
++++ octave-fixed-0.7.10/src/ov-fixed-cx-mat.cc
+@@ -616,7 +616,7 @@ octave_fixed_complex_matrix::save_hdf5 (
+ bool save_as_floats)
+ {
+ hid_t group_hid = -1;
+- group_hid = H5Gcreate (loc_id, name, 0);
++ group_hid = H5Gcreate (loc_id, name, 0, H5P_DEFAULT, H5P_DEFAULT);
+ if (group_hid < 0 ) return false;
+
+ dim_vector d = dims ();
+@@ -644,7 +644,8 @@ octave_fixed_complex_matrix::save_hdf5 (
+ return false;
+ }
+
+- data_hid = H5Dcreate (group_hid, "int", type_hid, space_hid, H5P_DEFAULT);
++ data_hid = H5Dcreate (group_hid, "int", type_hid, space_hid, H5P_DEFAULT,
++ H5P_DEFAULT, H5P_DEFAULT);
+ if (data_hid < 0)
+ {
+ H5Sclose (space_hid);
+@@ -707,7 +708,8 @@ octave_fixed_complex_matrix::save_hdf5 (
+ return false;
+ }
+
+- data_hid = H5Dcreate (group_hid, "num", type_hid, space_hid, H5P_DEFAULT);
++ data_hid = H5Dcreate (group_hid, "num", type_hid, space_hid, H5P_DEFAULT,
++ H5P_DEFAULT, H5P_DEFAULT);
+ if (data_hid < 0)
+ {
+ H5Sclose (space_hid);
+@@ -740,13 +742,13 @@ octave_fixed_complex_matrix::load_hdf5 (
+ hid_t group_hid, data_hid, space_id, type_hid;
+ hsize_t rank, rank_old;
+
+- group_hid = H5Gopen (loc_id, name);
++ group_hid = H5Gopen (loc_id, name, H5P_DEFAULT);
+ if (group_hid < 0 ) return false;
+
+ hid_t complex_type = hdf5_make_fixed_complex_type (H5T_NATIVE_UINT,
+ sizeof(unsigned int));
+
+- data_hid = H5Dopen (group_hid, "int");
++ data_hid = H5Dopen (group_hid, "int", H5P_DEFAULT);
+ type_hid = H5Dget_type (data_hid);
+
+ if (! hdf5_types_compatible (type_hid, complex_type))
+@@ -810,7 +812,7 @@ octave_fixed_complex_matrix::load_hdf5 (
+ H5Tclose(type_hid);
+ H5Dclose (data_hid);
+
+- data_hid = H5Dopen (group_hid, "dec");
++ data_hid = H5Dopen (group_hid, "dec", H5P_DEFAULT);
+ type_hid = H5Dget_type (data_hid);
+
+ if (! hdf5_types_compatible (type_hid, complex_type))
+@@ -875,7 +877,7 @@ octave_fixed_complex_matrix::load_hdf5 (
+ H5Tclose(type_hid);
+ H5Dclose (data_hid);
+
+- data_hid = H5Dopen (group_hid, "num");
++ data_hid = H5Dopen (group_hid, "num", H5P_DEFAULT);
+ type_hid = H5Dget_type (data_hid);
+
+ if (! hdf5_types_compatible (type_hid, complex_type))
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ octave-fixed (0.7.10-3) unstable; urgency=low
+ .
+ * debian/control:
+ - Remove Rafael Laboissiere from Uploaders (Closes: #571931)
+ - Remove Ólafur Jens Sigurðsson <ojsbug at gmail.com> from Uploaders
+ * Bump Standards-Version to 3.9.1, no changes needed
+ * Switch to dpkg-source 3.0 (quilt) format
+ * Update watch file to changed upstream location
+Author: Thomas Weber <tweber at debian.org>
+Bug-Debian: http://bugs.debian.org/571931
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- octave-fixed-0.7.10.orig/src/ov-fixed-cx-mat.cc
++++ octave-fixed-0.7.10/src/ov-fixed-cx-mat.cc
+@@ -672,7 +672,8 @@ octave_fixed_complex_matrix::save_hdf5 (
+ return false;
+ }
+
+- data_hid = H5Dcreate (group_hid, "dec", type_hid, space_hid, H5P_DEFAULT);
++ data_hid = H5Dcreate (group_hid, "dec", type_hid, space_hid, H5P_DEFAULT,
++ H5P_DEFAULT, H5P_DEFAULT);
+ if (data_hid < 0)
+ {
+ H5Sclose (space_hid);
diff --git a/debian/patches/series b/debian/patches/series
index bbe5071..31f6f61 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
build-with-3.2
install-info-files
adjust-for-octave-3.6.patch
+adjust-for-hdf5-1.8.patch
--
Debian packaging for octave-fixed
More information about the Pkg-octave-commit
mailing list