[osgearth] 01/01: Mark patches as Applied-Upstream.

[Bas Couwenberg]

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

sebastic pushed a commit to branch experimental
in repository osgearth.

commit 21cc783135e6a83c8ab1adb26041a5c85e2541fb
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Sep 9 10:24:50 2016 +0200

    Mark patches as Applied-Upstream.
---
 debian/patches/fallback-getCurrentThreadId.patch                | 1 +
 debian/patches/kfreebsd-getCurrentThreadId.patch                | 1 +
 debian/patches/spelling-errors.patch                            | 1 +
 debian/patches/undefined-reference-to-symbol-XInitThreads.patch | 1 +
 4 files changed, 4 insertions(+)

diff --git a/debian/patches/fallback-getCurrentThreadId.patch b/debian/patches/fallback-getCurrentThreadId.patch
index 7e8bbbc..6ba673c 100644
--- a/debian/patches/fallback-getCurrentThreadId.patch
+++ b/debian/patches/fallback-getCurrentThreadId.patch
@@ -2,6 +2,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/725383
 Forwarded: https://github.com/gwaldron/osgearth/pull/793
+Applied-Upstream: https://github.com/gwaldron/osgearth/commit/fd8b957470eedd1cdc35ccf943d983461b501d61
 
 --- a/src/osgEarth/ThreadingUtils.cpp
 +++ b/src/osgEarth/ThreadingUtils.cpp
diff --git a/debian/patches/kfreebsd-getCurrentThreadId.patch b/debian/patches/kfreebsd-getCurrentThreadId.patch
index d835aee..8baa845 100644
--- a/debian/patches/kfreebsd-getCurrentThreadId.patch
+++ b/debian/patches/kfreebsd-getCurrentThreadId.patch
@@ -1,6 +1,7 @@
 Description: Use thr_self syscall on kFreeBSD.
 Author: Bas Couwenberg <sebastic at debian.org>
 Forwarded: https://github.com/gwaldron/osgearth/pull/793
+Applied-Upstream: https://github.com/gwaldron/osgearth/commit/fd8b957470eedd1cdc35ccf943d983461b501d61
 
 --- a/src/osgEarth/ThreadingUtils.cpp
 +++ b/src/osgEarth/ThreadingUtils.cpp
diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch
index f3d1033..92fd79c 100644
--- a/debian/patches/spelling-errors.patch
+++ b/debian/patches/spelling-errors.patch
@@ -4,6 +4,7 @@ Description: Fix spelling errors.
  indiciating -> indicating
 Author: Bas Couwenberg <sebastic at debian.org>
 Forwarded: https://github.com/gwaldron/osgearth/pull/795
+Applied-Upstream: https://github.com/gwaldron/osgearth/commit/d20bd2f88578b8219ec561b4b40d82bdad425261
 
 --- a/docs/source/user/tools.rst
 +++ b/docs/source/user/tools.rst
diff --git a/debian/patches/undefined-reference-to-symbol-XInitThreads.patch b/debian/patches/undefined-reference-to-symbol-XInitThreads.patch
index 4c36e8d..394f8a1 100644
--- a/debian/patches/undefined-reference-to-symbol-XInitThreads.patch
+++ b/debian/patches/undefined-reference-to-symbol-XInitThreads.patch
@@ -4,6 +4,7 @@ Description: Link X11 to fix FTBFS.
 Author: Sandro Mani <manisandro at gmail.com>
 Origin: https://kojipkgs.fedoraproject.org//packages/osgearth/2.6/4.fc22/src/osgearth-2.6-4.fc22.src.rpm
 Forwarded: https://github.com/gwaldron/osgearth/pull/794
+Applied-Upstream: https://github.com/gwaldron/osgearth/commit/e87df7d58c6cce9706a20d7ad66ba893aaad0422
 
 --- a/src/applications/osgearth_demo/CMakeLists.txt
 +++ b/src/applications/osgearth_demo/CMakeLists.txt

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