From 5802844f521f9644907b9e1fe59c55947b7e4e5d Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Sun, 12 Apr 2009 18:53:22 +0000
Subject: [PATCH] Updated CMakeLists.txt ChangeLog generator so that it tracks
 the current branch or svn/trunk to prevent branches generating logs for
 svn/trunk.

Updated osgversion's authors mapping.

Updated ChangeLog.
---
 CMakeLists.txt                         |  2 +-
 ChangeLog                              | 23 +++++++++++++++++++++++
 applications/osgversion/osgversion.cpp |  7 +++++++
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b0ce1dbad..705144832 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -131,7 +131,7 @@ IF (OSG_MAINTAINER)
 
     ADD_CUSTOM_TARGET(ChangeLog
         COMMAND ${SVNCOMMAND} update
-        COMMAND ${GENERATELOGS}
+        COMMAND ${GENERATELOGS} ${SVNSOURCEDIR}
     )
     
 ENDIF(OSG_MAINTAINER)
diff --git a/ChangeLog b/ChangeLog
index 142cfaae2..47b2a6ae9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2009-04-12 10:29  robert
+
+	* src/osg/GraphicsThread.cpp: Added release from svn/trunk to
+	  enable osgCompute.
+
+2009-04-10 21:25  robert
+
+	* NEWS.txt: Updated NEWS for 2.8.1-rc1
+
+2009-04-10 14:35  robert
+
+	* README.txt: UPdated date
+
+2009-04-10 12:56  robert
+
+	* AUTHORS.txt, ChangeLog: Update ChangeLog and AUTHORS.txt file for
+	  2.8.1-rc1
+
+2009-04-10 12:54  robert
+
+	* applications/osgversion/osgversion.cpp: Merged changes from
+	  svn/trunk
+
 2009-04-10 10:58  robert
 
 	* CMakeLists.txt, include/osg/Version: Updater version numbers to
diff --git a/applications/osgversion/osgversion.cpp b/applications/osgversion/osgversion.cpp
index 1aa29e2fe..55a4ad704 100644
--- a/applications/osgversion/osgversion.cpp
+++ b/applications/osgversion/osgversion.cpp
@@ -357,6 +357,7 @@ std::string typoCorrection(const std::string& name)
     if (name=="Sjölie") return "Sjölie";
     if (name=="Skinnder") return "Skinner";
     if (name=="Sokolosky") return "Sokolowsky";
+    if (name=="Sokolowky") return "Sokolowsky";
     if (name=="Sokolowki") return "Sokolowsky";
     if (name=="Sokolowski") return "Sokolowsky";
     if (name=="Sokolsky") return "Sokolowsky";
@@ -392,6 +393,12 @@ std::string typoCorrection(const std::string& name)
 
 void nameCorrection(NamePair& name)
 {
+    if (name.first=="Marc" && name.second=="Sciabica")
+    {
+        name.first = "Mark";
+        name.second = "Sciabica";
+    }
+    
     if (name.first=="Michale" && name.second=="Platings")
     {
         name.first = "Michael";