[trigger-rally-data] 04/05: - Simplify d/rules using short debhelper format: - Install files using d/install, removing non-existant dir fonts - Make links using d/links - d/dirs is not required - remove compatibility link, as the affected package is only in o-o-stable - make symlink from README.txt.gz to Changelog.gz -- as it contains the changelog.

[Tobias Frost]

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

tobi pushed a commit to branch master
in repository trigger-rally-data.

commit 53d8b724714d7eab3715c7df074d580b0da850d4
Author: Tobias Frost <tobi at coldtobi.de>
Date:   Fri Jun 19 12:57:15 2015 +0200

    - Simplify d/rules using short debhelper format:
    - Install files using d/install, removing non-existant dir fonts
    - Make links using d/links
    - d/dirs is not required
    - remove compatibility link, as the affected package is only in o-o-stable
    - make symlink from README.txt.gz to Changelog.gz -- as it contains the
      changelog.
---
 debian/changelog |  7 ++++++
 debian/dirs      |  2 --
 debian/install   |  7 ++++++
 debian/links     |  2 ++
 debian/rules     | 72 +++-----------------------------------------------------
 5 files changed, 19 insertions(+), 71 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e9a63d4..58c5dc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,13 @@ trigger-rally-data (0.6.1-1) UNRELEASED; urgency=medium
     d/control no change was necessary.
   * Fix homepage in debian/control
   * Switch debian/compat to 9
+     - Simplify d/rules using short debhelper format:
+     - Install files using d/install, removing non-existant dir fonts
+     - Make links using d/links
+     - d/dirs is not required
+     - remove compatibility link, as the affected package is only in o-o-stable
+     - make symlink from README.txt.gz to Changelog.gz -- as it contains the
+       changelog.
   * d/copyright:
      - Rewrite using machine readable format
      - Complete copyright information (Closes: #784343)
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index 8c14964..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/share/games/trigger-rally
-/etc
diff --git a/debian/install b/debian/install
new file mode 100644
index 0000000..1f1e93f
--- /dev/null
+++ b/debian/install
@@ -0,0 +1,7 @@
+events/		usr/share/games/trigger-rally
+maps/  		usr/share/games/trigger-rally
+plugins/ 	usr/share/games/trigger-rally
+sounds/ 	usr/share/games/trigger-rally
+textures/ 	usr/share/games/trigger-rally
+trigger.config.defs etc
+vehicles/ 	usr/share/games/trigger-rally
diff --git a/debian/links b/debian/links
new file mode 100644
index 0000000..c38fdd9
--- /dev/null
+++ b/debian/links
@@ -0,0 +1,2 @@
+etc/trigger.config.defs usr/share/games/trigger-rally/trigger.config.defs
+usr/share/doc/trigger-rally-data/README.txt.gz usr/share/doc/trigger-rally-data/changelog.gz
diff --git a/debian/rules b/debian/rules
index 7c1bad4..a64c50d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,81 +5,15 @@
 DATADIR=usr/share/games/trigger-rally
 # package name
 PACKAGE=trigger-rally-data
-# top-level dirs that are installed
-INSTALLDIRS=events	\
-	fonts		\
-	maps		\
-	plugins		\
-	sounds		\
-	textures	\
-	vehicles
-
-# game data that is shipped executable but shouldn't be
-EXECUTABLE_GAME_DATA=				\
-	maps/greengrounds/colormap.jpg		\
-	maps/mountainpass/heightmap.png		\
-	maps/mountainpass/foliagemap.png	\
-	maps/mountainpass/colormap.jpg		\
-	maps/greengrounds/greengrounds.level	\
-	maps/mountainpass/mountainpass.level	\
-	maps/greengrounds/foliagemap.png	\
-	maps/greengrounds/heightmap.png
 
 # top-level files that go to /etc and are linked to 
 # DATADIR
 LINKEDCONFFILES=trigger.config.defs
 
-clean:
-	dh_testdir
-	dh_testroot
-	dh_clean --exclude=vehicles/seat/seat.vehicle.orig
-
-install: 
-	dh_testdir
-	dh_testroot
-	dh_clean --exclude=vehicles/seat/seat.vehicle.orig
-	dh_installdirs
-
-	# manually installing all files
-	for i in $(INSTALLDIRS); do			\
-		cp -r $$i debian/$(PACKAGE)/$(DATADIR);	\
-	done
-	for i in $(LINKEDCONFFILES); do			\
-		cp -r $$i debian/$(PACKAGE)/etc;	\
-		dh_link etc/$$i $(DATADIR)/$$i;		\
-	done
-	# fix execute permissions for 
-	for i in $(EXECUTABLE_GAME_DATA); do			\
-		chmod ugo-x debian/$(PACKAGE)/$(DATADIR)/$$i;	\
-	done
+%:
+	dh $@
 
+override_dh_fixperms:
 	cd debian/$(PACKAGE)/$(DATADIR) && find . -name '*.level' | xargs chmod ugo-x
 	cd debian/$(PACKAGE)/$(DATADIR) && find . -name '*.png' | xargs chmod ugo-x
 	cd debian/$(PACKAGE)/$(DATADIR) && find . -name '*.jpg' | xargs chmod ugo-x
-
-	# compatibility link for trigger version 0.5.2.1-2+b1
-	dh_link $(DATADIR)/textures/dial_speed_mph.png	\
-		$(DATADIR)/textures/dial_speed.png
-
-
-binary-arch: build install
-
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb -- -Zxz
-
-# we don't build anything!
-build:
-build-arch:
-build-indep:
-
-binary: binary-indep binary-arch
-.PHONY: binary-indep binary-arch binary install build build-arch build-indep

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