[tworld] 03/03: apply upstream supplied patch for DESTDIR support

[Gerfried Fuchs]

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

rhonda pushed a commit to branch master
in repository tworld.

commit 5461701ff6720ae8bb0a3219e99e5ab04bd02767
Author: Rhonda D'Vine <rhonda at debian.org>
Date:   Tue Jan 5 21:06:15 2016 +0100

    apply upstream supplied patch for DESTDIR support
---
 debian/changelog                  |  2 ++
 debian/patches/03_fix-Makefile.in | 21 ++++++++++++++++++---
 debian/rules                      |  4 ++++
 debian/tworld-data.install        |  7 +------
 debian/tworld.install             |  4 ++--
 5 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c994192..84edfc2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ tworld (1.3.2-2) unstable; urgency=medium
     tweak. Closes: #792980 is about a different issue, but that one is fixed
     and the one report about reproducible build open so closing it here.
   * Get rid of ancient postinst script from oldstable times.
+  * Apply patch provided by upstream to support DESTDIR and use
+    dh_auto_install again.
 
  -- Rhonda D'Vine <rhonda at debian.org>  Tue, 05 Jan 2016 14:23:32 +0100
 
diff --git a/debian/patches/03_fix-Makefile.in b/debian/patches/03_fix-Makefile.in
index a1ea706..6c93776 100644
--- a/debian/patches/03_fix-Makefile.in
+++ b/debian/patches/03_fix-Makefile.in
@@ -6,9 +6,24 @@ Description: patch to fix clean target
 
 Index: VCS/Makefile.in
 ===================================================================
---- VCS.orig/Makefile.in
-+++ VCS/Makefile.in
-@@ -110,10 +110,10 @@ all: tworld
+--- VCS.orig/Makefile.in	2016-01-05 14:48:50.500844745 +0100
++++ VCS/Makefile.in	2016-01-05 14:50:50.101437812 +0100
+@@ -9,10 +9,10 @@
+ 
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+-bindir = @bindir@
+-datarootdir = @datarootdir@
+-sharedir = @sharedir@
+-mandir = @mandir@
++bindir = $(DESTDIR)@bindir@
++datarootdir = $(DESTDIR)@datarootdir@
++sharedir = $(DESTDIR)@sharedir@
++mandir = $(DESTDIR)@mandir@
+ 
+ CC = @CC@
+ 
+@@ -110,10 +110,10 @@
  clean:
  	rm -f $(OBJS) tworld comptime.h config.*
  	rm -f tworldres.o tworld.exe
diff --git a/debian/rules b/debian/rules
index 887d9da..f4e95c2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,9 @@ override_dh_clean:
 	rm -f Makefile oshw-sdl/Makefile oshw
 	dh_clean
 
+override_dh_auto_configure:
+	dh_auto_configure -- --bindir=/usr/games --with-sharedir=/usr/share/games/tworld
+
 override_dh_auto_build:
 	echo \#define COMPILE_TIME \"$(BUILD_DATE)\" > comptime.h
 	dh_auto_build
@@ -17,6 +20,7 @@ override_dh_auto_install:
 	mkdir -p debian/tworld-data/usr/share/man/man6
 	pod2man -s 6 -r 'Tile World' -c '' debian/c4 \
 		debian/tworld-data/usr/share/man/man6/c4.6
+	dh_auto_install
 
 override_dh_installdocs:
 	dh_installdocs --link-doc=tworld-data
diff --git a/debian/tworld-data.install b/debian/tworld-data.install
index 17e5381..9e6e9d5 100644
--- a/debian/tworld-data.install
+++ b/debian/tworld-data.install
@@ -1,7 +1,2 @@
+usr/share/games/tworld
 debian/c4 usr/games
-sets/*.dac usr/share/games/tworld/sets
-data/*.dat usr/share/games/tworld/data
-res/rc     usr/share/games/tworld/res
-res/*.bmp  usr/share/games/tworld/res
-res/*.txt  usr/share/games/tworld/res
-res/*.wav  usr/share/games/tworld/res
diff --git a/debian/tworld.install b/debian/tworld.install
index 3dcb0e4..0e2c0de 100644
--- a/debian/tworld.install
+++ b/debian/tworld.install
@@ -1,4 +1,4 @@
-tworld usr/games
-docs/tworld.6 usr/share/man/man6
+usr/games/tworld
+usr/share/man/man6
 debian/tworld.desktop usr/share/applications
 debian/tworld.xpm usr/share/pixmaps

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