[osgearth] 07/15: Add patch bumping the version to 2.6.0 for CMake build.

[Bas Couwenberg]

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

sebastic-guest pushed a commit to branch master
in repository osgearth.

commit 5fc1b96084322a912ff5df515c59beae7aa47d87
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Oct 13 22:45:22 2014 +0200

    Add patch bumping the version to 2.6.0 for CMake build.
---
 debian/changelog             |  1 +
 debian/patches/series        |  1 +
 debian/patches/version.patch | 16 ++++++++++++++++
 3 files changed, 18 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9c92e7f..754c5c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ osgearth (2.6.0+dfsg-1) UNRELEASED; urgency=medium
   * Update watch file to also report pre-releases.
   * Update Files-Excluded for osgEarth 2.6.
   * Update copyright file.
+  * Add patch bumping the version to 2.6.0 for CMake build.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Mon, 13 Oct 2014 20:54:22 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 4247e83..d9cccbd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 soversion.patch
+version.patch
 fallback-getCurrentThreadId.patch
 kfreebsd-getCurrentThreadId.patch
 cmake-FindMiniZip.patch
diff --git a/debian/patches/version.patch b/debian/patches/version.patch
new file mode 100644
index 0000000..e92836b
--- /dev/null
+++ b/debian/patches/version.patch
@@ -0,0 +1,16 @@
+Description: Bump version to 2.6.0 for CMake build.
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+Forwarded: https://github.com/gwaldron/osgearth/pull/554
+Applied-Upstream: https://github.com/gwaldron/osgearth/commit/90482f32cff6d61dcf591b7c35308f75f059d666
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -24,7 +24,7 @@ SET_PROPERTY( GLOBAL PROPERTY PREDEFINED
+ PROJECT(OSGEARTH)
+ 
+ SET(OSGEARTH_MAJOR_VERSION 2)
+-SET(OSGEARTH_MINOR_VERSION 5)
++SET(OSGEARTH_MINOR_VERSION 6)
+ SET(OSGEARTH_PATCH_VERSION 0)
+ SET(OSGEARTH_SOVERSION     3)
+ 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osgearth.git