please unblock simutrans/100.0+ds1-4
Hi,
please allow simutrans/100.0+ds1-4 to migrate to testing. It contains a
bugfix for a crash when building power-bridges in certain terrains.
Full changelog and diff attached below.
Regards,
Ansgar
--
PGP: 1024D/595FAD19 739E 2D09 0969 BEA9 9797 B055 DDB0 2FF7 595F AD19
simutrans (100.0+ds1-4) unstable; urgency=low
* debian/rules: Remove `configure' target
* debian/control: Add `Depends: ${misc:Depends}' for simutrans-data
and simutrans-makeobj.
* Apply upstream fix for power-bridges on vertical slopes
(Closes: #507307)
-- Ansgar Burchardt <ansgar@43-1.org> Mon, 15 Dec 2008 00:07:29 +0100
diff --git a/debian/changelog b/debian/changelog
index 681ac86..ba1506b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+simutrans (100.0+ds1-4) unstable; urgency=low
+
+ * debian/rules: Remove `configure' target
+ * debian/control: Add `Depends: ${misc:Depends}' for simutrans-data
+ and simutrans-makeobj.
+ * Apply upstream fix for power-bridges on vertical slopes
+ (Closes: #507307)
+
+ -- Ansgar Burchardt <ansgar@43-1.org> Mon, 15 Dec 2008 00:07:29 +0100
+
simutrans (100.0+ds1-3) unstable; urgency=low
* config.diff: Use <endian.h> header to detect endianness
diff --git a/debian/control b/debian/control
index e8cc867..4451f73 100644
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,7 @@ Description: transportation simulator
Package: simutrans-data
Architecture: all
+Depends: ${misc:Depends}
Description: transportation simulator (base data)
Simutrans is a free transportation simulator: The player operates a
transportation company and has to transport goods and passengers between
@@ -28,7 +29,7 @@ Description: transportation simulator (base data)
Package: simutrans-makeobj
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: data file compiler for Simutrans
Simutrans is a free transportation simulator: The player operates a
transportation company and has to transport goods and passengers between
diff --git a/debian/patches/fix-power-bridges-on-vertical-slopes.patch b/debian/patches/fix-power-bridges-on-vertical-slopes.patch
new file mode 100644
index 0000000..f229f39
--- /dev/null
+++ b/debian/patches/fix-power-bridges-on-vertical-slopes.patch
@@ -0,0 +1,28 @@
+From 4a2dbb8f6be0b9b6a73b4118618a3eeaafa05798 Mon Sep 17 00:00:00 2001
+From: prissi <prissi@8aca7d54-2c30-db11-9de9-000461428c89>
+Date: Mon, 21 Jul 2008 20:41:38 +0000
+Subject: [PATCH] FIX: power bridges on vertical slopes
+
+Changes to makeobj/Makefile and simtruans/history.txt omitted, other changes as in SVN rev. 1929.
+
+git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@1929 8aca7d54-2c30-db11-9de9-000461428c89
+---
+ bauer/brueckenbauer.cc | 5 +++++
+ makeobj/Makefile | 23 ++++++++++++++---------
+ simutrans/history.txt | 1 +
+ 3 files changed, 20 insertions(+), 9 deletions(-)
+
+--- simutrans.orig/bauer/brueckenbauer.cc
++++ simutrans/bauer/brueckenbauer.cc
+@@ -455,6 +455,11 @@
+ gr->calc_bild();
+ } else {
+ leitung_t *lt = gr->gib_leitung();
++ if( lt==NULL ) {
++ lt = new leitung_t( welt, end, sp );
++ spieler_t::accounting(sp, -wegbauer_t::leitung_besch->gib_preis(), gr->gib_pos().gib_2d(), COST_CONSTRUCTION);
++ gr->obj_add(lt);
++ }
+ lt->calc_neighbourhood();
+ }
+ }
diff --git a/debian/patches/series b/debian/patches/series
index af77259..06016ea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ fix_casts.diff
01_png.patch
02_makeobj_fixes.patch
03_makeobj_cleanup.patch
+fix-power-bridges-on-vertical-slopes.patch
diff --git a/debian/rules b/debian/rules
index c618419..6f776b1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,13 +7,8 @@
include /usr/share/quilt/quilt.make
-configure: configure-stamp
-configure-stamp: $(QUILT_STAMPFN)
- dh_testdir
- touch configure-stamp
-
build: build-stamp
-build-stamp: configure-stamp
+build-stamp: $(QUILT_STAMPFN)
dh build
convert simutrans.ico debian/simutrans.xpm
@@ -27,7 +22,7 @@ build-stamp: configure-stamp
# `make clean' will fail if there is no config.default, so make sure
# we have one
-clean: configure clean-patched unpatch
+clean: $(QUILT_STAMPFN) clean-patched unpatch
clean-patched:
dh_testdir
Reply to: