[petsc] 01/01: Imported Debian patch 3.6.3.dfsg2-4.1

Mattia Rizzolo mattia at debian.org
Fri Apr 22 12:38:00 UTC 2016


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

mattia pushed a commit to branch master
in repository petsc.

commit 543e3ac4aa7dae7cd4a71b3498e40554ce48b021
Author: Tobias Frost <tobi at debian.org>
Date:   Fri Apr 22 07:18:20 2016 +0200

    Imported Debian patch 3.6.3.dfsg2-4.1
---
 debian/changelog          |  7 +++++++
 debian/patches/hurd.patch | 13 +++++++++++++
 debian/patches/series     |  1 +
 3 files changed, 21 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index db77e0b..092a902 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+petsc (3.6.3.dfsg2-4.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBS on hurd by conditionally include mach/std_types.h (Closes: #822214)
+
+ -- Tobias Frost <tobi at debian.org>  Fri, 22 Apr 2016 07:18:20 +0200
+
 petsc (3.6.3.dfsg2-4) unstable; urgency=medium
 
   * Update debug alternatives at configure stage.
diff --git a/debian/patches/hurd.patch b/debian/patches/hurd.patch
new file mode 100644
index 0000000..47e96e4
--- /dev/null
+++ b/debian/patches/hurd.patch
@@ -0,0 +1,13 @@
+--- a/src/sys/memory/mem.c
++++ b/src/sys/memory/mem.c
+@@ -21,6 +21,9 @@
+ #include <sys/resource.h>
+ #endif
+ #if defined(PETSC_HAVE_SYS_PROCFS_H)
++#if defined __gnu_hurd__
++#include <mach/std_types.h>
++#endif
+ /* #include <sys/int_types.h> Required if using gcc on solaris 2.6 */
+ #include <sys/procfs.h>
+ #endif
+
diff --git a/debian/patches/series b/debian/patches/series
index bf89d3d..406df48 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@ g++-4.8.patch
 python_header
 soname_extension
 install_python_RDict_upstream_5a4feeed41cb1af9234d439bb06ea004d3cfa5c6
+hurd.patch

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



More information about the debian-science-commits mailing list