[simutrans-pak64] 05/07: some buildsystem changes

[Jörg Frings-Fürst]

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

jff-guest pushed a commit to branch master
in repository simutrans-pak64.

commit 0fbb1ea825db7657f8e21494e31f9d8e4b0247c9
Author: Jörg Frings-Fürst <debian at jff-webhosting.net>
Date:   Sat May 16 14:32:42 2015 +0200

    some buildsystem changes
---
 .gitignore                     |  3 +++
 debian/changelog               |  3 +++
 debian/patches/buildsystem     | 39 ++++++---------------------------------
 debian/rules                   |  5 +++++
 debian/simutrans-pak64.dirs    |  1 +
 debian/simutrans-pak64.install |  5 +++++
 6 files changed, 23 insertions(+), 33 deletions(-)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..37c7f74
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+.bzr
+.bzrignore
+.pc
diff --git a/debian/changelog b/debian/changelog
index 8c3d8d3..7fbf841 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,9 @@ simutrans-pak64 (120.0.1-1) UNRELEASED; urgency=medium
   * debian/copyright:
     - Add myself to debian/*.
     - Rewrite for new upstream release.
+  * Rewrite debian/patches/buildsystem.
+  * New debian/simutrans-pak64.dirs.
+  * Rewrite debian/patches/simutrans-pak64.install.
 
  -- Jörg Frings-Fürst <debian at jff-webhosting.net>  Sat, 16 May 2015 12:24:33 +0200
 
diff --git a/debian/patches/buildsystem b/debian/patches/buildsystem
index 0a21eaf..5c4bbc2 100644
--- a/debian/patches/buildsystem
+++ b/debian/patches/buildsystem
@@ -1,7 +1,9 @@
 Changes to Makefile required for building the Debian package
 
---- a/Makefile
-+++ b/Makefile
+Index: trunk/Makefile
+===================================================================
+--- trunk.orig/Makefile
++++ trunk/Makefile
 @@ -2,7 +2,8 @@
  #   make clean all archives
  # to get fresh and ready to deploy .tbz2 and .zip archives
@@ -9,10 +11,10 @@ Changes to Makefile required for building the Debian package
 -MAKEOBJ ?= ./makeobj
 +SHELL   = /bin/bash
 +MAKEOBJ ?= /usr/games/makeobj
+ LIGHTMAP ?= ./lightmap
  
  DESTDIR  ?= simutrans
- PAKDIR   ?= $(DESTDIR)/pak
-@@ -47,7 +48,7 @@
+@@ -48,7 +49,7 @@ ADDON_DIRS := $(ADDON_DIRS64)
  
  .PHONY: $(DIRS) $(ADDON_DIRS64) copy tar zip
  
@@ -21,32 +23,3 @@ Changes to Makefile required for building the Debian package
  
  archives: tar zip
  
-@@ -64,12 +65,12 @@
- 
- copy:
- 	@echo "===> COPY"
--	@mkdir -p $(PAKDIR)/sound $(PAKDIR)/text $(PAKDIR)/config $(PAKDIR)/scenario
--	@cp -p compat/compat.tab $(PAKDIR)
--	@cp -p sound/* $(PAKDIR)/sound
--	@cp -p config/* $(PAKDIR)/config
--	@cp -p scenario/* $(PAKDIR)/scenario
--	@cp -p pak.text/* $(PAKDIR)/text
-+	install -m 755 -d $(PAKDIR)/sound $(PAKDIR)/text $(PAKDIR)/config $(PAKDIR)/scenario
-+	install -m 644 compat/compat.tab $(PAKDIR)
-+	install -m 644 sound/* $(PAKDIR)/sound
-+	install -m 644 config/* $(PAKDIR)/config
-+	install -m 644 scenario/* $(PAKDIR)/scenario
-+	install -m 644 pak.text/* $(PAKDIR)/text
- 
- $(DIRS64):
- 	@echo "===> PAK64 $@"
-@@ -85,7 +86,8 @@
- 	@echo "===> OUTSIDE with REVISION and grounds"
- 	@mkdir -p $(PAKDIR)
- 	@echo -e -n "Obj=ground\nName=Outside\ncopyright=pak64 111.3 r" >$@/outside.dat
--	@svnversion >>$@/outside.dat
-+	#@svnversion >>$@/outside.dat
-+	@echo $(SVNREV) >>$@/outside.dat
- 	@echo -e "Image[0][0]=outside.0.0\n-" >>$@/outside.dat
- 	@$(MAKEOBJ) PAK64 $(PAKDIR)/ $@/ > /dev/null
- 	@rm $@/outside.dat
diff --git a/debian/rules b/debian/rules
index a9908e0..d196784 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,6 +15,11 @@ override_dh_auto_build:
 override_dh_auto_install:
 	$(MAKE) PAKDIR=$(CURDIR)/debian/simutrans-pak64/usr/share/games/simutrans/pak copy
 
+override_dh_install:
+	dh_install
+	mv $(CURDIR)/debian/simutrans-pak64/usr/share/games/simutrans/pak/pak.text $(CURDIR)/debian/simutrans-pak64/usr/share/games/simutrans/pak/text
+
+
 override_dh_builddeb:
 	dh_builddeb -- -Zxz
 
diff --git a/debian/simutrans-pak64.dirs b/debian/simutrans-pak64.dirs
new file mode 100644
index 0000000..2e28bdd
--- /dev/null
+++ b/debian/simutrans-pak64.dirs
@@ -0,0 +1 @@
+usr/share/games/simutrans/pak
diff --git a/debian/simutrans-pak64.install b/debian/simutrans-pak64.install
index 582de24..329d76e 100644
--- a/debian/simutrans-pak64.install
+++ b/debian/simutrans-pak64.install
@@ -1 +1,6 @@
 simutrans usr/share/games
+scenario usr/share/games/simutrans/pak
+config usr/share/games/simutrans/pak
+sound usr/share/games/simutrans/pak
+pak.text usr/share/games/simutrans/pak
+compat/compat.tab usr/share/games/simutrans/pak

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