Merge lp:~hjd/widelands/disabled-s390-patch into lp:~widelands-dev/widelands/debian

[Hans Joachim Desserud]

What it says <del>on the box</del> in the commit message.

The ppa currently fails to build [1] because the s390_new_architecture patch fails to apply cleanly due to changes in trunk. Unlike the kFreeBSD issue, this has not been applied to trunk AFAIK, so I left the patch itself alone.

I've scheduled a test build for this [2], which I'll probably just merge it when I've verified it builds as expected.

I wonder though, whether we should simply disable the rest of the patches in the Debian packaging too? Just in order to avoid similar issues in the future. This is the second one which has broken the build because it can't be applied, and I don't think we will have less code changes as the development cycle progresses. (Apart from the debug symbols patch, they're for obscure architectures which Ubuntu isn't even targetting so the PPA won't build on them.)

[1] https://launchpadlibrarian.net/173632745/buildlog.txt.gz
[2] https://code.launchpad.net/~hjd/+recipe/widelands-test

[Hans Joachim Desserud (hjd)]

As mentioned, I merged this when I saw that my test build went green. I don't like to skip the review stage, but this patch is fairly minimal and non-intrusive. I also took the liberty of doing the same patch on the debian-precise branch.

[SirVer (sirver)]

I looked through this and I wondered why you did not also delete the patch file. Unused files in a repository are usually a bad idea, since they are forgotten over time. If somebody needs it back in the future, they can reverse-cherrypick your commit.

Otherwise lgtm.

review: Approve

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-03-11 20:57:31 +0000
+++ debian/patches/series	2014-04-25 20:18:37 +0000
@@ -1,4 +1,3 @@
 mips_gcc_ICE_with-03
-s390_new_architecture
 hurd_PATH_MAX_missing
 dbg_symbols