[oolite] 04/06: Clarify Resources installation, fixing d79d066923da665d20aab88e9a250b2b17e8ff5a.

[Nicolas Boulenguez]

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

nicobou-guest pushed a commit to branch master
in repository oolite.

commit 9747a2989728e049128eac02f770fcc86c651baf
Author: Nicolas Boulenguez <nicolas.boulenguez at free.fr>
Date:   Thu Sep 3 01:32:06 2015 +0200

    Clarify Resources installation, fixing d79d066923da665d20aab88e9a250b2b17e8ff5a.
---
 debian/oolite-data-sounds.install |  2 --
 debian/oolite-data.install        |  1 -
 debian/rules                      | 12 ++++++++++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/debian/oolite-data-sounds.install b/debian/oolite-data-sounds.install
deleted file mode 100644
index d0556ce..0000000
--- a/debian/oolite-data-sounds.install
+++ /dev/null
@@ -1,2 +0,0 @@
-oolite.app/Resources/Music  usr/share/oolite
-oolite.app/Resources/Sounds usr/share/oolite
diff --git a/debian/oolite-data.install b/debian/oolite-data.install
deleted file mode 100644
index a5f5c53..0000000
--- a/debian/oolite-data.install
+++ /dev/null
@@ -1 +0,0 @@
-oolite.app/Resources usr/share/oolite
diff --git a/debian/rules b/debian/rules
index 4d00509..68b5283 100755
--- a/debian/rules
+++ b/debian/rules
@@ -136,5 +136,17 @@ override_dh_auto_clean::
 	rm -f $(PDF_FROM_DOC) $(PDF_FROM_ODT)
 
 ######################################################################
+RESOURCES := oolite.app/Resources
+SOUNDS    := Music Sounds
+override_dh_install:
+	dh_install --package=oolite-data-sounds \
+          $(addprefix $(RESOURCES)/,$(SOUNDS)) usr/share/oolite
+ # All other Resources/ go to oolite-data.
+	dh_install --package=oolite-data \
+          $(addprefix --exclude=$(RESOURCES)/,$(SOUNDS)) \
+          $(RESOURCES)/* usr/share/oolite
+	dh_install --remaining-packages
+
+######################################################################
 override_dh_installchangelogs:
 	dh_installchangelogs --all Doc/CHANGELOG.TXT

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