[SCM] osgearth branch, natty, updated. 156994ef31f4ee17b2774c826dfaf6673c44dff8

[Pirmin Kalberer]

The following commit has been merged in the natty branch:
commit ad29d31a2c95a3bf9b5047df7e4853a51c720378
Merge: 71aa495de648aba7c95bd21fd7c667f103e235a7 09a94f35a34e7971572e8fe721a4675983aad879
Author: Pirmin Kalberer <pka at sourcepole.ch>
Date:   Thu Aug 11 23:17:57 2011 +0200

    Merge branch 'master' into natty
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index 91611e3,14562cb..90b4152
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,18 +1,24 @@@
- osgearth (2.0-3natty1) natty; urgency=low
++osgearth (2.0-4natty1) natty; urgency=low
 +
 +  * Launchpad build for natty.
 +
-  -- Pirmin Kalberer <pi_deb at sourcepole.ch>  Mon, 09 May 2011 21:33:11 +0200
++ -- Pirmin Kalberer <pi_deb at sourcepole.ch>  Wed, 10 Aug 2011 23:44:48 +0200
++
+ osgearth (2.0-4) unstable; urgency=low
+ 
+   * Changed maintainer to Debian GIS Project
+   * Added package osgearth-data
+   * Renamed osgearth-dev to libosgearth-dev
+   * Removed binaries from libosgearth-dev
+   * Moved to sections devel/libs/libdevel
+   * Fixed detection of OpenSceneGraph 3.0.0
+   * Patch for obsolete Curl header
+   * 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>  Wed, 03 Aug 2011 21:40:46 +0200
  
  osgearth (2.0-3) unstable; urgency=low
  

-- 
osgEarth terrain rendering toolkit