[osgearth] 07/10: Refresh patches.
Bas Couwenberg
sebastic at debian.org
Sat Sep 3 12:42:35 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch experimental
in repository osgearth.
commit a83c5491750772b86048a2e0968778fae6fa670c
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sat Sep 3 14:02:31 2016 +0200
Refresh patches.
---
debian/changelog | 1 +
debian/patches/series | 1 -
debian/patches/soversion.patch | 4 ++--
debian/patches/spelling-errors.patch | 12 ++++++++++++
debian/patches/spelling-errors2.patch | 15 ---------------
.../undefined-reference-to-symbol-XInitThreads.patch | 16 +++-------------
debian/patches/version.patch | 10 ++++------
7 files changed, 22 insertions(+), 37 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index fcaf1fd..08e098a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ osgearth (2.8~rc1+dfsg-1) UNRELEASED; urgency=medium
- Update copyright years for Pelican Mapping & Duktape authors
- Add license & copyright for NL Template
- Rename MIT license shortname to Expat
+ * Refresh patches.
-- Bas Couwenberg <sebastic at debian.org> Sat, 03 Sep 2016 13:02:34 +0200
diff --git a/debian/patches/series b/debian/patches/series
index 6eba0e5..d6b3a53 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,3 @@ fallback-getCurrentThreadId.patch
kfreebsd-getCurrentThreadId.patch
undefined-reference-to-symbol-XInitThreads.patch
spelling-errors.patch
-spelling-errors2.patch
diff --git a/debian/patches/soversion.patch b/debian/patches/soversion.patch
index 1c364d8..a9d9d1e 100644
--- a/debian/patches/soversion.patch
+++ b/debian/patches/soversion.patch
@@ -3,9 +3,9 @@ Author: Pirmin Kalberer <pka at sourcepole.ch>
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -26,7 +26,7 @@ PROJECT(OSGEARTH)
+@@ -34,7 +34,7 @@ PROJECT(OSGEARTH)
SET(OSGEARTH_MAJOR_VERSION 2)
- SET(OSGEARTH_MINOR_VERSION 6)
+ SET(OSGEARTH_MINOR_VERSION 9)
SET(OSGEARTH_PATCH_VERSION 0)
-SET(OSGEARTH_SOVERSION 0)
+SET(OSGEARTH_SOVERSION 5)
diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch
index c274c6c..9561d90 100644
--- a/debian/patches/spelling-errors.patch
+++ b/debian/patches/spelling-errors.patch
@@ -1,5 +1,6 @@
Description: Fix spelling errors.
proceses -> processes
+ Faild -> Failed
Author: Bas Couwenberg <sebastic at debian.org>
--- a/docs/source/user/tools.rst
@@ -44,3 +45,14 @@ Author: Bas Couwenberg <sebastic at debian.org>
<< " [--verbose] ; Displays progress of the seed operation" << std::endl
<< std::endl
<< " --purge file.earth ; Purges a layer cache in a .earth file (interactive)" << std::endl
+--- a/src/osgEarthDrivers/osg/OSGTileSource.cpp
++++ b/src/osgEarthDrivers/osg/OSGTileSource.cpp
+@@ -88,7 +88,7 @@ public:
+
+ if ( !image.valid() )
+ {
+- return Status::Error( Status::ResourceUnavailable, Stringify() << "Faild to load data from \"" << _options.url()->full() << "\"" );
++ return Status::Error( Status::ResourceUnavailable, Stringify() << "Failed to load data from \"" << _options.url()->full() << "\"" );
+ }
+
+ // calculate and store the maximum LOD for which to return data
diff --git a/debian/patches/spelling-errors2.patch b/debian/patches/spelling-errors2.patch
deleted file mode 100644
index cafcfbe..0000000
--- a/debian/patches/spelling-errors2.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix spelling errors.
- Faild -> Failed
-Author: Bas Couwenberg <sebastic at debian.org>
-
---- a/src/osgEarthDrivers/osg/OSGTileSource.cpp
-+++ b/src/osgEarthDrivers/osg/OSGTileSource.cpp
-@@ -88,7 +88,7 @@ public:
-
- if ( !image.valid() )
- {
-- return Status::Error( Stringify() << "Faild to load data from \"" << _options.url()->full() << "\"" );
-+ return Status::Error( Stringify() << "Failed to load data from \"" << _options.url()->full() << "\"" );
- }
-
- // calculate and store the maximum LOD for which to return data
diff --git a/debian/patches/undefined-reference-to-symbol-XInitThreads.patch b/debian/patches/undefined-reference-to-symbol-XInitThreads.patch
index ca0e398..6f6d516 100644
--- a/debian/patches/undefined-reference-to-symbol-XInitThreads.patch
+++ b/debian/patches/undefined-reference-to-symbol-XInitThreads.patch
@@ -16,17 +16,7 @@ Origin: https://kojipkgs.fedoraproject.org//packages/osgearth/2.6/4.fc22/src/osg
--- a/src/applications/osgearth_package_qt/CMakeLists.txt
+++ b/src/applications/osgearth_package_qt/CMakeLists.txt
-@@ -59,6 +59,7 @@ SET(TARGET_ADDED_LIBRARIES
- ${QT_QTCORE_LIBRARY}
- ${QT_QTGUI_LIBRARY}
- ${QT_QTOPENGL_LIBRARY}
-+ X11
- )
-
- #### end var setup ###
---- a/src/applications/osgearth_qt/CMakeLists.txt
-+++ b/src/applications/osgearth_qt/CMakeLists.txt
-@@ -38,6 +38,7 @@ SET(TARGET_ADDED_LIBRARIES
+@@ -60,6 +60,7 @@ SET(TARGET_ADDED_LIBRARIES
${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY}
${QT_QTOPENGL_LIBRARY}
@@ -36,7 +26,7 @@ Origin: https://kojipkgs.fedoraproject.org//packages/osgearth/2.6/4.fc22/src/osg
#### end var setup ###
--- a/src/applications/osgearth_qt_simple/CMakeLists.txt
+++ b/src/applications/osgearth_qt_simple/CMakeLists.txt
-@@ -34,6 +34,7 @@ SET(TARGET_ADDED_LIBRARIES
+@@ -35,6 +35,7 @@ SET(TARGET_ADDED_LIBRARIES
${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY}
${QT_QTOPENGL_LIBRARY}
@@ -46,7 +36,7 @@ Origin: https://kojipkgs.fedoraproject.org//packages/osgearth/2.6/4.fc22/src/osg
#### end var setup ###
--- a/src/applications/osgearth_qt_windows/CMakeLists.txt
+++ b/src/applications/osgearth_qt_windows/CMakeLists.txt
-@@ -29,6 +29,7 @@ SET(TARGET_ADDED_LIBRARIES
+@@ -30,6 +30,7 @@ SET(TARGET_ADDED_LIBRARIES
${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY}
${QT_QTOPENGL_LIBRARY}
diff --git a/debian/patches/version.patch b/debian/patches/version.patch
index 3d48e0d..84d8aaf 100644
--- a/debian/patches/version.patch
+++ b/debian/patches/version.patch
@@ -1,16 +1,14 @@
-Description: Bump version to 2.7.0 for CMake build.
+Description: Fix version 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
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -24,7 +24,7 @@ SET_PROPERTY( GLOBAL PROPERTY PREDEFINED
+@@ -32,7 +32,7 @@ SET_PROPERTY( GLOBAL PROPERTY PREDEFINED
PROJECT(OSGEARTH)
SET(OSGEARTH_MAJOR_VERSION 2)
--SET(OSGEARTH_MINOR_VERSION 6)
-+SET(OSGEARTH_MINOR_VERSION 7)
+-SET(OSGEARTH_MINOR_VERSION 9)
++SET(OSGEARTH_MINOR_VERSION 8)
SET(OSGEARTH_PATCH_VERSION 0)
SET(OSGEARTH_SOVERSION 5)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osgearth.git
More information about the Pkg-grass-devel
mailing list