[osgearth] 07/13: Refresh patches.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository osgearth.

commit fd051040a5e2968179cc6ecfe3dbc7299a842f8f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jul 26 15:25:54 2015 +0200

    Refresh patches.
---
 debian/changelog                                 |  1 +
 debian/patches/fallback-getCurrentThreadId.patch | 10 +++++-----
 debian/patches/kfreebsd-getCurrentThreadId.patch |  6 +++---
 debian/patches/soversion.patch                   |  4 ++--
 debian/patches/version.patch                     |  6 +++---
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6fc50ee..f3a8d9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ osgearth (2.7.0+dfsg-1~exp1) UNRELEASED; urgency=medium
   * Update copyright file, changes:
     - Update copyright years for Pelican Mapping
     - Add license & copyright for fastdxt, rapidxml & splat files
+  * Refresh patches.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sun, 26 Jul 2015 13:49:42 +0200
 
diff --git a/debian/patches/fallback-getCurrentThreadId.patch b/debian/patches/fallback-getCurrentThreadId.patch
index 711d05e..7dc3393 100644
--- a/debian/patches/fallback-getCurrentThreadId.patch
+++ b/debian/patches/fallback-getCurrentThreadId.patch
@@ -1,7 +1,7 @@
 Description: Fallback to pthread_self() for thread ID on non-Linux kernels.
 Author: Steven Chamberlain <steven at pyro.eu.org>
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=725383
-Last-Update: 2013-10-04
+Bug-Debian: http://bugs.debian.org/725383
+
 --- a/src/osgEarth/ThreadingUtils.cpp
 +++ b/src/osgEarth/ThreadingUtils.cpp
 @@ -20,9 +20,11 @@
@@ -17,10 +17,10 @@ Last-Update: 2013-10-04
  #endif
  
  using namespace osgEarth::Threading;
-@@ -38,7 +40,10 @@ unsigned osgEarth::Threading::getCurrent
-   return (unsigned)::GetCurrentThreadId();
- #elif __APPLE__
+@@ -40,7 +42,10 @@ unsigned osgEarth::Threading::getCurrent
    return ::syscall(SYS_thread_selfid);
+ #elif __ANDROID__
+   return gettid();
 -#else
 +#elif __LINUX__
    return (unsigned)::syscall(SYS_gettid);
diff --git a/debian/patches/kfreebsd-getCurrentThreadId.patch b/debian/patches/kfreebsd-getCurrentThreadId.patch
index 43e9e2f..5d5db78 100644
--- a/debian/patches/kfreebsd-getCurrentThreadId.patch
+++ b/debian/patches/kfreebsd-getCurrentThreadId.patch
@@ -1,6 +1,6 @@
 Description: Use thr_self syscall on kFreeBSD.
 Author: Bas Couwenberg <sebastic at debian.org>
-Last-Update: 2013-10-09
+
 --- a/src/osgEarth/ThreadingUtils.cpp
 +++ b/src/osgEarth/ThreadingUtils.cpp
 @@ -20,7 +20,7 @@
@@ -12,8 +12,8 @@ Last-Update: 2013-10-09
  #   include <unistd.h>
  #   include <sys/syscall.h>
  #else
-@@ -42,6 +42,10 @@ unsigned osgEarth::Threading::getCurrent
-   return ::syscall(SYS_thread_selfid);
+@@ -44,6 +44,10 @@ unsigned osgEarth::Threading::getCurrent
+   return gettid();
  #elif __LINUX__
    return (unsigned)::syscall(SYS_gettid);
 +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
diff --git a/debian/patches/soversion.patch b/debian/patches/soversion.patch
index 237faee..65ab557 100644
--- a/debian/patches/soversion.patch
+++ b/debian/patches/soversion.patch
@@ -1,11 +1,11 @@
 Description: Bump SOVERSION to 4.
 Author: Pirmin Kalberer <pka at sourcepole.ch>
-Last-Update: 2014-01-26
+
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -26,7 +26,7 @@ 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     0)
 +SET(OSGEARTH_SOVERSION     4)
diff --git a/debian/patches/version.patch b/debian/patches/version.patch
index e0653b0..5b8a444 100644
--- a/debian/patches/version.patch
+++ b/debian/patches/version.patch
@@ -1,4 +1,4 @@
-Description: Bump version to 2.6.0 for CMake build.
+Description: Bump version to 2.7.0 for CMake build.
 Author: Bas Couwenberg <sebastic at debian.org>
 Forwarded: https://github.com/gwaldron/osgearth/pull/554
 Applied-Upstream: https://github.com/gwaldron/osgearth/commit/90482f32cff6d61dcf591b7c35308f75f059d666
@@ -9,8 +9,8 @@ Applied-Upstream: https://github.com/gwaldron/osgearth/commit/90482f32cff6d61dcf
  PROJECT(OSGEARTH)
  
  SET(OSGEARTH_MAJOR_VERSION 2)
--SET(OSGEARTH_MINOR_VERSION 5)
-+SET(OSGEARTH_MINOR_VERSION 6)
+-SET(OSGEARTH_MINOR_VERSION 6)
++SET(OSGEARTH_MINOR_VERSION 7)
  SET(OSGEARTH_PATCH_VERSION 0)
  SET(OSGEARTH_SOVERSION     4)
  

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