[SCM] osgearth branch, master, updated. 7600e40a0cc44465743b7f77228160ef72422434

[Pirmin Kalberer]

The following commit has been merged in the master branch:
commit 7600e40a0cc44465743b7f77228160ef72422434
Author: Pirmin Kalberer <pka at sourcepole.ch>
Date:   Tue Jul 12 22:57:07 2011 +0200

    Patch for detection of OpenSceneGraph 3.0.0

diff --git a/debian/README.Debian b/debian/README.Debian
index 1990a66..6733b17 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -21,5 +21,8 @@ osgviewer sample call:
 Press 'h' for help. See also http://www.openscenegraph.org/projects/osg/wiki/Support/UserGuides/osgviewer
 
 
+Developers should check the examples which are available together with data files on https://github.com/gwaldron/osgearth
+
+
  -- Pirmin Kalberer <pi_deb at sourcepole.ch>  Mon, 30 Aug 2010 14:37:20 +0200
  
diff --git a/debian/changelog b/debian/changelog
index e75e5f1..e0c2771 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,12 +4,13 @@ osgearth (2.0-4) unstable; urgency=low
   * Renamed osgearth-dev to libosgearth-dev
   * Removed binaries from libosgearth-dev
   * Moved to sections devel/libs/libdevel
+  * Fixed detection of OpenSceneGraph 3.0.0
   * Enhanced package descriptions
   * Standards-Version 3.9.2
   * Added source/format 3.0 (quilt)
   * Ready for Debian upload (closes: #633068)
 
- -- Pirmin Kalberer <pi_deb at sourcepole.ch>  Fri, 08 Jul 2011 20:58:44 +0200
+ -- Pirmin Kalberer <pi_deb at sourcepole.ch>  Tue, 12 Jul 2011 20:52:14 +0200
 
 osgearth (2.0-3) unstable; urgency=low
 
diff --git a/debian/patches/osg3 b/debian/patches/osg3
new file mode 100644
index 0000000..f3933b6
--- /dev/null
+++ b/debian/patches/osg3
@@ -0,0 +1,20 @@
+Index: osgearth-2.0/CMakeModules/OsgEarthMacroUtils.cmake
+===================================================================
+--- osgearth-2.0.orig/CMakeModules/OsgEarthMacroUtils.cmake	2011-07-12 20:48:49.782589187 +0200
++++ osgearth-2.0/CMakeModules/OsgEarthMacroUtils.cmake	2011-07-12 20:49:32.802589207 +0200
+@@ -49,12 +49,12 @@
+     SET(OPENSCENEGRAPH_PATCH_VERSION "" CACHE STRING "OpenSceneGraph patch version number")
+     SET(OPENSCENEGRAPH_SOVERSION "" CACHE STRING "OpenSceneGraph so version number")
+ 	
+-	if (OPENSCENEGRAPH_MAJOR_VERSION AND OPENSCENEGRAPH_MINOR_VERSION AND OPENSCENEGRAPH_PATCH_VERSION)
++	if (OPENSCENEGRAPH_MAJOR_VERSION AND NOT OPENSCENEGRAPH_MINOR_VERSION STREQUAL "" AND NOT OPENSCENEGRAPH_PATCH_VERSION STREQUAL "")
+ 	  SET(OPENSCENEGRAPH_VERSION ${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION})
+-	else (OPENSCENEGRAPH_MAJOR_VERSION AND OPENSCENEGRAPH_MINOR_VERSION AND OPENSCENEGRAPH_PATCH_VERSION)
++	else (OPENSCENEGRAPH_MAJOR_VERSION AND NOT OPENSCENEGRAPH_MINOR_VERSION STREQUAL "" AND NOT OPENSCENEGRAPH_PATCH_VERSION STREQUAL "")
+ 	  #MESSAGE("osgversion was found at ${OSG_VERSION_EXE} but failed to run")
+ 	  SET(OPENSCENEGRAPH_VERSION)
+-	endif (OPENSCENEGRAPH_MAJOR_VERSION AND OPENSCENEGRAPH_MINOR_VERSION AND OPENSCENEGRAPH_PATCH_VERSION)
++	endif (OPENSCENEGRAPH_MAJOR_VERSION AND NOT OPENSCENEGRAPH_MINOR_VERSION STREQUAL "" AND NOT OPENSCENEGRAPH_PATCH_VERSION STREQUAL "")
+ 	
+ 	MARK_AS_ADVANCED(OPENSCENEGRAPH_VERSION)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 6faa29c..d62bb82 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 gdal1.8
+osg3

-- 
osgEarth terrain rendering toolkit