bump packaging versions for 2016.10-rc2

Merge pull request #197 from akva2/revert_istl_versions
Revert "[bugfix] since HAVE_DUNE_ISTL is used in opm-grid it should b…
2016-10-28 14:39:18 +02:00 · 2016-10-28 14:36:36 +02:00 · 2016-10-28 12:52:44 +02:00
3 changed files with 6 additions and 10 deletions
--- a/cmake/Modules/opm-grid-prereqs.cmake
+++ b/cmake/Modules/opm-grid-prereqs.cmake
@@ -9,9 +9,6 @@ set (opm-grid_CONFIG_VAR
 	DUNE_COMMON_VERSION_MAJOR
 	DUNE_COMMON_VERSION_MINOR
 	DUNE_COMMON_VERSION_REVISION
-	DUNE_ISTL_VERSION_MAJOR
-	DUNE_ISTL_VERSION_MINOR
-	DUNE_ISTL_VERSION_REVISION
 	HAVE_ZOLTAN
 	)

@@ -26,11 +23,10 @@ set (opm-grid_DEPS
 		COMPONENTS date_time filesystem system unit_test_framework REQUIRED"
 	# DUNE dependency
 	"dune-common REQUIRED;
-   dune-grid REQUIRED;
-   dune-geometry REQUIRED
-	 dune-istl"
+	dune-grid REQUIRED;
+	dune-geometry REQUIRED"
 	# OPM dependency
-  "opm-common REQUIRED;
-   opm-core REQUIRED"
+        "opm-common REQUIRED;
+        opm-core REQUIRED"
 	"ZOLTAN"
 	)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-opm-common (2016.10-rc1-1~xenial) xenial; urgency=medium
+opm-common (2016.10-rc2-1~xenial) xenial; urgency=medium

  * New release

--- a/redhat/opm-common.spec
+++ b/redhat/opm-common.spec
@@ -2,7 +2,7 @@
 # spec file for package opm-common
 #

-%define tag rc1
+%define tag rc2

 Name:           opm-common
 Version:        2016.10
Author	SHA1	Message	Date
Arne Morten Kvarving	2f708d9b2a	bump packaging versions for 2016.10-rc2	2016-10-28 14:39:18 +02:00
Arne Morten Kvarving	8bee095294	Merge pull request #197 from akva2/revert_istl_versions Revert "[bugfix] since HAVE_DUNE_ISTL is used in opm-grid it should b…	2016-10-28 14:36:36 +02:00
Arne Morten Kvarving	57874e28a9	Revert "[bugfix] since HAVE_DUNE_ISTL is used in opm-grid it should be tested for. It's" This exposed problems in the build system design resulting in scary warnings building downstreams of opm-grid. This reverts commit `b9af87abc2`.	2016-10-28 12:52:44 +02:00