[simutrans-pak64] 03/07: Switch back to the old build

[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 f5d2ecc5909f5b25274ce171f6d6894a998063a7
Author: Jörg Frings-Fürst <debian at jff-webhosting.net>
Date:   Wed Dec 27 19:49:33 2017 +0100

    Switch back to the old build
---
 debian/changelog               | 10 ----------
 debian/control                 |  2 ++
 debian/patches/series          |  2 +-
 debian/rules                   | 23 +++++++++++++++++++++++
 debian/simutrans-pak64.install |  2 +-
 5 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 267735c..aa302ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,16 +2,6 @@ simutrans-pak64 (120.2-1) unstable; urgency=medium
 
   [ Jörg Frings-Fürst ]
   * New upstream release.
-    - Use uscan instead debian/rules get-orig-source.
-    - Rewrite debian/watch to repack with xz compression.
-    - Remove useless parts at debian/rules:
-      + override_dh_auto_build
-      + override_dh_auto_install
-      + override_dh_install
-      + get-orig-source
-    - Remove useless patches.
-    - Remove Build-Depends-Indep simutrans-makeobj.
-    - Rewrite debian/simutrans-pak64.install.
   * Migrate to debhelper 10:
     - Change debian/compat to 10.
     - Bump minimum debhelper version in debian/control to >= 10.
diff --git a/debian/control b/debian/control
index e64c215..250ef41 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,8 @@ Uploaders:
  Jörg Frings-Fürst <debian at jff-webhosting.net>
 Build-Depends:
  debhelper (>= 10)
+Build-Depends-Indep:
+ simutrans-makeobj (>= 120.1)
 Standards-Version: 4.0.0
 Homepage: http://www.simutrans.com/
 Vcs-Git: https://anonscm.debian.org/git/pkg-games/simutrans-pak64.git
diff --git a/debian/patches/series b/debian/patches/series
index 528e89d..b5c7eee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-#0001-buildsystem.patch
+0001-buildsystem.patch
diff --git a/debian/rules b/debian/rules
index 2d33f6a..aaeebcf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,27 @@
 #!/usr/bin/make -f
 
+# SVN revision and package version to use when building .orig.tar.gz
+SVNREV  = 1921
+VERSION = 120.2
+SVNROOT = https://simutrans.svn.sourceforge.net/svnroot/simutrans
+UPSTREAM_SVNREV = 1921 # see README.source
+
 %:
 	dh $@
+
+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
+
+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
+
+get-orig-source:
+	svn export -r $(SVNREV) $(SVNROOT)/pak64 simutrans-pak64-$(VERSION)
+	find simutrans-pak64-$(VERSION) -type f -exec chmod -x "{}" +
+	tar c simutrans-pak64-$(VERSION) | xz >../simutrans-pak64_$(VERSION).orig.tar.xz
+	$(RM) -r simutrans-pak64-$(VERSION)
diff --git a/debian/simutrans-pak64.install b/debian/simutrans-pak64.install
index d58b6be..f9ab3dc 100644
--- a/debian/simutrans-pak64.install
+++ b/debian/simutrans-pak64.install
@@ -1 +1 @@
-pak usr/share/games/simutrans
+simutrans/pak usr/share/games/simutrans

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