bump packaging versions for 2016.10 final

bump packaging versions for 2016.10-rc2
Merge pull request #197 from akva2/revert_istl_versions
2016-10-31 15:04:10 +01:00 · 2016-10-28 14:39:18 +02:00 · 2016-10-28 14:36:36 +02:00 · 2016-10-28 12:52:44 +02:00 · 2016-10-26 10:35:44 +02:00 · 2016-10-26 10:35:44 +02:00
4 changed files with 14 additions and 12 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-grid REQUIRED;
-   dune-geometry REQUIRED
+	dune-geometry REQUIRED"
 	 dune-istl"
 	# OPM dependency
-  "opm-common REQUIRED;
+        "opm-common REQUIRED;
-   opm-core REQUIRED"
+        opm-core REQUIRED"
 	"ZOLTAN"
 	)
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,9 @@
 opm-common (2016.10-rfinal-1~xenial) xenial; urgency=medium
  * New release
 -- Arne Morten Kvarving <arne.morten.kvarving@sintef.no>  Wed, 26 Oct 2016 09:55:11 +0200
 opm-common (2015.10-1~trusty) trusty; urgency=medium
  * New release
--- a/dune.module
+++ b/dune.module
@ -5,8 +5,8 @@
 Module: opm-common
 Description: Open Porous Media Initiative shared infrastructure
-Version: 2016.10-pre
+Version: 2016.10
-Label: 2016.10-pre
+Label: 2016.10
 Maintainer: opm@opm-project.org
 MaintainerName: OPM community
 Url: http://opm-project.org
--- a/redhat/opm-common.spec
+++ b/redhat/opm-common.spec
@ -2,10 +2,10 @@
 # spec file for package opm-common
 #
-%define tag rc4
+%define tag final
 Name:           opm-common
-Version:        2015.10
+Version:        2016.10
 Release:        0
 Summary:        Open Porous Media - common helpers and buildsystem
 License:        GPL-3.0
Author	SHA1	Message	Date
Arne Morten Kvarving	8b8fff8306	bump packaging versions for 2016.10 final	2016-10-31 15:04:10 +01:00
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
Arne Morten Kvarving	fc48a12fc5	bump packaging versions for 2016.10-rc1	2016-10-26 10:35:44 +02:00
Arne Morten Kvarving	f040c2984e	bump version to 2016.10	2016-10-26 10:35:44 +02:00