[deal.ii] 03/03: Update debian files for 8.4.2, drop obsolete patches
Matthias Maier
tamiko-guest at moszumanska.debian.org
Sat Sep 3 02:33:17 UTC 2016
This is an automated email from the git hooks/post-receive script.
tamiko-guest pushed a commit to branch master
in repository deal.ii.
commit 7aaa2a99c08ca433b51d1dcb3f698d11451e16f9
Author: Matthias Maier <tamiko at 43-1.org>
Date: Sat Sep 3 02:27:45 2016 +0000
Update debian files for 8.4.2, drop obsolete patches
---
debian/changelog | 7 +
debian/control | 4 +-
...l.ii-8.4.1.install => libdeal.ii-8.4.2.install} | 0
debian/patches/petsc_3.7.0.patch | 162 ---------------------
debian/patches/series | 2 -
debian/patches/use_fPIC_instead_of_fpic.patch | 13 --
debian/rules | 2 +-
7 files changed, 10 insertions(+), 180 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 15d3bbd..c9eba73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+deal.ii (8.4.2-1) UNRELEASED; urgency=medium
+
+ * New upstream release
+ * Drop obsolete patches
+
+ -- Matthias Maier <tamiko+DEBIAN at kyomu.43-1.org> Sat, 03 Sep 2016 02:23:54 +0000
+
deal.ii (8.4.1-3) unstable; urgency=medium
* Limit parallel builds to 2 processes
diff --git a/debian/control b/debian/control
index 8a702cc..4d57af0 100644
--- a/debian/control
+++ b/debian/control
@@ -47,7 +47,7 @@ Depends: libarpack2-dev,
libboost-system-dev,
libboost-thread-dev,
libbz2-dev,
- libdeal.ii-8.4.1 (= ${binary:Version}),
+ libdeal.ii-8.4.2 (= ${binary:Version}),
libgsl-dev,
libhdf5-dev,
libhdf5-mpi-dev,
@@ -77,7 +77,7 @@ Description: Differential Equations Analysis Library - development files
.
This package contains the development files.
-Package: libdeal.ii-8.4.1
+Package: libdeal.ii-8.4.2
Architecture: any
Multi-Arch: same
Depends: ${misc:Depends}, ${shlibs:Depends}
diff --git a/debian/libdeal.ii-8.4.1.install b/debian/libdeal.ii-8.4.2.install
similarity index 100%
rename from debian/libdeal.ii-8.4.1.install
rename to debian/libdeal.ii-8.4.2.install
diff --git a/debian/patches/petsc_3.7.0.patch b/debian/patches/petsc_3.7.0.patch
deleted file mode 100644
index 6d96e58..0000000
--- a/debian/patches/petsc_3.7.0.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-From b31f9715d09aea1a1a97a48cfbe4ef86baf59b8a Mon Sep 17 00:00:00 2001
-From: David Wells <wellsd2 at rpi.edu>
-Date: Thu, 7 Jul 2016 05:50:59 -0400
-Subject: [PATCH] Fix compilation with PETSc 3.7.0.
-
----
- include/deal.II/lac/petsc_compatibility.h | 55 +++++++++++++++++++++++++++++++
- source/lac/petsc_precondition.cc | 43 ++++++++++++------------
- 5 files changed, 94 insertions(+), 30 deletions(-)
- create mode 100644 include/deal.II/lac/petsc_compatibility.h
-
---- /dev/null
-+++ b/include/deal.II/lac/petsc_compatibility.h
-@@ -0,0 +1,55 @@
-+// ---------------------------------------------------------------------
-+//
-+// Copyright (C) 2016 by the deal.II authors
-+//
-+// This file is part of the deal.II library.
-+//
-+// The deal.II library is free software; you can use it, redistribute
-+// it, and/or modify it under the terms of the GNU Lesser General
-+// Public License as published by the Free Software Foundation; either
-+// version 2.1 of the License, or (at your option) any later version.
-+// The full text of the license can be found in the file LICENSE at
-+// the top level of the deal.II distribution.
-+//
-+// ---------------------------------------------------------------------
-+
-+/*
-+ * Rather than using ifdefs everywhere, try to wrap older versions of PETSc
-+ * functions in one place.
-+ */
-+#ifndef dealii__petsc_compatibility_h
-+#define dealii__petsc_compatibility_h
-+
-+#include <deal.II/base/config.h>
-+
-+#ifdef DEAL_II_WITH_PETSC
-+
-+#include <petscconf.h>
-+#include <petscpc.h>
-+
-+#include <string>
-+
-+DEAL_II_NAMESPACE_OPEN
-+
-+namespace PETScWrappers
-+{
-+ /**
-+ * Set an option in the global PETSc database. This function just wraps
-+ * PetscOptionsSetValue with a version check (the signature of this function
-+ * changed in PETSc 3.7.0).
-+ */
-+ inline void set_option_value (const std::string &name,
-+ const std::string &value)
-+ {
-+#if DEAL_II_PETSC_VERSION_LT(3, 7, 0)
-+ PetscOptionsSetValue (name.c_str (), value.c_str ());
-+#else
-+ PetscOptionsSetValue (NULL, name.c_str (), value.c_str ());
-+#endif
-+ }
-+}
-+
-+DEAL_II_NAMESPACE_CLOSE
-+
-+#endif // DEAL_II_WITH_PETSC
-+#endif // dealii__petsc_compatibility_h
---- a/source/lac/petsc_precondition.cc
-+++ b/source/lac/petsc_precondition.cc
-@@ -18,6 +18,7 @@
- #ifdef DEAL_II_WITH_PETSC
-
- # include <deal.II/base/utilities.h>
-+# include <deal.II/lac/petsc_compatibility.h>
- # include <deal.II/lac/petsc_matrix_base.h>
- # include <deal.II/lac/petsc_vector_base.h>
- # include <deal.II/lac/petsc_solver.h>
-@@ -487,32 +488,32 @@
- AssertThrow (ierr == 0, ExcPETScError(ierr));
-
- if (additional_data.output_details)
-- PetscOptionsSetValue("-pc_hypre_boomeramg_print_statistics","1");
-+ {
-+ set_option_value("-pc_hypre_boomeramg_print_statistics", "1");
-+ }
-
-- PetscOptionsSetValue("-pc_hypre_boomeramg_agg_nl",
-- Utilities::int_to_string(
-- additional_data.aggressive_coarsening_num_levels
-- ).c_str());
-+ set_option_value("-pc_hypre_boomeramg_agg_nl",
-+ Utilities::to_string(additional_data.aggressive_coarsening_num_levels));
-
- std::stringstream ssStream;
- ssStream << additional_data.max_row_sum;
-- PetscOptionsSetValue("-pc_hypre_boomeramg_max_row_sum", ssStream.str().c_str());
-+ set_option_value("-pc_hypre_boomeramg_max_row_sum", ssStream.str());
-
- ssStream.str(""); // empty the stringstream
- ssStream << additional_data.strong_threshold;
-- PetscOptionsSetValue("-pc_hypre_boomeramg_strong_threshold", ssStream.str().c_str());
-+ set_option_value("-pc_hypre_boomeramg_strong_threshold", ssStream.str());
-
- if (additional_data.symmetric_operator)
- {
-- PetscOptionsSetValue("-pc_hypre_boomeramg_relax_type_up", "symmetric-SOR/Jacobi");
-- PetscOptionsSetValue("-pc_hypre_boomeramg_relax_type_down", "symmetric-SOR/Jacobi");
-- PetscOptionsSetValue("-pc_hypre_boomeramg_relax_type_coarse", "Gaussian-elimination");
-+ set_option_value("-pc_hypre_boomeramg_relax_type_up", "symmetric-SOR/Jacobi");
-+ set_option_value("-pc_hypre_boomeramg_relax_type_down", "symmetric-SOR/Jacobi");
-+ set_option_value("-pc_hypre_boomeramg_relax_type_coarse", "Gaussian-elimination");
- }
- else
- {
-- PetscOptionsSetValue("-pc_hypre_boomeramg_relax_type_up", "SOR/Jacobi");
-- PetscOptionsSetValue("-pc_hypre_boomeramg_relax_type_down", "SOR/Jacobi");
-- PetscOptionsSetValue("-pc_hypre_boomeramg_relax_type_coarse", "Gaussian-elimination");
-+ set_option_value("-pc_hypre_boomeramg_relax_type_up", "SOR/Jacobi");
-+ set_option_value("-pc_hypre_boomeramg_relax_type_down", "SOR/Jacobi");
-+ set_option_value("-pc_hypre_boomeramg_relax_type_coarse", "Gaussian-elimination");
- }
-
- ierr = PCSetFromOptions (pc);
-@@ -588,7 +589,9 @@
- AssertThrow (ierr == 0, ExcPETScError(ierr));
-
- if (additional_data.output_details)
-- PetscOptionsSetValue("-pc_hypre_parasails_logging","1");
-+ {
-+ set_option_value("-pc_hypre_parasails_logging","1");
-+ }
-
- Assert ((additional_data.symmetric == 0 ||
- additional_data.symmetric == 1 ||
-@@ -622,20 +625,18 @@
- ExcMessage("ParaSails parameter symmetric can only be equal to 0, 1, 2!"));
- };
-
-- PetscOptionsSetValue("-pc_hypre_parasails_sym",ssStream.str().c_str());
-+ set_option_value("-pc_hypre_parasails_sym",ssStream.str());
-
-- PetscOptionsSetValue("-pc_hypre_parasails_nlevels",
-- Utilities::int_to_string(
-- additional_data.n_levels
-- ).c_str());
-+ set_option_value ("-pc_hypre_parasails_nlevels",
-+ Utilities::to_string(additional_data.n_levels));
-
- ssStream.str(""); // empty the stringstream
- ssStream << additional_data.threshold;
-- PetscOptionsSetValue("-pc_hypre_parasails_thresh", ssStream.str().c_str());
-+ set_option_value("-pc_hypre_parasails_thresh", ssStream.str());
-
- ssStream.str(""); // empty the stringstream
- ssStream << additional_data.filter;
-- PetscOptionsSetValue("-pc_hypre_parasails_filter", ssStream.str().c_str());
-+ set_option_value("-pc_hypre_parasails_filter", ssStream.str());
-
- ierr = PCSetFromOptions (pc);
- AssertThrow (ierr == 0, ExcPETScError(ierr));
diff --git a/debian/patches/series b/debian/patches/series
index a7c77e3..b889f74 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
allow_different_slepc_petsc_versions.patch
-use_fPIC_instead_of_fpic.patch
-petsc_3.7.0.patch
diff --git a/debian/patches/use_fPIC_instead_of_fpic.patch b/debian/patches/use_fPIC_instead_of_fpic.patch
deleted file mode 100644
index efd6e7a..0000000
--- a/debian/patches/use_fPIC_instead_of_fpic.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cmake/setup_compiler_flags_gnu.cmake b/cmake/setup_compiler_flags_gnu.cmake
-index 4cccd53..cc75241 100644
---- a/cmake/setup_compiler_flags_gnu.cmake
-+++ b/cmake/setup_compiler_flags_gnu.cmake
-@@ -46,7 +46,7 @@ ENDIF()
- #
- # Set the pic flag.
- #
--ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS "-fpic")
-+ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS "-fPIC")
-
- #
- # Check whether the -as-needed flag is available. If so set it to link
diff --git a/debian/rules b/debian/rules
index f792860..5c2ac94 100755
--- a/debian/rules
+++ b/debian/rules
@@ -62,7 +62,7 @@ override_dh_strip:
dh_strip --ddeb-migration='libdeal.ii-dbg (<< 8.1.0-6~)'
-VERSION := 8.4.1
+VERSION := 8.4.2
get-orig-source:
wget --no-clobber -O deal.ii-$(VERSION).tar.gz https://github.com/dealii/dealii/releases/download/v$(VERSION)/dealii-$(VERSION).tar.gz
wget --no-clobber -O deal.ii-doc-$(VERSION).tar.gz https://github.com/dealii/dealii/releases/download/v$(VERSION)/dealii-$(VERSION)-offline_documentation.tar.gz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/deal.ii.git
More information about the debian-science-commits
mailing list