[p4est] 02/02: Fix arch-dependent p4est_config.h, update changelog

[Matthias Maier]

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

tamiko-guest pushed a commit to branch master
in repository p4est.

commit 5fa8ef8607a84cb622a870e24fbe309b33150a03
Author: Matthias Maier <tamiko+DEBIAN at kyomu.43-1.org>
Date:   Wed Nov 16 05:27:50 2016 +0000

    Fix arch-dependent p4est_config.h, update changelog
---
 debian/changelog                                   |  7 +++
 .../do_not_export_arch_dependent_config_h_2.patch  | 60 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 68 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9e7b751..471001f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+p4est (1.1-4) UNRELEASED; urgency=medium
+
+  * remove failing loadsave tests (Closes: #837058)
+  * Fix arch-dependent p4est_config.h v2 (Closes: #837390)
+
+ -- Matthias Maier <tamiko+DEBIAN at kyomu.43-1.org>  Mon, 05 Dec 2016 20:14:58 +0000
+
 p4est (1.1-3) unstable; urgency=medium
 
   * Add build-dependency on mpi-default-bin needed by openmpi 2
diff --git a/debian/patches/do_not_export_arch_dependent_config_h_2.patch b/debian/patches/do_not_export_arch_dependent_config_h_2.patch
new file mode 100644
index 0000000..859d0ac
--- /dev/null
+++ b/debian/patches/do_not_export_arch_dependent_config_h_2.patch
@@ -0,0 +1,60 @@
+diff --git a/configure.ac b/configure.ac
+index 485edbd..d2657ee 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -76,13 +76,13 @@ AC_SUBST([P4EST_DISTCLEAN])
+ 
+ # Print summary.
+ 
+-AC_DEFINE_UNQUOTED(CPP,         ["${CPP}"],         [C preprocessor])
+-AC_DEFINE_UNQUOTED(CPPFLAGS,    ["${CPPFLAGS}"],    [C preprocessor flags])
+-AC_DEFINE_UNQUOTED(CC,          ["${CC}"],          [C compiler])
++AC_DEFINE_UNQUOTED(CPP,         [""], [C preprocessor])
++AC_DEFINE_UNQUOTED(CPPFLAGS,    [""], [C preprocessor flags])
++AC_DEFINE_UNQUOTED(CC,          [""], [C compiler])
+ dnl AC_DEFINE_UNQUOTED(C_VERSION,   ["${C_VERSION}"],   [C compiler version])
+-AC_DEFINE_UNQUOTED(CFLAGS,      ["${CFLAGS}"],      [C compiler flags])
+-AC_DEFINE_UNQUOTED(LDFLAGS,     ["${LDFLAGS}"],     [Linker flags])
+-AC_DEFINE_UNQUOTED(LIBS,        ["${LIBS}"],        [Libraries])
++AC_DEFINE_UNQUOTED(CFLAGS,      [""], [C compiler flags])
++AC_DEFINE_UNQUOTED(LDFLAGS,     [""], [Linker flags])
++AC_DEFINE_UNQUOTED(LIBS,        [""], [Libraries])
+ 
+ echo "o----------------------------------"
+ echo "| Results for p4est are"
+diff --git a/sc/configure.ac b/sc/configure.ac
+index 11c4f52..4f2b745 100644
+--- a/sc/configure.ac
++++ b/sc/configure.ac
+@@ -86,19 +86,19 @@ AC_TYPE_SSIZE_T
+ 
+ # Print summary.
+ 
+-AC_DEFINE_UNQUOTED(F77,         ["${F77}"],         [F77 compiler])
+-AC_DEFINE_UNQUOTED(FFLAGS,      ["${FFLAGS}"],      [F77 compiler flags])
+-AC_DEFINE_UNQUOTED(FC,          ["${FC}"],          [FC compiler])
+-AC_DEFINE_UNQUOTED(FCFLAGS,     ["${FCFLAGS}"],     [FC compiler flags])
+-AC_DEFINE_UNQUOTED(CPP,         ["${CPP}"],         [C preprocessor])
+-AC_DEFINE_UNQUOTED(CPPFLAGS,    ["${CPPFLAGS}"],    [C preprocessor flags])
+-AC_DEFINE_UNQUOTED(CC,          ["${CC}"],          [C compiler])
++AC_DEFINE_UNQUOTED(F77,         [""], [F77 compiler])
++AC_DEFINE_UNQUOTED(FFLAGS,      [""], [F77 compiler flags])
++AC_DEFINE_UNQUOTED(FC,          [""], [FC compiler])
++AC_DEFINE_UNQUOTED(FCFLAGS,     [""], [FC compiler flags])
++AC_DEFINE_UNQUOTED(CPP,         [""], [C preprocessor])
++AC_DEFINE_UNQUOTED(CPPFLAGS,    [""], [C preprocessor flags])
++AC_DEFINE_UNQUOTED(CC,          [""], [C compiler])
+ dnl AC_DEFINE_UNQUOTED(C_VERSION,   ["${C_VERSION}"],   [C compiler version])
+-AC_DEFINE_UNQUOTED(CFLAGS,      ["${CFLAGS}"],      [C compiler flags])
+-AC_DEFINE_UNQUOTED(CXX,         ["${CXX}"],         [CXX compiler])
+-AC_DEFINE_UNQUOTED(CXXFLAGS,    ["${CXXFLAGS}"],    [CXX compiler flags])
+-AC_DEFINE_UNQUOTED(LDFLAGS,     ["${LDFLAGS}"],     [Linker flags])
+-AC_DEFINE_UNQUOTED(LIBS,        ["${LIBS}"],        [Libraries])
++AC_DEFINE_UNQUOTED(CFLAGS,      [""], [C compiler flags])
++AC_DEFINE_UNQUOTED(CXX,         [""], [CXX compiler])
++AC_DEFINE_UNQUOTED(CXXFLAGS,    [""], [CXX compiler flags])
++AC_DEFINE_UNQUOTED(LDFLAGS,     [""], [Linker flags])
++AC_DEFINE_UNQUOTED(LIBS,        [""], [Libraries])
+ dnl AC_DEFINE_UNQUOTED(BLAS_LIBS,   ["${BLAS_LIBS}"],   [BLAS libraries])
+ dnl AC_DEFINE_UNQUOTED(LAPACK_LIBS, ["${LAPACK_LIBS}"], [LAPACK libraries])
+ dnl AC_DEFINE_UNQUOTED(FLIBS,       ["${FLIBS}"],       [Fortran libraries])
diff --git a/debian/patches/series b/debian/patches/series
index 4ddc620..5401582 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 do_not_declare_library_dirty.patch
 do_not_export_arch_dependent_config_h.patch
+do_not_export_arch_dependent_config_h_2.patch
 remove_loadsave_tests.patch

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