[SCM] transportation simulator branch, master, updated. debian/110.0.1-3-11-gcbd09ff

[Ansgar Burchardt]

The following commit has been merged in the master branch:
commit bfd8eff6b50f4f3a3f0354eff4874e738e057cac
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Thu Nov 3 19:45:58 2011 +0100

    Simplify debian/rules by using override_* targets.

diff --git a/debian/control b/debian/control
index c17a3b3..78f1ee7 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: games
 Priority: extra
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Ansgar Burchardt <ansgar at debian.org>, Clint Adams <clint at gnu.org>
-Build-Depends: debhelper (>= 7), libsdl1.2-dev, libsdl-mixer1.2-dev, zlib1g-dev, imagemagick, libpng12-dev, libbz2-dev, libssl-dev, dpkg (>= 1.15.7), hardening-includes
+Build-Depends: debhelper (>= 7.0.50~), libsdl1.2-dev, libsdl-mixer1.2-dev, zlib1g-dev, imagemagick, libpng12-dev, libbz2-dev, libssl-dev, dpkg (>= 1.15.7), hardening-includes
 Standards-Version: 3.9.2
 Homepage: http://www.simutrans.com/
 Vcs-Git: git://git.debian.org/git/pkg-games/simutrans.git
diff --git a/debian/rules b/debian/rules
index c26809e..4551dd8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,75 +16,46 @@ CFLAGS   += $(HARDENING_CFLAGS)
 CXXFLAGS += $(HARDENING_CFLAGS)
 LDFLAGS  += $(HARDENING_LDFLAGS)
 
-build: build-stamp
-build-stamp:
-	dh build --parallel
+TARGETS := binary binary-arch binary-indep build build-arch build-indep clean
+.PHONY: $(TARGETS)
+$(TARGETS):
+	dh $@ --parallel
+
+override_dh_auto_build:
+	dh_auto_build
 	$(MAKE) -C makeobj
 	$(MAKE) -C nettools
 
 	convert simutrans.ico -alpha on debian/simutrans.xpm
 
-	mkdir skin
+	[ -d skin ] || mkdir skin
 	./build/default/makeobj/makeobj pak ./skin/ ./skins.src/
 
-	touch $@
-
-# `make clean' will fail if there is no config.default, so make sure
-# we have one
-clean:
-	dh_testdir
-
-	$(MAKE) clean
+override_dh_auto_clean:
+	dh_auto_clean
 	$(MAKE) -C makeobj clean
 	$(MAKE) -C nettools clean
 	$(RM) -r skin
 
-	dh_clean
-
 # These languages will be excluded
 BROKEN_LANG = ce cn id tr
 
-install: build
-	dh install --before dh_installchangelogs
-	dh_installchangelogs simutrans/history.txt
-	dh install --remaining
-
-	#$(MAKE) DESTDIR=$(CURDIR)/debian/simutrans install
-	install -m 644 debian/simutrans.xpm $(CURDIR)/debian/simutrans/usr/share/pixmaps
-	install -m 644 debian/simutrans.desktop $(CURDIR)/debian/simutrans/usr/share/applications
+override_dh_install:
+	dh_install
 
-	install build/default/sim $(CURDIR)/debian/simutrans/usr/games/simutrans
+	install -m 755 build/default/sim $(CURDIR)/debian/simutrans/usr/games/simutrans
+	install -m 755 build/default/nettool/nettool $(CURDIR)/debian/simutrans/usr/games/simutrans-nettool
 
-	install -m 644 simutrans/config/simuconf.tab $(CURDIR)/debian/simutrans-data/usr/share/games/simutrans/config
-	install -m 644 simutrans/font/* $(CURDIR)/debian/simutrans-data/usr/share/games/simutrans/font
-	install -m 644 simutrans/music/*.tab $(CURDIR)/debian/simutrans-data/usr/share/games/simutrans/music
-	install -m 644 simutrans/music/*.mid $(CURDIR)/debian/simutrans-data/usr/share/games/simutrans/music
-	install -m 644 debian/translations/*.tab $(CURDIR)/debian/simutrans-data/usr/share/games/simutrans/text
 	for lang in $(BROKEN_LANG); do \
 	  $(RM) $(CURDIR)/debian/simutrans-data/usr/share/games/simutrans/text/$$lang.tab ; \
 	done
-	for lang in cz de dk en es fr hu it ja nl pl pt ro ru sk ; do \
-	  install -m 644 simutrans/text/$$lang/*.txt $(CURDIR)/debian/simutrans-data/usr/share/games/simutrans/text/$$lang ; \
-	done
-	rmdir --ignore-fail-on-non-empty $(CURDIR)/debian/simutrans-data/usr/share/games/simutrans/text/zh
 
-	install -m 755 build/default/makeobj/makeobj $(CURDIR)/debian/simutrans-makeobj/usr/games/makeobj
-	install -m 755 build/default/nettool/nettool $(CURDIR)/debian/simutrans/usr/games/simutrans-nettool
+override_dh_installchangelogs:
+	dh_installchangelogs simutrans/history.txt
 
 override_dh_builddeb:
 	dh_builddeb -- -Zxz
 
-# Build architecture-independent files here.
-binary-indep: build install
-	dh binary-indep
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh binary-arch
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
-
 # SVN revision and package version to use when building .orig.tar.gz
 SVNREV  = 4913
 VERSION = 111.0
diff --git a/debian/simutrans-data.install b/debian/simutrans-data.install
index 44d2d7b..033ccfd 100644
--- a/debian/simutrans-data.install
+++ b/debian/simutrans-data.install
@@ -1 +1,6 @@
-skin usr/share/games/simutrans/
+skin/* usr/share/games/simutrans/skin
+simutrans/config/simuconf.tab usr/share/games/simutrans/config
+simutrans/font/* usr/share/games/simutrans/font
+simutrans/music/*.mid simutrans/music/*.tab usr/share/games/simutrans/music
+simutrans/text/?? usr/share/games/simutrans/text
+debian/translations/*.tab usr/share/games/simutrans/text
diff --git a/debian/simutrans-makeobj.install b/debian/simutrans-makeobj.install
new file mode 100644
index 0000000..53a35e5
--- /dev/null
+++ b/debian/simutrans-makeobj.install
@@ -0,0 +1 @@
+build/default/makeobj/makeobj usr/games
diff --git a/debian/simutrans.install b/debian/simutrans.install
new file mode 100644
index 0000000..e13743c
--- /dev/null
+++ b/debian/simutrans.install
@@ -0,0 +1,2 @@
+debian/simutrans.xpm usr/share/pixmaps
+debian/simutrans.desktop usr/share/applications

-- 
transportation simulator