[scotch] 01/03: include_headers.patch: include scotch.h in [par]metis.h

[Drew Parsons]

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

dparsons pushed a commit to tag debian/6.0.4.dfsg1-4
in repository scotch.

commit 52ca11b331a4003054135d8940e95eac57a0cec3
Author: Drew Parsons <dparsons at debian.org>
Date:   Fri Nov 17 00:58:34 2017 +0800

    include_headers.patch: include scotch.h in [par]metis.h
    
    to define SCOTCH_Num.
    
    Rename correct-ptscotch-header.patch as include_headers.patch:
---
 debian/changelog                             |  8 +++++
 debian/patches/correct-ptscotch-header.patch | 36 -------------------
 debian/patches/include_headers.patch         | 54 ++++++++++++++++++++++++++++
 debian/patches/series                        |  2 +-
 4 files changed, 63 insertions(+), 37 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f3299af..ace9236 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+scotch (6.0.4.dfsg1-4) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Rename correct-ptscotch-header.patch as include_headers.patch:
+    include scotch.h in [par]metis.h to define SCOTCH_Num.
+
+ -- Drew Parsons <dparsons at debian.org>  Fri, 17 Nov 2017 00:56:50 +0800
+
 scotch (6.0.4.dfsg1-3) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/correct-ptscotch-header.patch b/debian/patches/correct-ptscotch-header.patch
deleted file mode 100644
index ae6887b..0000000
--- a/debian/patches/correct-ptscotch-header.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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.
- .
- scotch (6.0.4.dfsg-2.1) unstable; urgency=medium
- .
-   * rebuild against openmpi 2.0.2
-Author: Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>
-
----
-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: https://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: 2017-03-31
-
---- scotch-6.0.4.dfsg.orig/src/libscotch/library_pt.h
-+++ scotch-6.0.4.dfsg/src/libscotch/library_pt.h
-@@ -75,6 +75,8 @@
- 
- /*+ Parallel processing flag. +*/
- 
-+#include <mpi.h>
-+
- #ifndef SCOTCH_PTSCOTCH
- #define SCOTCH_DUMMYPTFLAG
- #endif /* SCOTCH_PTSCOTCH */
diff --git a/debian/patches/include_headers.patch b/debian/patches/include_headers.patch
new file mode 100644
index 0000000..6ea3952
--- /dev/null
+++ b/debian/patches/include_headers.patch
@@ -0,0 +1,54 @@
+Description: include headers
+ Certain headers are missing, which prevents successful builds under
+ gcc 7 or when emulating parmetis
+---
+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: https://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: 2017-03-31
+
+Index: scotch/src/libscotch/library_pt.h
+===================================================================
+--- scotch.orig/src/libscotch/library_pt.h
++++ scotch/src/libscotch/library_pt.h
+@@ -75,6 +75,8 @@
+ 
+ /*+ Parallel processing flag. +*/
+ 
++#include <mpi.h>
++
+ #ifndef SCOTCH_PTSCOTCH
+ #define SCOTCH_DUMMYPTFLAG
+ #endif /* SCOTCH_PTSCOTCH */
+Index: scotch/src/libscotchmetis/parmetis.h
+===================================================================
+--- scotch.orig/src/libscotchmetis/parmetis.h
++++ scotch/src/libscotchmetis/parmetis.h
+@@ -67,6 +67,7 @@
+ #define __parmetis_h__
+ 
+ #include <mpi.h>                                  /* Since ParMeTiS does it, do it too */
++#include <scotch.h>                               /* define SCOTCH_Num */
+ 
+ #endif /* __parmetis_h__ */
+ 
+Index: scotch/src/libscotchmetis/metis.h
+===================================================================
+--- scotch.orig/src/libscotchmetis/metis.h
++++ scotch/src/libscotchmetis/metis.h
+@@ -59,6 +59,8 @@
+ /**                                                        **/
+ /************************************************************/
+ 
++#include <scotch.h>                /* define SCOTCH_Num */
++
+ /*
+ **  The defines.
+ */
diff --git a/debian/patches/series b/debian/patches/series
index 1288872..a22d2fc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
 build-fixes.patch
 metis-header.patch
 #format-security.patch
-correct-ptscotch-header.patch
+include_headers.patch
 man_gpart_gman.patch

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