[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 0d43c624f770265ade3795601b867566106abdd9
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Sep 16 15:38:35 2013 +0200

    Don't install binaries which depend on removed data files.

diff --git a/debian/changelog b/debian/changelog
index a38ef49..0265d9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,7 @@ osgearth (2.4.0+dfsg-4) UNRELEASED; urgency=low
     - osgearth_backfill
     - osgearth_boundarygen
     - osgearth_overlayviewer
+  * Don't install binaries which depend on removed data files.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Fri, 13 Sep 2013 15:14:27 +0200
 
diff --git a/debian/rules b/debian/rules
index 26d7f52..300d2a6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -62,6 +62,19 @@ override_dh_auto_install:
 	mkdir -p $(CURDIR)/debian/osgearth-data/usr/share/osgearth/data && \
 	  cp $(CURDIR)/data/world.tif $(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
+	$(RM) -f $(CURDIR)/debian/tmp/usr/bin/osgearth_city
+	$(RM) -f $(CURDIR)/debian/tmp/usr/bin/osgearth_clamp
+	$(RM) -f $(CURDIR)/debian/tmp/usr/bin/osgearth_featureeditor
+	$(RM) -f $(CURDIR)/debian/tmp/usr/bin/osgearth_features
+	$(RM) -f $(CURDIR)/debian/tmp/usr/bin/osgearth_imageoverlay
+	$(RM) -f $(CURDIR)/debian/tmp/usr/bin/osgearth_los
+	$(RM) -f $(CURDIR)/debian/tmp/usr/bin/osgearth_minimap
+	$(RM) -f $(CURDIR)/debian/tmp/usr/bin/osgearth_occlusionculling
+	$(RM) -f $(CURDIR)/debian/tmp/usr/bin/osgearth_qt
+	$(RM) -f $(CURDIR)/debian/tmp/usr/bin/osgearth_tracks
+
 override_dh_install:
 	dh_install --autodest --list-missing
 

-- 
osgEarth terrain rendering toolkit