widelands-dev team mailing list archive
-
widelands-dev team
-
Mailing list archive
-
Message #05167
[Merge] lp:~hjd/widelands/new-binary into lp:~widelands-dev/widelands/debian
Hans Joachim Desserud has proposed merging lp:~hjd/widelands/new-binary into lp:~widelands-dev/widelands/debian.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~hjd/widelands/new-binary/+merge/282116
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.
--
Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/new-binary into lp:~widelands-dev/widelands/debian.
=== 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
Follow ups