[qgis] 07/07: Don't install world.tif, symlink the osgEarth file instead.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository qgis.

commit 649f7f19fe5fe3e732870465c5762d8e22a13e6d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Mar 14 00:39:56 2014 +0100

    Don't install world.tif, symlink the osgEarth file instead.
---
 debian/changelog                      | 1 +
 debian/control                        | 3 ++-
 debian/qgis-plugin-globe-common.links | 1 +
 debian/rules                          | 3 +++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c66847e..25ad81d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qgis (2.2.0-1~exp2) UNRELEASED; urgency=low
 
   * Add patches for changes from upstream release_2.2 branch.
   * Disable doxygen during build, run doxygen in build-indep target.
+  * Don't install world.tif, symlink the osgEarth file instead.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Thu, 13 Mar 2014 21:36:23 +0100
 
diff --git a/debian/control b/debian/control
index 80ddec7..58dba61 100644
--- a/debian/control
+++ b/debian/control
@@ -233,7 +233,8 @@ Description: OSG globe plugin for QGIS
 
 Package: qgis-plugin-globe-common
 Architecture: all
-Depends: ${misc:Depends}
+Depends: osgearth-data,
+         ${misc:Depends}
 Description: OSG globe plugin for QGIS - architecture-independent data
  QGIS is a Geographic Information System (GIS) which manages, analyzes and
  display databases of geographic information.
diff --git a/debian/qgis-plugin-globe-common.links b/debian/qgis-plugin-globe-common.links
new file mode 100644
index 0000000..c53b75b
--- /dev/null
+++ b/debian/qgis-plugin-globe-common.links
@@ -0,0 +1 @@
+usr/share/osgearth/data/world.tif usr/share/qgis/globe/world.tif
diff --git a/debian/rules b/debian/rules
index 4fca0e2..fe13329 100755
--- a/debian/rules
+++ b/debian/rules
@@ -133,6 +133,9 @@ override_dh_auto_install-arch:
 	$(RM) -f $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/jquery.js
 	$(RM) -f $(CURDIR)/debian/tmp/usr/share/qgis/doc/LICENCE
 
+	# Don't include a copy of the world.tif also included in osgearth-data
+	$(RM) -f $(CURDIR)/debian/tmp/usr/share/qgis/globe/world.tif
+
 	# remove extra license files
 	-find $(CURDIR)/debian/tmp/usr/share/qgis/resources/cpt-city-qgis-min/ -name COPYING.xml -delete
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git