[SCM] osgearth branch, master, updated. 6edc26b4fb0364a3eb83d1055740a82c433ad234

Thu Jul 14 22:15:08 UTC 2011

The following commit has been merged in the master branch:
commit 13cf1b9c396b9640ceedc2391e691f5e25036e11
Author: Pirmin Kalberer <pka at sourcepole.ch>
Date:   Thu Jul 14 22:15:23 2011 +0200

    Added package osgearth-data

diff --git a/debian/changelog b/debian/changelog
index e0c2771..136f511 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 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
@@ -10,7 +11,7 @@ osgearth (2.0-4) unstable; urgency=low
   * Added source/format 3.0 (quilt)
   * Ready for Debian upload (closes: #633068)
 
- -- Pirmin Kalberer <pi_deb at sourcepole.ch>  Tue, 12 Jul 2011 20:52:14 +0200
+ -- Pirmin Kalberer <pi_deb at sourcepole.ch>  Thu, 14 Jul 2011 22:13:36 +0200
 
 osgearth (2.0-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 0015623..4810113 100644
--- a/debian/control
+++ b/debian/control
@@ -13,18 +13,32 @@ Vcs-Git: git://git.debian.org/pkg-grass/osgearth.git
 Vcs-Browser: http://git.debian.org/?p=pkg-grass/osgearth.git
 
 Package: osgearth
-Section: devel
 Architecture: any
 Depends: libosgearth1 (>= 1.4-2), ttf-liberation, ${shlibs:Depends}, ${misc:Depends}
-Description: Dynamic 3D terrain rendering toolkit for OpenSceneGraph
+Suggests: osgearth-data
+Description: Dynamic 3D terrain rendering toolkit for OpenSceneGraph (binaries)
+ osgEarth is a scalable terrain rendering toolkit for OpenSceneGraph
+ (OSG), an open source, high performance, 3D graphics toolkit. Just create a
+ simple XML file, point it at your imagery, elevation, and vector data, load it
+ into your favorite OSG application, and go! osgEarth supports all kinds of
+ data and comes with lots of examples to help you get up and running quickly
+ and easily.
+ .
+ This package contains binaries.
+
+Package: osgearth-data
+Section: devel
+Architecture: all
+Depends: ${misc:Depends}
+Description: Dynamic 3D terrain rendering toolkit for OpenSceneGraph (data)
  osgEarth is a scalable terrain rendering toolkit for OpenSceneGraph
- (OSG), an open source, high performance, 3D graphics toolkit. Just create a simple
- XML file, point it at your imagery, elevation, and vector data, load it into your
- favorite OSG application, and go! osgEarth supports all kinds of data and comes with
- lots of examples to help you get up and running quickly and easily.
- osgEarth is a scalable terrain rendering toolkit for OpenSceneGraph.
+ (OSG), an open source, high performance, 3D graphics toolkit. Just create a
+ simple XML file, point it at your imagery, elevation, and vector data, load it
+ into your favorite OSG application, and go! osgEarth supports all kinds of
+ data and comes with lots of examples to help you get up and running quickly
+ and easily.
  .
- This package contains binaries and data files.
+ This package contains data files.
 
 Package: libosgearth1
 Section: libs
@@ -33,13 +47,13 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: osgearth (<< 1.4-2)
 Breaks: osgearth (<< 1.4-2)
 Suggests: openscenegraph
-Description: Dynamic 3D terrain rendering toolkit for OpenSceneGraph
+Description: Dynamic 3D terrain rendering toolkit for OpenSceneGraph (shared libs)
  osgEarth is a scalable terrain rendering toolkit for OpenSceneGraph
- (OSG), an open source, high performance, 3D graphics toolkit. Just create a simple
- XML file, point it at your imagery, elevation, and vector data, load it into your
- favorite OSG application, and go! osgEarth supports all kinds of data and comes with
- lots of examples to help you get up and running quickly and easily.
- osgEarth is a scalable terrain rendering toolkit for OpenSceneGraph.
+ (OSG), an open source, high performance, 3D graphics toolkit. Just create a
+ simple XML file, point it at your imagery, elevation, and vector data, load it
+ into your favorite OSG application, and go! osgEarth supports all kinds of
+ data and comes with lots of examples to help you get up and running quickly
+ and easily.
  .
  This package contains the shared libraries.
 
@@ -50,10 +64,10 @@ Depends: libopenscenegraph-dev, libgeos-dev, libosgearth1 (= ${binary:Version}),
 Replaces: osgearth-dev
 Description: osgEarth development files
  osgEarth is a scalable terrain rendering toolkit for OpenSceneGraph
- (OSG), an open source, high performance, 3D graphics toolkit. Just create a simple
- XML file, point it at your imagery, elevation, and vector data, load it into your
- favorite OSG application, and go! osgEarth supports all kinds of data and comes with
- lots of examples to help you get up and running quickly and easily.
- osgEarth is a scalable terrain rendering toolkit for OpenSceneGraph.
+ (OSG), an open source, high performance, 3D graphics toolkit. Just create a
+ simple XML file, point it at your imagery, elevation, and vector data, load it
+ into your favorite OSG application, and go! osgEarth supports all kinds of
+ data and comes with lots of examples to help you get up and running quickly
+ and easily.
  .
  This package contains the development files.
diff --git a/debian/rules b/debian/rules
index bfdb05f..c0dbcde 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,6 +52,13 @@ install-indep:
 
 	dh_install -i
 
+	mkdir -p debian/osgearth-data/usr/share/osgearth/maps && \
+          cp tests/*.earth debian/osgearth-data/usr/share/osgearth/maps/ && \
+          cp debian/*.earth debian/osgearth-data/usr/share/osgearth/maps/ && \
+          sed --in-place -e 's!\\!/!g' -e 's!\.\./data!/usr/share/osgearth/data!g' debian/osgearth-data/usr/share/osgearth/maps/*.earth
+	mkdir -p debian/osgearth-data/usr/share/osgearth/data && \
+          cp data/world.tif debian/osgearth-data/usr/share/osgearth/data/
+
 install-arch:
 	dh_testdir
 	dh_testroot
@@ -64,16 +71,9 @@ install-arch:
 
 	install -D README.txt debian/osgearth/usr/share/doc/osgearth/README.txt
 
-	mkdir -p debian/osgearth/usr/share/osgearth/maps && \
-          cp tests/*.earth debian/osgearth/usr/share/osgearth/maps/ && \
-          cp debian/*.earth debian/osgearth/usr/share/osgearth/maps/ && \
-          sed --in-place -e 's!\\!/!g' -e 's!\.\./data!/usr/share/osgearth/data!g' debian/osgearth/usr/share/osgearth/maps/*.earth
-	mkdir -p debian/osgearth/usr/share/osgearth/data && \
-          cp data/world.tif debian/osgearth/usr/share/osgearth/data/
 	mkdir -p debian/osgearth/usr/share/osgearth/fonts && \
-	ln -s ../../fonts/truetype/ttf-liberation/LiberationSans-Regular.ttf debian/osgearth/usr/share/osgearth/fonts/arial.ttf && \
-	ln -s ../../fonts/truetype/ttf-liberation/LiberationSerif-Regular.ttf debian/osgearth/usr/share/osgearth/fonts/times.ttf
-
+	  ln -s ../../fonts/truetype/ttf-liberation/LiberationSans-Regular.ttf debian/osgearth/usr/share/osgearth/fonts/arial.ttf && \
+	  ln -s ../../fonts/truetype/ttf-liberation/LiberationSerif-Regular.ttf debian/osgearth/usr/share/osgearth/fonts/times.ttf
 
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-indep

-- 
osgEarth terrain rendering toolkit

