Merge lp:~hjd/widelands/new-binary into lp:~widelands-dev/widelands/debian

[Hans Joachim Desserud]

The PPA broke a couple of days back when a new binary was added. Since this wasn't covered among the files used in the packages produced, the packager became confused as to what to do with it. See either of the recent build logs on https://code.launchpad.net/~widelands-dev/+recipe/widelands-daily for examples.

I've now added this to the list of files to be installed with the 'widelands' package, along with wl_map_info and wl_render_richtext which we did when they appeared. I don't know whether this is what we want or whether we should simply remove the files because they don't make much sense outside of debug contexts.

Tested with this change in https://code.launchpad.net/~hjd/+recipe/widelands-test, see the most recent build log for evidence it works. Should make the PPAs produce builds again.

If someone reviews this, feel free to merge it into the debian-branch as well. I can do it myself, but it might take some time before I can get round to it.

While talking about build failures, I've seen odd failures on Ubuntu with recent clang-versions (3.6 and 3.7). Have any clang-people seen similar things on other platforms. Sorry I don't have logs available at the moment, but I just wanted to check whether someone are able to successfully build Widelands with those versions. If that is the case I may have to investigate the clang packages in Ubuntu/Debian.

[SirVer (sirver)]

The binary is gone again in https://code.launchpad.net/~widelands-dev/widelands/use_image_cache. It is hardly worth adding it in right now.

wl_map_info is used on the server, it relies on it being in the PPA. It might also be useful for others, dunno. The other is purely debug, but does it hurt to install it?

hjd, can these debian files not be in trunk? It seems more likely that they do not break if they are in trunk than being added on in the debian branch? We also have maintenance files for windows and mac in trunk, so I see no issue having debian there too.

[bunnybot (widelandsofficial)]

Hi, I am bunnybot (https://github.com/widelands/bunnybot).

I am keeping the source branch lp:~hjd/widelands/new-binary mirrored to https://github.com/widelands/widelands/tree/_hjd_widelands_new_binary

You can give me commands by starting a line with @bunnybot <command>. I understand:
 merge: Merges the source branch into the target branch, closing the merge proposal. I will use the proposed commit message if it is set.

[SirVer (sirver)]

there have been complains about the PPA not being upgraded, so let's merge this in the meantime.

I still think this should be in trunk if at all possible. is it?

@bunnybot merge

[Hans Joachim Desserud (hjd)]

...and I'm back :)

>hjd, can these debian files not be in trunk?

Sure (and I see that they have already been added). I have some thoughts which I'll follow up shortly (but that's mostly keeping the debian changelog up to date, and communicate our changes so that we don't cause conflicts problems for packagers). Ideally we can work together with packagers so that a new release can be dropped straight into the archive without any additional work :)

[GunChleoc (gunchleoc)]

Good to see you back :)

we need both src/website executables in the PPA, otherwise the website will break.

Would you have time to also look into adding the appdata.xml to the debian packaging?

https://bugs.launchpad.net/widelands/+bug/1271595

=== modified file 'debian/widelands.install'
--- debian/widelands.install	2014-10-22 19:12:03 +0000
+++ debian/widelands.install	2016-01-10 13:49:01 +0000
@@ -1,4 +1,5 @@
 usr/widelands usr/games
+usr/wl_make_texture_atlas usr/games
 usr/wl_map_info usr/games
 usr/wl_render_richtext usr/games
 usr/share/applications