[Pkg-octave-commit] [SCM] Debian packaging for octave-fixed branch, master, updated. debian/0.7.10-4-1-g2243e8a

[Rafael Laboissiere]

The following commit has been merged in the master branch:
commit 2243e8aedb2176382146caee14611d7faecf5552
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Tue Apr 3 17:52:41 2012 +0200

    Fix screwed up patch
    
    Git-Dch: Ignore

diff --git a/debian/patches/adjust-for-hdf5-1.8.patch b/debian/patches/adjust-for-hdf5-1.8.patch
index 2504695..c5737da 100644
--- a/debian/patches/adjust-for-hdf5-1.8.patch
+++ b/debian/patches/adjust-for-hdf5-1.8.patch
@@ -329,6 +329,16 @@ Last-Update: <YYYY-MM-DD>
    if (data_hid < 0) 
      {
        H5Sclose (space_hid);
+@@ -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);
 @@ -707,7 +708,8 @@ octave_fixed_complex_matrix::save_hdf5 (
        return false;
      }
@@ -373,46 +383,3 @@ Last-Update: <YYYY-MM-DD>
    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);

-- 
Debian packaging for octave-fixed