[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

simutrans Bug #780724

Hello Markus,

I have the a bugfix version for simutrans* ready for a review.

My changes:

simutrans (120.1.1+repack-2) unstable; urgency=medium

  [ Jörg Frings-Fürst ]
  * Move makeobj from /usr/games to /usr/lib/simutrans (Closes: #780724).


simutrans-pak128.britain (1.16-2) unstable; urgency=medium

  * debian/control:
    - Correct Vcs-*.
    - Bump makeobj version to >= 120.1.1+repack-2.
  * debian/patches/0500-build.patch:
    - Change makobj path from /usr/games to /usr/lib/simutrans.
    - Rename to 0001-build.patch


simutrans-pak64 (120.0.1-2) unstable; urgency=medium

  * debian/patches/buildsystem:
    - Change makeobj path from /usr/games to /usr/lib/simutrans.
    - Rename to 0001-buildsystem.patch
  * debian/control:
    - Bump makeobj version to >= 120.1.1+repack-2.

I have change the install dir of makeobj to /usr/lib/simutrans and
remove the old one via simutrans-makeobj.postrm.

Build with sbuild and pdebuild are ok. Lintian and puiparts are ok,
too.

The debdiffs are attached and the packages are uploaded to
mentors[1..3].

CU
Jörg

[1] http://mentors.debian.net/debian/pool/main/s/simutrans/simutrans_120.1.1+repack-2.dsc
[2] http://mentors.debian.net/debian/pool/main/s/simutrans-pak128.britain/simutrans-pak128.britain_1.16-2.dsc
[3] http://mentors.debian.net/debian/pool/main/s/simutrans-pak64/simutrans-pak64_120.0.1-2.dsc

-- 
New:
GPG Fingerprint: 63E0 075F C8D4 3ABB 35AB  30EE 09F8 9F3C 8CA1 D25D
GPG key (long) : 09F89F3C8CA1D25D
GPG Key        : 8CA1D25D
CAcert Key S/N : 0E:D4:56

Old pgp Key: BE581B6E (revoked since 2014-12-31).

Jörg Frings-Fürst
D-54526 Niederkail

Threema: SYR8SJXB

IRC: j_f-f@freenode.net
     j_f-f@oftc.net

My wish list: 
 - Please send me a picture from the nature at your home.




diff -Nru simutrans-120.1.1+repack/debian/changelog simutrans-120.1.1+repack/debian/changelog
--- simutrans-120.1.1+repack/debian/changelog	2015-11-14 19:01:59.000000000 +0100
+++ simutrans-120.1.1+repack/debian/changelog	2015-11-18 12:17:35.000000000 +0100
@@ -1,3 +1,10 @@
+simutrans (120.1.1+repack-2) unstable; urgency=medium
+
+  [ Jörg Frings-Fürst ]
+  * Move makeobj from /usr/games to /usr/lib/simutrans (Closes: #780724).
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Wed, 18 Nov 2015 12:17:29 +0100
+
 simutrans (120.1.1+repack-1) unstable; urgency=medium
 
   [ Jörg Frings-Fürst ]
diff -Nru simutrans-120.1.1+repack/debian/simutrans-makeobj.dirs simutrans-120.1.1+repack/debian/simutrans-makeobj.dirs
--- simutrans-120.1.1+repack/debian/simutrans-makeobj.dirs	2015-05-15 09:22:54.000000000 +0200
+++ simutrans-120.1.1+repack/debian/simutrans-makeobj.dirs	2015-11-17 21:15:14.000000000 +0100
@@ -1,2 +1 @@
-usr/games
-
+usr/lib/simutrans
diff -Nru simutrans-120.1.1+repack/debian/simutrans-makeobj.install simutrans-120.1.1+repack/debian/simutrans-makeobj.install
--- simutrans-120.1.1+repack/debian/simutrans-makeobj.install	2015-05-15 09:22:54.000000000 +0200
+++ simutrans-120.1.1+repack/debian/simutrans-makeobj.install	2015-11-17 21:15:00.000000000 +0100
@@ -1 +1 @@
-build/default/makeobj/makeobj usr/games
+build/default/makeobj/makeobj usr/lib/simutrans
diff -Nru simutrans-120.1.1+repack/debian/simutrans-makeobj.postrm simutrans-120.1.1+repack/debian/simutrans-makeobj.postrm
--- simutrans-120.1.1+repack/debian/simutrans-makeobj.postrm	1970-01-01 01:00:00.000000000 +0100
+++ simutrans-120.1.1+repack/debian/simutrans-makeobj.postrm	2015-11-17 21:52:59.000000000 +0100
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+#
+# remove backup files
+# New at 120.1.1+repack-2
+# Debian bug #780724
+#
+if [ -e /usr/games/makeobj ] ; then
+    rm -f /usr/games/makeobj
+fi
+
+
+#DEBHELPER#

diff -Nru simutrans-pak64-120.0.1/debian/changelog simutrans-pak64-120.0.1/debian/changelog
--- simutrans-pak64-120.0.1/debian/changelog	2015-11-14 09:26:04.000000000 +0100
+++ simutrans-pak64-120.0.1/debian/changelog	2015-11-18 10:25:59.000000000 +0100
@@ -1,3 +1,13 @@
+simutrans-pak64 (120.0.1-2) unstable; urgency=medium
+
+  * debian/patches/buildsystem:
+    - Change makeobj path from /usr/games to /usr/lib/simutrans.
+    - Rename to 0001-buildsystem.patch
+  * debian/control:
+    - Bump makeobj version to >= 120.1.1+repack-2.
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Wed, 18 Nov 2015 10:25:55 +0100
+
 simutrans-pak64 (120.0.1-1) unstable; urgency=medium
 
   [ Jörg Frings-Fürst ]
diff -Nru simutrans-pak64-120.0.1/debian/control simutrans-pak64-120.0.1/debian/control
--- simutrans-pak64-120.0.1/debian/control	2015-11-14 15:48:15.000000000 +0100
+++ simutrans-pak64-120.0.1/debian/control	2015-11-18 08:26:04.000000000 +0100
@@ -7,7 +7,7 @@
 Build-Depends:
  debhelper (>= 9)
 Build-Depends-Indep:
- simutrans-makeobj (>= 120.1)
+ simutrans-makeobj (>= 120.1.1+repack-2)
 Standards-Version: 3.9.6
 Homepage: http://www.simutrans.com/
 Vcs-Git: git://anonscm.debian.org/pkg-games/simutrans-pak64.git
diff -Nru simutrans-pak64-120.0.1/debian/patches/0001-buildsystem.patch simutrans-pak64-120.0.1/debian/patches/0001-buildsystem.patch
--- simutrans-pak64-120.0.1/debian/patches/0001-buildsystem.patch	1970-01-01 01:00:00.000000000 +0100
+++ simutrans-pak64-120.0.1/debian/patches/0001-buildsystem.patch	2015-11-17 22:14:50.000000000 +0100
@@ -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/lib/simutrans/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
+ 
diff -Nru simutrans-pak64-120.0.1/debian/patches/buildsystem simutrans-pak64-120.0.1/debian/patches/buildsystem
--- simutrans-pak64-120.0.1/debian/patches/buildsystem	2015-10-06 10:58:23.000000000 +0200
+++ simutrans-pak64-120.0.1/debian/patches/buildsystem	1970-01-01 01:00:00.000000000 +0100
@@ -1,33 +0,0 @@
-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
- 
diff -Nru simutrans-pak64-120.0.1/debian/patches/series simutrans-pak64-120.0.1/debian/patches/series
--- simutrans-pak64-120.0.1/debian/patches/series	2015-05-16 12:14:38.000000000 +0200
+++ simutrans-pak64-120.0.1/debian/patches/series	2015-11-17 22:17:58.000000000 +0100
@@ -1 +1 @@
-buildsystem
+0001-buildsystem.patch

diff -Nru simutrans-pak128.britain-1.16/debian/changelog simutrans-pak128.britain-1.16/debian/changelog
--- simutrans-pak128.britain-1.16/debian/changelog	2015-11-16 09:44:37.000000000 +0100
+++ simutrans-pak128.britain-1.16/debian/changelog	2015-11-18 11:14:04.000000000 +0100
@@ -1,3 +1,14 @@
+simutrans-pak128.britain (1.16-2) unstable; urgency=medium
+
+  * debian/control:
+    - Correct Vcs-*.
+    - Bump makeobj version to >= 120.1.1+repack-2.
+  * debian/patches/0500-build.patch:
+    - Change makobj path from /usr/games to /usr/lib/simutrans.
+    - Rename to 0001-build.patch
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Wed, 18 Nov 2015 11:13:57 +0100
+
 simutrans-pak128.britain (1.16-1) unstable; urgency=medium
 
   [ Jörg Frings-Fürst ]
diff -Nru simutrans-pak128.britain-1.16/debian/control simutrans-pak128.britain-1.16/debian/control
--- simutrans-pak128.britain-1.16/debian/control	2015-11-15 13:49:38.000000000 +0100
+++ simutrans-pak128.britain-1.16/debian/control	2015-11-18 08:30:45.000000000 +0100
@@ -7,11 +7,11 @@
 Build-Depends:
  debhelper (>= 9)
 Build-Depends-Indep:
- simutrans-makeobj (>= 120.1)
+ simutrans-makeobj (>= 120.1.1+repack-2)
 Standards-Version: 3.9.6
 Homepage: http://www.simutrans.com/
-Vcs-Git: git://anonscm.debian.org/pkg-games/simutrans-pak64.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/simutrans-pak64.git
+Vcs-Git: git://anonscm.debian.org/pkg-games/simutrans-pak128.britain.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/simutrans-pak128.britain.git
 
 Package: simutrans-pak128.britain
 Architecture: all
diff -Nru simutrans-pak128.britain-1.16/debian/patches/0001-build.patch simutrans-pak128.britain-1.16/debian/patches/0001-build.patch
--- simutrans-pak128.britain-1.16/debian/patches/0001-build.patch	1970-01-01 01:00:00.000000000 +0100
+++ simutrans-pak128.britain-1.16/debian/patches/0001-build.patch	2015-11-18 11:01:26.000000000 +0100
@@ -0,0 +1,37 @@
+From: Ansgar Burchardt <ansgar@debian.org>
+Date: Sat, 12 Nov 2011 11:14:49 +0100
+Subject: build changes for Debian
+
+Index: trunk/Makefile
+===================================================================
+--- trunk.orig/Makefile
++++ trunk/Makefile
+@@ -8,7 +8,8 @@ VERSION_STRING = "pak128.Britain 1.13 11
+ #
+ #
+ #
+-MAKEOBJ ?= ./makeobj
++SHELL=/bin/bash
++MAKEOBJ ?= /usr/lib/simutrans/makeobj
+ 
+ DESTDIR  ?= simutrans
+ PAKDIR   ?= $(DESTDIR)/pak128.Britain
+@@ -109,7 +110,7 @@ copy:
+ 	@mkdir -p $(PAKDIR)/text $(PAKDIR)/text/citylists $(PAKDIR)/config
+ 	@cp -p compat.tab $(PAKDIR)
+ 	@cp -p demo.sve $(PAKDIR)
+-	@cp -p licence.txt $(PAKDIR)
++#	@cp -p licence.txt $(PAKDIR)
+ 	@cp -p readme.txt $(PAKDIR)
+ 	@cp -p config/* $(PAKDIR)/config
+ #	@mkdir -p $(PAKDIR)/sound $(PAKDIR)/text $(PAKDIR)/config $(PAKDIR)/scenario
+@@ -152,7 +153,8 @@ $(OUTSIDE):
+ 	@mkdir -p $(PAKDIR)
+ 	@$(MAKEOBJ) PAK128 $(PAKDIR)/ $@/ > /dev/null
+ 	@echo -e -n "Obj=ground\nName=Outside\ncopyright=$(VERSION_STRING)" >$@/outsiderev.dat
+-	@svnversion >>$@/outsiderev.dat
++	#@svnversion >>$@/outsiderev.dat
++	echo $(SVNREV) >>$@/outsiderev.dat
+ 	@echo -e "Image[0][0]=images/ls-water-128.0.0\n-" >>$@/outsiderev.dat
+ 	@$(MAKEOBJ) PAK128 $(PAKDIR)/ $@/outsiderev.dat > /dev/null
+ 	@rm $@/outsiderev.dat
diff -Nru simutrans-pak128.britain-1.16/debian/patches/0500-build.patch simutrans-pak128.britain-1.16/debian/patches/0500-build.patch
--- simutrans-pak128.britain-1.16/debian/patches/0500-build.patch	2015-05-18 09:55:50.000000000 +0200
+++ simutrans-pak128.britain-1.16/debian/patches/0500-build.patch	1970-01-01 01:00:00.000000000 +0100
@@ -1,37 +0,0 @@
-From: Ansgar Burchardt <ansgar@debian.org>
-Date: Sat, 12 Nov 2011 11:14:49 +0100
-Subject: build changes for Debian
-
-Index: trunk/Makefile
-===================================================================
---- trunk.orig/Makefile
-+++ trunk/Makefile
-@@ -8,7 +8,8 @@ VERSION_STRING = "pak128.Britain 1.13 11
- #
- #
- #
--MAKEOBJ ?= ./makeobj
-+SHELL=/bin/bash
-+MAKEOBJ ?= /usr/games/makeobj
- 
- DESTDIR  ?= simutrans
- PAKDIR   ?= $(DESTDIR)/pak128.Britain
-@@ -109,7 +110,7 @@ copy:
- 	@mkdir -p $(PAKDIR)/text $(PAKDIR)/text/citylists $(PAKDIR)/config
- 	@cp -p compat.tab $(PAKDIR)
- 	@cp -p demo.sve $(PAKDIR)
--	@cp -p licence.txt $(PAKDIR)
-+#	@cp -p licence.txt $(PAKDIR)
- 	@cp -p readme.txt $(PAKDIR)
- 	@cp -p config/* $(PAKDIR)/config
- #	@mkdir -p $(PAKDIR)/sound $(PAKDIR)/text $(PAKDIR)/config $(PAKDIR)/scenario
-@@ -152,7 +153,8 @@ $(OUTSIDE):
- 	@mkdir -p $(PAKDIR)
- 	@$(MAKEOBJ) PAK128 $(PAKDIR)/ $@/ > /dev/null
- 	@echo -e -n "Obj=ground\nName=Outside\ncopyright=$(VERSION_STRING)" >$@/outsiderev.dat
--	@svnversion >>$@/outsiderev.dat
-+	#@svnversion >>$@/outsiderev.dat
-+	echo $(SVNREV) >>$@/outsiderev.dat
- 	@echo -e "Image[0][0]=images/ls-water-128.0.0\n-" >>$@/outsiderev.dat
- 	@$(MAKEOBJ) PAK128 $(PAKDIR)/ $@/outsiderev.dat > /dev/null
- 	@rm $@/outsiderev.dat
diff -Nru simutrans-pak128.britain-1.16/debian/patches/series simutrans-pak128.britain-1.16/debian/patches/series
--- simutrans-pak128.britain-1.16/debian/patches/series	2015-05-18 10:03:50.000000000 +0200
+++ simutrans-pak128.britain-1.16/debian/patches/series	2015-11-18 08:33:47.000000000 +0100
@@ -1,2 +1,2 @@
 0100-filenames.patch
-0500-build.patch
+0001-build.patch

Attachment: signature.asc
Description: This is a digitally signed message part

Reply to: