The following commit has been merged in the master branch:
commit 0ebda7b8f78cbdd060c1c45bd77f32083a44f794
Author: Pirmin Kalberer p...@sourcepole.ch
Date: Sat Feb 12 22:44:48 2011 +0100
Upstream 2.0 master branch
diff --git a/debian/README.Debian b/debian/README.Debian
index 7654e40..1990a66 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -4,8 +4,8 @@ osgEarth for Debian
Base path where OSG applications look for fonts, etc.
export OSG_FILE_PATH=/usr/share/osgearth
-osgearth_simple sample call:
- osgearth_simple --window 50 50 900 700
/usr/share/osgearth/maps/wms_nexrad.earth
+osgearth_viewer sample call:
+ osgearth_viewer --window 50 50 900 700 --sky
/usr/share/osgearth/maps/srtm.earth
You should see a globe with radar data over some parts of North America.
@@ -22,4 +22,4 @@ Press 'h' for help. See also
http://www.openscenegraph.org/projects/osg/wiki/Sup
-- Pirmin Kalberer pi_...@sourcepole.ch Mon, 30 Aug 2010 14:37:20 +0200
-
\ No newline at end of file
+
diff --git a/debian/changelog b/debian/changelog
index 4dba642..479c73b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+osgearth (2.0~rc4-1) unstable; urgency=low
+
+ * Upstream master branch 11.2.11
+
+ -- Pirmin Kalberer pi_...@sourcepole.ch Sat, 12 Feb 2011 21:10:13 +0100
+
osgearth (1.4.1-2) unstable; urgency=low
* Lintian fixes
diff --git a/debian/patches/findgdal.patch b/debian/patches/findgdal.patch
deleted file mode 100644
index e304550..000
--- a/debian/patches/findgdal.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: osgearth-1.4.1/CMakeModules/FindGDAL.cmake
-===
osgearth-1.4.1.orig/CMakeModules/FindGDAL.cmake2010-10-10
22:48:49.019073400 +0200
-+++ osgearth-1.4.1/CMakeModules/FindGDAL.cmake 2010-10-10 22:49:11.108445877
+0200
-@@ -57,7 +57,7 @@
- )
-
- FIND_LIBRARY(GDAL_LIBRARY
-- NAMES gdal gdal_i gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL
-+ NAMES gdal gdal_i gdal1.7.0 gdal1.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL
- PATHS
- c:/Program Files/FWTools2.1.0/lib
- $ENV{GDAL_DIR}
-@@ -65,14 +65,14 @@
- PATH_SUFFIXES lib64 lib
- )
- FIND_LIBRARY(GDAL_LIBRARY
-- NAMES gdal gdal_i gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL
-+ NAMES gdal gdal_i gdal1.7.0 gdal1.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL
- PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
-c:/Program Files/FWTools2.1.0/lib
- NO_DEFAULT_PATH
- PATH_SUFFIXES lib64 lib
- )
- FIND_LIBRARY(GDAL_LIBRARY
-- NAMES gdal gdal_i gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL
-+ NAMES gdal gdal_i gdal1.7.0 gdal1.6.0 gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL
- PATHS
- ~/Library/Frameworks
- /Library/Frameworks
diff --git a/debian/patches/series b/debian/patches/series
index 51c12fd..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-findgdal.patch
--
osgEarth terrain rendering toolkit
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
