[minetest-v04x] 08/10: fix the installation of the packages

[Martin Quinson]

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

mquinson pushed a commit to branch master
in repository minetest-v04x.

commit 319831d7c1802d5da2705b90d40d683e0e4155cd
Author: Martin Quinson <martin.quinson at loria.fr>
Date:   Tue May 17 08:00:36 2016 +0200

    fix the installation of the packages
---
 debian/minetest-data.install    | 11 +++++------
 debian/minetest-server.manpages |  2 +-
 debian/minetest.manpages        |  2 +-
 debian/rules                    | 22 ++++++++++------------
 4 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/debian/minetest-data.install b/debian/minetest-data.install
index 6e05ee3..998ab41 100644
--- a/debian/minetest-data.install
+++ b/debian/minetest-data.install
@@ -1,11 +1,10 @@
 
-
-usr/share/doc/minetest/README.txt    usr/share/doc/minetest-data
-usr/share/doc/minetest/lua_api.txt   usr/share/doc/minetest-data
-usr/share/doc/minetest/mapformat.txt usr/share/doc/minetest-data
-usr/share/doc/minetest/minetest.conf.example usr/share/doc/minetest-data
+usr/share/doc/minetest/*             usr/share/doc/minetest/
 usr/share/games/minetest/builtin/*   usr/share/games/minetest/builtin
 usr/share/games/minetest/client/*    usr/share/games/minetest/client
 usr/share/games/minetest/games/*     usr/share/games/minetest/games
 usr/share/games/minetest/textures/*  usr/share/games/minetest/textures
-usr/share/locale/*                   usr/share/locale
+usr/share/games/minetest/fonts
+usr/share/locale
+usr/share/icons/hicolor/scalable/apps/minetest.svg
+usr/share/appdata/minetest.appdata.xml
\ No newline at end of file
diff --git a/debian/minetest-server.manpages b/debian/minetest-server.manpages
index ccf5882..0ed2d3a 100644
--- a/debian/minetest-server.manpages
+++ b/debian/minetest-server.manpages
@@ -1 +1 @@
-doc/minetestserver.6
+debian/tmp/usr/share/man/man6/minetestserver.6
\ No newline at end of file
diff --git a/debian/minetest.manpages b/debian/minetest.manpages
index 2bb7d5b..a4c6bcf 100644
--- a/debian/minetest.manpages
+++ b/debian/minetest.manpages
@@ -1 +1 @@
-doc/minetest.6
+debian/tmp/usr/share/man/man6/minetest.6
diff --git a/debian/rules b/debian/rules
index a470f91..6322f19 100755
--- a/debian/rules
+++ b/debian/rules
@@ -62,25 +62,23 @@ override_dh_installchangelogs:
 	dh_installchangelogs debian/changelog.upstream
 
 override_dh_install:
-	dh_install --list-missing -X.gitignore
+	dh_install --list-missing
 	# copy the logo
-	mkdir -p \
-		debian/minetest/usr/share/icons/hicolor/24x24/apps/ \
-		debian/minetest/usr/share/pixmaps/
-	cp \
-		misc/minetest-icon-24x24.png \
+	mkdir -p  debian/minetest/usr/share/icons/hicolor/24x24/apps/ \
+		  debian/minetest/usr/share/pixmaps/
+	cp 	misc/minetest-icon-24x24.png \
 		debian/minetest/usr/share/icons/hicolor/24x24/apps/minetest-icon.png
-	convert \
-		debian/minetest/usr/share/icons/hicolor/24x24/apps/minetest-icon.png \
+	convert debian/minetest/usr/share/icons/hicolor/24x24/apps/minetest-icon.png \
 		debian/minetest/usr/share/pixmaps/minetest.xpm
-	mkdir -p debian/minetest/usr/share/icons/hicolor/scalable/apps/
-	cp misc/minetest-icon.svg debian/minetest/usr/share/icons/hicolor/scalable/apps/
-	# take care of the fonts we need
-	mkdir -p debian/minetest-data/usr/share/games/minetest/fonts/
+
+	# Don't include ttf files, but links to the system ones
+	rm debian/minetest-data/usr/share/games/minetest/fonts/liberationmono.ttf
 	ln -s /usr/share/fonts/truetype/liberation/LiberationMono-Regular.ttf \
 	      debian/minetest-data/usr/share/games/minetest/fonts/liberationmono.ttf
+	rm debian/minetest-data/usr/share/games/minetest/fonts/liberationsans.ttf
 	ln -s /usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf \
 	      debian/minetest-data/usr/share/games/minetest/fonts/liberationsans.ttf
+
 	# Install the mapper script
 	mkdir -p debian/minetest-data/usr/games
 	cp util/minetestmapper.py debian/minetest-data/usr/games/minetest-mapper

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