[Pkg-octave-commit] [octave-mpi] 01/03: octave4.0.patch: new patch, fixes FTBFS against Octave 4.0.

[Sébastien Villemot]

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

sebastien pushed a commit to branch master
in repository octave-mpi.

commit c20c6ca0f679994b48b1cf10cd781ac8311443dd
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Fri Jul 31 11:05:27 2015 +0200

    octave4.0.patch: new patch, fixes FTBFS against Octave 4.0.
    
    Closes: #792877
---
 debian/patches/octave4.0.patch | 43 ++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series          |  1 +
 2 files changed, 44 insertions(+)

diff --git a/debian/patches/octave4.0.patch b/debian/patches/octave4.0.patch
new file mode 100644
index 0000000..f7ad036
--- /dev/null
+++ b/debian/patches/octave4.0.patch
@@ -0,0 +1,43 @@
+Description: Fix FTBFS against Octave 4.0
+Origin: upstream, https://savannah.gnu.org/bugs/download.php?file_id=34167
+Bug: https://savannah.gnu.org/bugs/?func=detailitem&item_id=45258
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=792877
+Reviewed-by: Sébastien Villemot <sebastien at debian.org>
+Last-Update: 2015-07-31
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+diff --git a/src/simple.h b/src/simple.h
+--- a/src/simple.h
++++ b/src/simple.h
+@@ -39,12 +39,12 @@
+   
+   const std::string name;
+   MPI_Comm Comm_Value;
+-  DECLARE_OCTAVE_ALLOCATOR;
++  //DECLARE_OCTAVE_ALLOCATOR;
+   DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA;
+   
+ };
+ 
+-DEFINE_OCTAVE_ALLOCATOR (simple);
++//DEFINE_OCTAVE_ALLOCATOR (simple);
+ DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (simple, "simple", "simple");
+ 
+ static bool simple_type_loaded = false;
+diff --git a/src/simpleop.h b/src/simpleop.h
+--- a/src/simpleop.h
++++ b/src/simpleop.h
+@@ -56,11 +56,11 @@
+ private:
+   const std::string name;
+   MPI_Op Op_Value;
+-  DECLARE_OCTAVE_ALLOCATOR
++  //DECLARE_OCTAVE_ALLOCATOR
+   DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA
+ };
+ 
+-DEFINE_OCTAVE_ALLOCATOR (simpleop);
++//DEFINE_OCTAVE_ALLOCATOR (simpleop);
+ DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (simpleop, "simpleop", "simpleop");
+ 
+ static bool simpleop_type_loaded = false;
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..dd7265a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+octave4.0.patch

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave-mpi.git