[SCM] osgearth branch, master, updated. debian/1.4.1-1-71-gecb0256

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 6dd990e24f541eb40566c78f491bea15cb8c8431
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Sep 17 02:51:03 2013 +0200

    Include data/resources/ in package osgearth-data.

diff --git a/debian/changelog b/debian/changelog
index 880bbe1..80dfc21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,7 @@ osgearth (2.4.0+dfsg-4) UNRELEASED; urgency=low
     - osgearth_overlayviewer
   * Don't install binaries which depend on removed data files, nor example
     binaries.
+  * Include data/resources/ in package osgearth-data.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Fri, 13 Sep 2013 15:14:27 +0200
 
diff --git a/debian/rules b/debian/rules
index fda21d4..1a0311a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -60,7 +60,8 @@ override_dh_auto_install:
 	  sed --in-place -e 's!\\!/!g' -e 's!\.\./data!/usr/share/osgearth/data!g' $(CURDIR)/debian/osgearth-data/usr/share/osgearth/maps/*.earth
 
 	mkdir -p $(CURDIR)/debian/osgearth-data/usr/share/osgearth/data && \
-	  cp $(CURDIR)/data/world.tif $(CURDIR)/debian/osgearth-data/usr/share/osgearth/data/
+	  cp $(CURDIR)/data/world.tif $(CURDIR)/debian/osgearth-data/usr/share/osgearth/data/ && \
+	  cp -r $(CURDIR)/data/resources/ $(CURDIR)/debian/osgearth-data/usr/share/osgearth/data/
 
 	# Don't install binaries which depend on removed data files
 	$(RM) -f $(CURDIR)/debian/tmp/usr/bin/osgearth_annotation

-- 
osgEarth terrain rendering toolkit