[SCM] marble packaging branch, master, updated. debian/4%17.08.3-2-5-g931fbc9

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/marble.git;a=commitdiff;h=0c7421d

The following commit has been merged in the master branch:
commit 0c7421d8bc224b1e40f4a492b59ce6febdf3ba77
Author: Pino Toscano <pino at debian.org>
Date:   Tue Jan 2 19:59:45 2018 +0100

    simplify install
---
 debian/changelog              |  4 ++++
 debian/marble-qt-data.install | 14 +-------------
 debian/not-installed          |  3 ---
 debian/rules                  |  6 ++++++
 4 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 13374f3..6c41207 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,10 @@ marble (4:17.08.3-3) UNRELEASED; urgency=medium
       depend on it
     - new plasma-marble: contains all the Plasma-related bits; move the Plasma
       dependencies for it from marble-data (Closes: #884027)
+  * Remove in the dh_auto_install override all the files that must not be
+    installed, instead of ignoring them
+    - simplify a bit one install file
+    - drop not-installed, no more needed now
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 02 Jan 2018 18:12:11 +0100
 
diff --git a/debian/marble-qt-data.install b/debian/marble-qt-data.install
index 6f9f241..be31163 100644
--- a/debian/marble-qt-data.install
+++ b/debian/marble-qt-data.install
@@ -1,15 +1,3 @@
 usr/share/icons/hicolor/*/apps/marble.png
 usr/share/locale/*/LC_MESSAGES/marble_qt.qm
-usr/share/marble/data/*.css
-usr/share/marble/data/*.html
-usr/share/marble/data/*.leg
-usr/share/marble/data/audio/
-usr/share/marble/data/bitmaps/
-usr/share/marble/data/flags/
-usr/share/marble/data/maps/
-usr/share/marble/data/mwdbii/
-usr/share/marble/data/naturalearth/
-usr/share/marble/data/placemarks/
-usr/share/marble/data/stars/
-usr/share/marble/data/svg/
-usr/share/marble/data/weather/
+usr/share/marble/
diff --git a/debian/not-installed b/debian/not-installed
deleted file mode 100644
index c9fcb36..0000000
--- a/debian/not-installed
+++ /dev/null
@@ -1,3 +0,0 @@
-# extra license files
-./usr/share/marble/data/LICENSE.txt
-./usr/share/marble/data/licenses/
diff --git a/debian/rules b/debian/rules
index ba99cd7..5c9645b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,6 +21,12 @@ override_dh_auto_configure:
 				 -DMARBLE_INSTALL_ANDROID_APPS=ON \
 				 $(conf_args)
 
+override_dh_auto_install:
+	$(overridden_command)
+	# remove extra license files
+	rm -f debian/tmp/usr/share/marble/data/LICENSE.txt
+	rm -rf debian/tmp/usr/share/marble/data/licenses/
+
 override_dh_strip:
 	$(overridden_command) --dbgsym-migration='marble-dbg (<= 4:15.12.1-1~~)'
 

-- 
marble packaging