[simutrans-pak64] 01/02: commit before merge

[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 e5fefce66854260dafb6a1cc4892ee8a9a3897fb
Author: Jörg Frings-Fürst <debian at jff-webhosting.net>
Date:   Mon Nov 9 19:12:52 2015 +0100

    commit before merge
---
 debian/changelog           | 5 +++--
 debian/control             | 5 +++--
 debian/patches/buildsystem | 8 ++++++++
 debian/rules               | 5 +++--
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 023d32b..bafa92a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
 simutrans-pak64 (120.0.1-1) unstable; urgency=medium
 
-  [Jörg Frings-Fürst]
+  [ Jörg Frings-Fürst ]
   * New upstream release.
+  * Upload to unstable.
   * debian/control:
     - Add myself as uploader.
     - Bump Standards-Version to 3.9.6 (No changes required).
@@ -23,7 +24,7 @@ simutrans-pak64 (120.0.1-1) unstable; urgency=medium
   * debian/source/options:
     - Removed because xz is now standard compression.
 
- -- Jörg Frings-Fürst <debian at jff-webhosting.net>  Sat, 16 May 2015 22:06:36 +0200
+ -- Jörg Frings-Fürst <debian at jff-webhosting.net>  Wed, 07 Oct 2015 06:46:05 +0200
 
 simutrans-pak64 (111.3-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index a02e1cd..7c26aef 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,9 @@ Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders:
  Ansgar Burchardt <ansgar at debian.org>,
  Jörg Frings-Fürst <debian at jff-webhosting.net>
-Build-Depends: 
- debhelper (>= 9)
+Build-Depends:
+ debhelper (>= 9),
+ subversion
 Build-Depends-Indep:
  simutrans-makeobj (>= 120.0)
 Standards-Version: 3.9.6
diff --git a/debian/patches/buildsystem b/debian/patches/buildsystem
index 5c4bbc2..26e9893 100644
--- a/debian/patches/buildsystem
+++ b/debian/patches/buildsystem
@@ -23,3 +23,11 @@ Index: trunk/Makefile
  
  archives: tar zip
  
+@@ -77,6 +78,7 @@ copy:
+ 
+ $(DIRS64):
+ 	@echo "===> PAK64 $@"
++	@echo "====> $(PAKDIR)"
+ 	@mkdir -p $(PAKDIR)
+ 	@$(MAKEOBJ) verbose PAK $(PAKDIR)/ $@/ > /dev/null
+ 
diff --git a/debian/rules b/debian/rules
index 7b61608..9131ae4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,8 +9,9 @@ UPSTREAM_SVNREV = 1657 # see README.source
 %:
 	dh $@
 
-override_dh_auto_build:
-	$(MAKE) SVNREV=$(UPSTREAM_SVNREV) all
+#override_dh_auto_build:
+#	$(MAKE) SVNREV=$(UPSTREAM_SVNREV) all
+#	$(MAKE) all
 
 override_dh_auto_install:
 	$(MAKE) PAKDIR=$(CURDIR)/debian/simutrans-pak64/usr/share/games/simutrans/pak copy

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