[petsc] 01/02: Fix missing declaration (found when compiling gmsh with g++-4.8)

[Christophe Trophime]

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

trophime-guest pushed a commit to branch master
in repository petsc.

commit bbd895bc3950fde2c3b52511e4850f3b147b5302
Author: Christophe Trophime <christrophime at googlemail.com>
Date:   Wed Sep 18 11:07:54 2013 +0200

    Fix missing declaration (found when compiling gmsh with g++-4.8)
    
    Conflicts:
    	debian/changelog
---
 debian/changelog             |   32 ++++++++++++++++++++++++++++++++
 debian/patches/g++-4.8.patch |   16 ++++++++++++++++
 debian/patches/series        |    1 +
 3 files changed, 49 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index dfcab8f..c96b582 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,35 @@
+<<<<<<< HEAD
+=======
+petsc (3.4.2.dfsg-3) unstable; urgency=low
+
+  * Add g++-4.8.patch (fix missing declarations) 
+
+ -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>  Wed, 18 Sep 2013 11:07:00 +0200
+
+petsc (3.4.2.dfsg-2) unstable; urgency=low
+
+  * debian/rules:
+    - add pastix support
+    - add superlu support
+    - add superlu-dist support
+    - add elemental support
+    - add hypre 2.9.1a support
+  * debian/control:
+    - change libphypre-dev min version
+    - add libpastix-dev to Build-Depends
+    - add libsuperlu4-dev to Build-Depends
+    - add libsuperlu-dist-dev to Build-Depends
+    - add libelemental-dev to Build-Depends
+    
+    [Roland Stigge]
+    - add powerpcspe to build arches to (Closes: #706344)
+    
+  * debian/copyright:
+    - rewritte (Closes: #722979)
+
+ -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>  Mon, 16 Sep 2013 08:10:39 +0200
+
+>>>>>>> 9e348e2... Fix missing declaration (found when compiling gmsh with g++-4.8)
 petsc (3.4.2.dfsg-1) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/patches/g++-4.8.patch b/debian/patches/g++-4.8.patch
new file mode 100644
index 0000000..717225d
--- /dev/null
+++ b/debian/patches/g++-4.8.patch
@@ -0,0 +1,16 @@
+Fix missing declaration
+
+Index: petsc-3.4.2/src/mat/impls/aij/seq/umfpack/umfpack.c
+===================================================================
+--- petsc-3.4.2.orig/include/petscsys.h
++++ petsc-3.4.2/include/petscsys.h
+@@ -14,6 +14,9 @@
+ #include <petscconf.h>
+ #include <petscfix.h>
+ 
++/* Fix missing memcpy declaration */
++#include <string.h>
++
+ #if defined(PETSC_DESIRE_FEATURE_TEST_MACROS)
+ /*
+    Feature test macros must be included before headers defined by IEEE Std 1003.1-2001
diff --git a/debian/patches/series b/debian/patches/series
index ab1063e..fe3abec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ clean-no-double-colon.patch
 hypre.patch
 nocleanup.patch
 umfpack.patch
+g++-4.8.patch

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