[simutrans-pak64] 01/01: Revert "cleaning"

[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 109d54865f8fd38fabd85c52bf2cce95ecc64ee3
Author: Jörg Frings-Fürst <debian at jff-webhosting.net>
Date:   Sun Feb 7 11:35:38 2016 +0100

    Revert "cleaning"
    
    This reverts commit 7aa1946cfd6ac20d81661def79631a91addc7cef.
---
 debian/changelog            |  4 ++--
 debian/patches/buildsystem~ | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 13cb37f..630dbea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-simutrans-pak64 (120.0.1-2) unstable; urgency=medium
+simutrans-pak64 (120.0.1-2) UNRELEASED; urgency=medium
 
   * debian/patches/buildsystem:
     - Change makeobj path from /usr/games to /usr/lib/simutrans.
@@ -6,7 +6,7 @@ simutrans-pak64 (120.0.1-2) unstable; urgency=medium
   * debian/control:
     - Bump makeobj version to >= 120.1.1+repack-2.
 
- -- Jörg Frings-Fürst <debian at jff-webhosting.net>  Wed, 18 Nov 2015 10:25:55 +0100
+ -- Jörg Frings-Fürst <debian at jff-webhosting.net>  Tue, 17 Nov 2015 22:13:14 +0100
 
 simutrans-pak64 (120.0.1-1) unstable; urgency=medium
 
diff --git a/debian/patches/buildsystem~ b/debian/patches/buildsystem~
new file mode 100644
index 0000000..26e9893
--- /dev/null
+++ b/debian/patches/buildsystem~
@@ -0,0 +1,33 @@
+Changes to Makefile required for building the Debian package
+
+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
+ 
+-MAKEOBJ ?= ./makeobj
++SHELL   = /bin/bash
++MAKEOBJ ?= /usr/games/makeobj
+ LIGHTMAP ?= ./lightmap
+ 
+ DESTDIR  ?= simutrans
+@@ -48,7 +49,7 @@ ADDON_DIRS := $(ADDON_DIRS64)
+ 
+ .PHONY: $(DIRS) $(ADDON_DIRS64) copy tar zip
+ 
+-all: copy $(DIRS) zip
++all: $(DIRS)
+ 
+ archives: tar zip
+ 
+@@ -77,6 +78,7 @@ copy:
+ 
+ $(DIRS64):
+ 	@echo "===> PAK64 $@"
++	@echo "====> $(PAKDIR)"
+ 	@mkdir -p $(PAKDIR)
+ 	@$(MAKEOBJ) verbose PAK $(PAKDIR)/ $@/ > /dev/null
+ 

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