Merge branch 'update-version' into 'releases/2.6-1'

Update version

See merge request !17

.gitignore

-
-# /
-/Makefile
-/Makefile.in
-/config.*
-/configure
-/dependencies.m4
-/aclocal.m4
-/autom4te.cache
-/depcomp
-/install-sh
-/missing
-/mkinstalldirs
-/libtool
-/dune.pc
-/semantic.cache
-/stamp-h1
-/html
-/.deps
-/.libs
-/am
-/linelast
-/nonlinelast
-
-# /dune/
-/dune/Makefile.in
-/dune/Makefile
-
-# /dune/elasticity/
-/dune/elasticity/Makefile.in
-/dune/elasticity/Makefile
-/dune/elasticity/semantic.cache
-
-# /dune/elasticity/assemblers/
-/dune/elasticity/assemblers/Makefile
-/dune/elasticity/assemblers/Makefile.in
-
-# /dune/elasticity/common/
-/dune/elasticity/common/Makefile
-/dune/elasticity/common/Makefile.in
-
-# /dune/elasticity/estimators/
-/dune/elasticity/estimators/Makefile
-/dune/elasticity/estimators/Makefile.in
-
-# /dune/elasticity/materials/
-/dune/elasticity/materials/Makefile
-/dune/elasticity/materials/Makefile.in
-
-# /m4/
-/m4/Makefile.in
-/m4/Makefile
-
-# /test/
-/test/.deps
-/test/.libs
-/test/Makefile
-/test/Makefile.in
-/test/semantic.cache
+# ignore backup files
+*~
 
 # Default cmake build directory
 /build-cmake

config.h.cmake

+/* begin dune-elasticity
+   put the definitions for config.h specific to
+   your project here. Everything above will be
+   overwritten
+*/
+
+/* begin private */
+/* Name of package */
+#define PACKAGE "@DUNE_MOD_NAME@"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "@DUNE_MAINTAINER@"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "@DUNE_MOD_NAME@"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "@DUNE_MOD_NAME@ @DUNE_MOD_VERSION@"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "@DUNE_MOD_NAME@"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL "@DUNE_MOD_URL@"
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "@DUNE_MOD_VERSION@"
+
+/* end private */
+
+/* Define to the version of dune-elasticity */
+#define DUNE_ELASTICITY_VERSION "@DUNE_ELASTICITY_VERSION@"
+
+/* Define to the major version of dune-elasticity */
+#define DUNE_ELASTICITY_VERSION_MAJOR @DUNE_ELASTICITY_VERSION_MAJOR@
+
+/* Define to the minor version of dune-elasticity */
+#define DUNE_ELASTICITY_VERSION_MINOR @DUNE_ELASTICITY_VERSION_MINOR@
+
+/* Define to the revision of dune-elasticity */
+#define DUNE_ELASTICITY_VERSION_REVISION @DUNE_ELASTICITY_VERSION_REVISION@
+
+/* end dune-elasticity
+   Everything below here will be overwritten
+*/

dune.module

@@ -4,7 +4,7 @@
 
 #Name of the module
 Module:dune-elasticity
-Version: 2.5
+Version: 2.6
 Maintainer: oliver.sander@tu-dresden.de, youett@mi.fu-berlin.de
 #depending on
 Depends:dune-common dune-grid dune-istl dune-solvers dune-fufem dune-geometry dune-functions