[Widelands-dev] [Merge] lp:~hjd/widelands/llvm8 into lp:widelands

2019-04-07 Thread Hans Joachim Desserud
Hans Joachim Desserud has proposed merging lp:~hjd/widelands/llvm8 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~hjd/widelands/llvm8/+merge/365635 Update the travic config to build with Clang (LLVM) 8 which

Re: [Widelands-dev] [Merge] lp:~hjd/widelands/packaging-19-repack-6 into lp:widelands

2018-12-08 Thread Hans Joachim Desserud
Re-added the commented part, and documented them in the changelog. I wasn't aware some of them were done intentionally. With them listed in the changelog it should be easier to avoid similar mistakes in the future and hopefully they can be added to Debian when the next release happens, further

Re: [Widelands-dev] [Merge] lp:~hjd/widelands/packaging-19-repack-6 into lp:widelands

2018-11-25 Thread Hans Joachim Desserud
Added a couple of in-line comments. Diff comments: > > === modified file 'debian/copyright' > --- debian/copyright 2017-03-12 11:22:07 + > +++ debian/copyright 2018-11-25 16:21:32 + > @@ -424,21 +241,92 @@ > Files: debian/* > Copyright: 2004-2013 Martin Quinson > License: GPL-2+ >

[Widelands-dev] [Merge] lp:~hjd/widelands/packaging-19-repack-6 into lp:widelands

2018-11-25 Thread Hans Joachim Desserud
Hans Joachim Desserud has proposed merging lp:~hjd/widelands/packaging-19-repack-6 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~hjd/widelands/packaging-19-repack-6/+merge/359393 Merging in the latest changes

[Widelands-dev] [Merge] lp:~hjd/widelands/clang-7 into lp:widelands

2018-11-03 Thread Hans Joachim Desserud
Hans Joachim Desserud has proposed merging lp:~hjd/widelands/clang-7 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~hjd/widelands/clang-7/+merge/358272 LLVM 7 was recently released, including a newer version

[Widelands-dev] [Merge] lp:~hjd/widelands/gcc8 into lp:widelands

2018-05-02 Thread Hans Joachim Desserud
Hans Joachim Desserud has proposed merging lp:~hjd/widelands/gcc8 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~hjd/widelands/gcc8/+merge/344978 Use GCC 8 for the "highest version" build and drop o

[Widelands-dev] [Merge] lp:~hjd/widelands/clang-6.0 into lp:widelands

2018-04-23 Thread Hans Joachim Desserud
The proposal to merge lp:~hjd/widelands/clang-6.0 into lp:widelands has been updated. Commit message changed to: Replaced clang-4.0 with clang-6.0. Let's see how Travis responds. :) Seems to be working https://travis-ci.org/widelands/widelands/builds/370207384 For more details, see:

[Widelands-dev] [Merge] lp:~hjd/widelands/clang-6.0 into lp:widelands

2018-04-23 Thread Hans Joachim Desserud
Hans Joachim Desserud has proposed merging lp:~hjd/widelands/clang-6.0 into lp:widelands. Commit message: Replaced clang-4.0 with clang-6.0. Let's see how Travis responds. :) Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1766069 in widelands: "Update travi

[Widelands-dev] [Merge] lp:~hjd/widelands/osx-new-default into lp:widelands

2017-12-01 Thread Hans Joachim Desserud
Hans Joachim Desserud has proposed merging lp:~hjd/widelands/osx-new-default into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1727021 in widelands: "Mac OS Travis fails on master" https://bugs.launchpad.net/widelands/+bug/1727021

[Widelands-dev] [Merge] lp:~hjd/widelands/asan-off-deb-package into lp:widelands

2017-11-27 Thread Hans Joachim Desserud
Hans Joachim Desserud has proposed merging lp:~hjd/widelands/asan-off-deb-package into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1734659 in widelands: "Switch off ASAN in ubuntu packaging" https://bugs.launchpad.net/widelands/+b

Re: [Widelands-dev] [Merge] lp:~hjd/widelands/osx-update into lp:widelands

2017-11-27 Thread Hans Joachim Desserud
>+sudo pip install sphinx >sudo: pip: command not found (https://travis-ci.org/widelands/widelands/jobs/307530402= >From what I could understand, `pip` should be installed as part of python. So >I added it to the `brew install` list, but that only printed that python is >already installed.

[Widelands-dev] [Merge] lp:~hjd/widelands/travis-clang-5.0 into lp:widelands

2017-11-26 Thread Hans Joachim Desserud
Hans Joachim Desserud has proposed merging lp:~hjd/widelands/travis-clang-5.0 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~hjd/widelands/travis-clang-5.0/+merge/334282 Expand the build matrix to build with clang

[Widelands-dev] [Merge] lp:~hjd/widelands/osx-update into lp:widelands

2017-11-26 Thread Hans Joachim Desserud
Hans Joachim Desserud has proposed merging lp:~hjd/widelands/osx-update into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1727021 in widelands: "Mac OS Travis fails on master" https://bugs.launchpad.net/widelands/+bug/1727021 For mo

[Widelands-dev] [Merge] lp:~hjd/widelands/macos-brew-update-workaround into lp:widelands

2017-10-24 Thread Hans Joachim Desserud
Hans Joachim Desserud has proposed merging lp:~hjd/widelands/macos-brew-update-workaround into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1727021 in widelands: "Mac OS Travis fails on master" https://bugs.launchpad.net/widelands/+b

[Widelands-dev] [Merge] lp:~hjd/widelands/debian-merge into lp:widelands

2017-08-27 Thread Hans Joachim Desserud
Hans Joachim Desserud has proposed merging lp:~hjd/widelands/debian-merge into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~hjd/widelands/debian-merge/+merge/329686 Merged in the lastet packaging changes, after

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/travis-osx into lp:widelands

2017-08-01 Thread Hans Joachim Desserud
Cleaned up and ready to go (even re-fixed indentation which had been bothering me) Diff comments: > > === modified file '.travis.yml' > --- .travis.yml 2017-07-16 21:14:17 + > +++ .travis.yml 2017-08-01 15:26:34 + > @@ -5,7 +5,8 @@ > > before_script: >- export

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/travis-osx into lp:widelands

2017-08-01 Thread Hans Joachim Desserud
The proposal to merge lp:~widelands-dev/widelands/travis-osx into lp:widelands has been updated. Commit Message changed to: Let travis build each commit on macos in addition to our linux builds. Note that the regression test suite is only run for linux (couldn't get it to work on macos),

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/travis-osx into lp:widelands

2017-07-28 Thread Hans Joachim Desserud
Still can't get the regression tests to run on macos :( Most of them fail with: Your OpenGL installation must be __very__ broken. Missing GL version libc++abi.dylib: terminating with uncaught exception of type WException: [/Users/travis/build/widelands/widelands/src/graphic/gl/initialize.cc:90]

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/travis-osx into lp:widelands

2017-07-25 Thread Hans Joachim Desserud
>travis-retry sudo apt-get install -qq g++-$GCC_VERSION; >etc, so that we can at least ensure that we can get the compilers? That's a good idea :) I've added travis_retry for the compiler installation and package installation on macos. That should give us better control over the parts we

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/travis-container into lp:widelands

2017-07-23 Thread Hans Joachim Desserud
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/travis-container/+merge/327492 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/travis-container into lp:widelands. ___

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/travis-container into lp:widelands

2017-07-23 Thread Hans Joachim Desserud
The proposal to merge lp:~widelands-dev/widelands/travis-container into lp:widelands has been updated. Commit Message changed to: Simplify adding additional repos and package installation for Travis (see https://docs.travis-ci.com/user/migrating-from-legacy/#Adding-APT-Sources for details)

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/travis-osx into lp:widelands

2017-07-23 Thread Hans Joachim Desserud
> Where did you find that link? "Translated" the command bzr `branch lp:~wsk/widelands/OSX-libs` to the corresponding branch. As a side note, it doesn't seem to be shown on https://code.launchpad.net/widelands, which I thought all non-merged branches would be regardless of age. It has

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/travis-container into lp:widelands

2017-07-23 Thread Hans Joachim Desserud
Thank you for providing the links. Based on the different output it looks like several different things going wrong, though most network-related. The first one definitely has some deeper problems, because it is unable to connect to lots of default repos (line 475) before it starts running our

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/travis-osx into lp:widelands

2017-07-22 Thread Hans Joachim Desserud
> I have no idea how current the information for the other 2 methods is. The mac-ports one talks about installing sdl 1 dependencies, so that's somewhat outdated. That is possibly fairly easy to update with newer package names. The other one which talks about getting all dependencies from a

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/travis-container into lp:widelands

2017-07-22 Thread Hans Joachim Desserud
>Do we lose anything by not sleeping & retrying? We sometimes get transient >failures due to repositories not being accessible. This is definitely a concern and I wish I had a good answer here, but I don't know. :/ I must admit I haven't seen these errors, so I'm not sure how or how often

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/travis-osx into lp:widelands

2017-07-17 Thread Hans Joachim Desserud
Ready for feedback (probably not merge yet) Diff comments: > === modified file '.travis.sh' > --- .travis.sh2017-07-03 12:24:47 + > +++ .travis.sh2017-07-17 10:56:58 + > @@ -1,5 +1,10 @@ > set -ex > > +#TODO yes, i'll fix indentation at some point :) > +if [[

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/travis-osx into lp:widelands

2017-07-17 Thread Hans Joachim Desserud
The proposal to merge lp:~widelands-dev/widelands/travis-osx into lp:widelands has been updated. Description changed to: Ready for feedback, probably not ready for merge. As mentioned I came across the travis documentation for running on osx [1][2][3] on travis. So far, I've set added two

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/travis-container into lp:widelands

2017-07-17 Thread Hans Joachim Desserud
Ready for review :) Diff comments: > > === modified file '.travis.yml' > --- .travis.yml 2017-05-03 18:55:33 + > +++ .travis.yml 2017-07-17 11:07:46 + > @@ -13,37 +13,66 @@ >except: > - _widelands_dev_widelands_trunk > > +# Let travis add additional repos and

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/travis-container into lp:widelands

2017-07-17 Thread Hans Joachim Desserud
The proposal to merge lp:~widelands-dev/widelands/travis-container into lp:widelands has been updated. Description changed to: Right, now that things are working, this is now ready for review. The starting point for this MP was that I read about travis running in containers [1]. This has some

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/travis-container into lp:widelands

2017-07-16 Thread Hans Joachim Desserud
Hans Joachim Desserud has proposed merging lp:~widelands-dev/widelands/travis-container into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/travis-container/+merge/327492 WIP, sorry for spamming

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/travis-osx into lp:widelands

2017-07-16 Thread Hans Joachim Desserud
Hans Joachim Desserud has proposed merging lp:~widelands-dev/widelands/travis-osx into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1704640 in widelands: "Add osx build for Travis" https://bugs.launchpad.net/widelands/+bug/1704640

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/codecheck into lp:widelands

2017-07-03 Thread Hans Joachim Desserud
Nice intiative :) Btw, I experimented a bit with cppcheck here the other day. We don't need to decide it in this merge proposal, but that might be something to consider to get more checks run at build time. Now, the full report with all checks enabled takes hours, so that's an obvious no-go.

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/codecheck into lp:widelands

2017-07-03 Thread Hans Joachim Desserud
Diff comments: > > === modified file 'cmake/codecheck/rules/camel_case_for_classes' > --- cmake/codecheck/rules/camel_case_for_classes 2014-09-18 15:53:08 > + > +++ cmake/codecheck/rules/camel_case_for_classes 2017-07-03 13:52:43 > + > @@ -13,30 +13,43 @@ >if

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-986611-cppcheck-uninitialized-variables into lp:widelands

2017-07-01 Thread Hans Joachim Desserud
I only checked a couple of the build logs, but the Travis errors seems to be due to packages failing to install. Is there an easy way to retrigger builds? I haven't looked into the details of the changes, but it is great to see the amount of issues reduced. This seems to be the last branch in

[Widelands-dev] [Merge] lp:~hjd/widelands/boost-dependencies into lp:widelands

2017-06-27 Thread Hans Joachim Desserud
Hans Joachim Desserud has proposed merging lp:~hjd/widelands/boost-dependencies into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1697192 in widelands: "Cleanup after move to boost.net" https://bugs.launchpad.net/widelands/+bug/1697192

Re: [Widelands-dev] [Merge] lp:~hjd/widelands/boost-system-dependency into lp:widelands

2017-06-11 Thread Hans Joachim Desserud
It isn't shown by the diff below, but `.travis.sh` installs `libboost-all-dev`, which is a metapackage to install all boost components. This is likely the reason why this wasn't discovered until merged to trunk, since the Debian packaging is more minimal and only list the required components.

[Widelands-dev] [Merge] lp:~hjd/widelands/boost-system-dependency into lp:widelands

2017-06-10 Thread Hans Joachim Desserud
Hans Joachim Desserud has proposed merging lp:~hjd/widelands/boost-system-dependency into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1697192 in widelands: "Clenaup after move to boost.net" https://bugs.launchpad.net/widelands/+b

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/gcc7 into lp:widelands

2017-06-01 Thread Hans Joachim Desserud
>The Travis failure is a compiler error that's only thrown by GCC7. In fact, only the release build. The debug build is fine, not that I know what the difference might be. (I honestly didn't expect any errors now since I've built it successfully with gcc 7.x on arch) -Wimplicit-fallthrough

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/gcc7 into lp:widelands

2017-05-31 Thread Hans Joachim Desserud
Hans Joachim Desserud has proposed merging lp:~widelands-dev/widelands/gcc7 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/gcc7/+merge/323576 (Note: at the moment this is mainly for testing

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/gcc7 into lp:widelands

2017-05-31 Thread Hans Joachim Desserud
The gcc-7 package should be available now https://launchpad.net/~ubuntu-toolchain-r/+archive/ubuntu/test?field.series_filter=trusty. I've merged latest trunk a couple of times, but it didn't seem like bunnybot picked up the changes. I suspect this might be related to the MP status, so I've

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/gcc7 into lp:widelands

2017-05-04 Thread Hans Joachim Desserud
>Travis still doesn't have GCC7 out of the box, but we could try this: We already do :) If you check `.travis.sh`, we add the Ubuntu toolchain PPA [1] before attempting to install gcc. It contains gcc-7, but on closer inspection that package is only published for 17.04. (I believe Travis is

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/gcc7 into lp:widelands

2017-05-03 Thread Hans Joachim Desserud
Hans Joachim Desserud has proposed merging lp:~widelands-dev/widelands/gcc7 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/gcc7/+merge/323576 (Note: at the moment this is mainly for testing

[Widelands-dev] [Merge] lp:~hjd/widelands/debian-19-3 into lp:widelands

2017-03-12 Thread Hans Joachim Desserud
The proposal to merge lp:~hjd/widelands/debian-19-3 into lp:widelands has been updated. Description changed to: Pulled in latest changes from the Debian package (version 1:19+repack-3). Some exceptions: * the desktop and appdata files. There were some differences between these, but I assumed

Re: [Widelands-dev] [Merge] lp:~hjd/widelands/additional-compilers into lp:widelands

2017-02-13 Thread Hans Joachim Desserud
>For GCC 4.7, see the following discussion: I agree :) Memo to self: remember to update the minimum required versions on https://wl.widelands.org/wiki/BuildingWidelands/ once this lands. Diff comments: > > === modified file 'CMakeLists.txt' > --- CMakeLists.txt2016-12-04 14:32:55 + >

Re: [Widelands-dev] [Merge] lp:~hjd/widelands/additional-compilers into lp:widelands

2017-02-13 Thread Hans Joachim Desserud
Oh, sorry. It looks like I never posted the inline comment before right now. -- https://code.launchpad.net/~hjd/widelands/additional-compilers/+merge/316258 Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/additional-compilers into lp:widelands.

Re: [Widelands-dev] [Merge] lp:~hjd/widelands/additional-compilers into lp:widelands

2017-02-13 Thread Hans Joachim Desserud
Sure, can fix :) Though (see my comment below), I still wonder what happened to GCC 4.7. If the required minimum version has been increased, then CMakeLists.txt and possibly other documentation should be updated alongside. Diff comments: > === modified file '.travis.yml' > --- .travis.yml

Re: [Widelands-dev] [Merge] lp:~hjd/widelands/additional-compilers into lp:widelands

2017-02-12 Thread Hans Joachim Desserud
>We opted for the 2 lowest and 2 highest versions only in order to speed up the >Travis builds. Sure. There is the slight chance of compiler regressions in the "middle" versions, but in practice I doubt we will run into this. So I'm happy with keeping the oldest and newest versions. I removed

Re: [Widelands-dev] [Merge] lp:~hjd/widelands/additional-compilers into lp:widelands

2017-02-03 Thread Hans Joachim Desserud
>Our travis builds border on the acceptable run time I was under the impression that the different compilers were run in parallell, so it wouldn't affect the run time (much). Is there a limit on simultaneous builds? I like that the build is covering the full range of supported compiler

[Widelands-dev] [Merge] lp:~hjd/widelands/additional-compilers into lp:widelands

2017-02-02 Thread Hans Joachim Desserud
Hans Joachim Desserud has proposed merging lp:~hjd/widelands/additional-compilers into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~hjd/widelands/additional-compilers/+merge/316258 Add clang 4.0 and GCC 7

[Widelands-dev] [Merge] lp:~hjd/widelands/merge-19-2 into lp:widelands

2016-12-07 Thread Hans Joachim Desserud
Hans Joachim Desserud has proposed merging lp:~hjd/widelands/merge-19-2 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~hjd/widelands/merge-19-2/+merge/312742 Merge packaging of 1:19+repack-2 from Debian. Really

[Widelands-dev] [Merge] lp:~hjd/widelands/typo-fixes into lp:widelands

2016-11-19 Thread Hans Joachim Desserud
Hans Joachim Desserud has proposed merging lp:~hjd/widelands/typo-fixes into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~hjd/widelands/typo-fixes/+merge/311322 Fixes various typos which were found by emptty when

[Widelands-dev] [Merge] lp:~hjd/widelands/appdata into lp:widelands

2016-09-18 Thread Hans Joachim Desserud
The proposal to merge lp:~hjd/widelands/appdata into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~hjd/widelands/appdata/+merge/306042 -- Your team Widelands Developers is requested to review the proposed merge of

Re: [Widelands-dev] [Merge] lp:~hjd/widelands/appdata into lp:widelands

2016-09-18 Thread Hans Joachim Desserud
I just discovered this was already merged. My bad. -- https://code.launchpad.net/~hjd/widelands/appdata/+merge/306042 Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/appdata into lp:widelands. ___ Mailing

[Widelands-dev] [Merge] lp:~hjd/widelands/appdata into lp:widelands

2016-09-18 Thread Hans Joachim Desserud
Hans Joachim Desserud has proposed merging lp:~hjd/widelands/appdata into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1271595 in widelands: "Please add a AppData application description" https://bugs.launchpad.net/widelands/+b

Re: [Widelands-dev] [Merge] lp:~hjd/widelands/debian-changelog into lp:widelands

2016-07-22 Thread Hans Joachim Desserud
>The patches stuff is all Greek to me Right, I didn't explain this part properly. The patches directory contains any changes the package does to the original source code. The source code is stored in pristine condition and the patches are added when building the package. This makes it easy to

Re: [Widelands-dev] [Merge] lp:~hjd/widelands/debian-changelog into lp:widelands

2016-07-22 Thread Hans Joachim Desserud
Diff comments: > === modified file 'debian/changelog' > --- debian/changelog 2016-01-22 07:20:01 + > +++ debian/changelog 2016-07-22 12:49:08 + > @@ -1,3 +1,27 @@ > +widelands (1:18-3widelands1) UNRELEASED; urgency=medium > + > + * Merged Debian packaging of Widelands 1:18-3.

[Widelands-dev] [Merge] lp:~hjd/widelands/debian-changelog into lp:widelands

2016-07-22 Thread Hans Joachim Desserud
Hans Joachim Desserud has proposed merging lp:~hjd/widelands/debian-changelog into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~hjd/widelands/debian-changelog/+merge/300877 One of the things I have been thinking

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/compiler-matrix into lp:widelands

2016-07-21 Thread Hans Joachim Desserud
>> Btw, when reading `.travis.sh`, I found some build dependencies I didn't >> recognize: libxml2-dev and libyajl-dev. How are these used? >dunno too long ago that i wrote that. try removing them and see what >breaks? Seems to still work as expected. Is this ok to merge then? >it is

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/compiler-matrix into lp:widelands

2016-07-21 Thread Hans Joachim Desserud
Anyone knows what's up with the bot? I had a passing build, but it looks like it tries to keep rerunning it... Is this expected, even if I haven't pushed anything new? -- https://code.launchpad.net/~widelands-dev/widelands/compiler-matrix/+merge/300272 Your team Widelands Developers is

[Widelands-dev] [Merge] lp:~hjd/widelands/openbsd into lp:widelands

2016-07-20 Thread Hans Joachim Desserud
Hans Joachim Desserud has proposed merging lp:~hjd/widelands/openbsd into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~hjd/widelands/openbsd/+merge/300590 In my neverending quest to build Widelands everywhere, I've

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/compiler-matrix into lp:widelands

2016-07-17 Thread Hans Joachim Desserud
Hans Joachim Desserud has proposed merging lp:~widelands-dev/widelands/compiler-matrix into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/compiler-matrix/+merge/300272 Expand to building

[Widelands-dev] [Merge] lp:~hjd/widelands/semicolon into lp:widelands

2016-07-15 Thread Hans Joachim Desserud
Hans Joachim Desserud has proposed merging lp:~hjd/widelands/semicolon into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~hjd/widelands/semicolon/+merge/300231 Skimmed warnings printed when building and found

Re: [Widelands-dev] [Merge] lp:~hjd/widelands/new-binary into lp:~widelands-dev/widelands/debian

2016-07-11 Thread Hans Joachim Desserud
...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

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

2016-01-10 Thread Hans Joachim Desserud
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

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands

2015-12-28 Thread Hans Joachim Desserud
Merged and pushed. :) (Haven't generated new translation templates though) -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/279646 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes.

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/ai_return_added into lp:widelands

2015-10-25 Thread Hans Joachim Desserud
>-Werror=return-type will treat just that warning as an error. And this is actually enabled, see CMakeLists.txt:168. :) We've had some similar issues like this in the past, but the problem is that for debug builds it counts the assert statement so there's no problem. However, when running a

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/ai_return_added into lp:widelands

2015-10-25 Thread Hans Joachim Desserud
>The semantics of this code changes between release and debug builds and nobody >will ever notice. And I saw that in production code before. I'd like to throw in a reminder that CppCheck is able to find these :) Scroll down to the latest report in bug 986611, search for assert and you'll see

Re: [Widelands-dev] [Merge] lp:~hjd/widelands/tests-poc into lp:~widelands-dev/widelands/debian

2015-09-13 Thread Hans Joachim Desserud
> I did not find anything about travis though - did you hjd? Not specifically, no. I did see the following announcement (http://blog.launchpad.net/general/launchpad-news-august-2015) which mentioned webhook support has been added. (Though it points to a gmail bug, the real report might be bug

[Widelands-dev] [Merge] lp:~hjd/widelands/codecheck-whitespace into lp:widelands

2015-08-08 Thread Hans Joachim Desserud
Hans Joachim Desserud has proposed merging lp:~hjd/widelands/codecheck-whitespace into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~hjd/widelands/codecheck-whitespace/+merge/267431 See commit message for details

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/food_icons into lp:widelands

2015-06-01 Thread Hans Joachim Desserud
Re-reading my previous comment, I guess I should mentioned that I'm not really opposed to the CC-license. It's a nice useful license, and I realize we should probably discuss more at a later time whether to include CC-BY-SA-licensed artwork or otherwise... The unfortunate problem is that I

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/food_icons into lp:widelands

2015-05-25 Thread Hans Joachim Desserud
Now I need some input on how to handle the license before we merge this. Hello. Thanks for bringing this to my attention, this is a good question. Up until now, I don't think we have treated the graphics (or any other files in the repo) different from source files. So any existing files are

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1455732 into lp:widelands

2015-05-23 Thread Hans Joachim Desserud
I am no longer able to trigger a crash when selecting things in the building list and saving. :) I have not reviewed the code. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1455732/+merge/259326 Your team Widelands Developers is subscribed to branch

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1455732 into lp:widelands

2015-05-18 Thread Hans Joachim Desserud
Review: Needs Fixing Hi, I did some quick testing of this patch. I found that if any mine is selected, I get a similar crash when attempting to save. I guess that needs a similar fix. I saw some crashes when selecting dismantling site and then something else, but those might have been caused

Re: [Widelands-dev] [Merge] lp:~shevonar/widelands-website/django1.4 into lp:widelands-website

2015-05-09 Thread Hans Joachim Desserud
Are you working on step 1? No. Sorry. :( As I mentioned briefly in the previous comment I never seem to get around to working on this. I guess partially because it's somewhat intimidating since I haven't used Django/South that much. This is also why I posted the comment, since I didn't knew

Re: [Widelands-dev] [Merge] lp:~hjd/widelands/tests-poc into lp:~widelands-dev/widelands/debian

2015-05-09 Thread Hans Joachim Desserud
Somewhat relevant: Launchpad has now officially announced beta support for git code hosting, see http://blog.launchpad.net/general/git-code-hosting-beta for details. I saw this was discussed on reddit (https://www.reddit.com/r/Ubuntu/comments/34k8oi/git_code_hosting_beta_in_launchpad/) and

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1428396 into lp:widelands

2015-05-04 Thread Hans Joachim Desserud
Hi, just a post-review comment: Please write more descriptive commit messages when merging to trunk. This makes it easier to tell what was changed, both when reading through the commit log, but also when someone wants to know why a block of code was added six months later. Including the bug

[Widelands-dev] [Merge] lp:~hjd/widelands/codecheck-and-deduplication into lp:widelands

2015-04-25 Thread Hans Joachim Desserud
Hans Joachim Desserud has proposed merging lp:~hjd/widelands/codecheck-and-deduplication into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~hjd/widelands/codecheck-and-deduplication/+merge/257464 I started looking

Re: [Widelands-dev] [Merge] lp:~shevonar/widelands-website/django1.4 into lp:widelands-website

2015-04-12 Thread Hans Joachim Desserud
I agree - but right now we do not seem to have clear steps forward for this. First of all, I feel I should apologize for the delay. The messages back and forth on this merge proposal is quite sporadic. I do care about this issue, but for some reason (though partially because I don't know Django

Re: [Widelands-dev] [Merge] lp:~hjd/widelands/cppcheck-silence-configurations into lp:widelands

2015-03-30 Thread Hans Joachim Desserud
Split them up now. I guess we should also make a mental note that if we end up moving the source repository somewhere else, we need to reimplement (or remove) the magic sed part. -- https://code.launchpad.net/~hjd/widelands/cppcheck-silence-configurations/+merge/254494 Your team Widelands

[Widelands-dev] [Merge] lp:~hjd/widelands/cppcheck-silence-configurations into lp:widelands

2015-03-29 Thread Hans Joachim Desserud
Hans Joachim Desserud has proposed merging lp:~hjd/widelands/cppcheck-silence-configurations into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~hjd/widelands/cppcheck-silence-configurations/+merge/254494 Strip out

Re: [Widelands-dev] [Merge] lp:~hjd/widelands/tests-poc into lp:~widelands-dev/widelands/debian

2015-03-17 Thread Hans Joachim Desserud
GunChleoc: Interesting. I wonder how it is integrated with Launchpad and how the jobs are triggered. Also, I wonder whether that Jenkins instance would be open for other projects. -- https://code.launchpad.net/~hjd/widelands/tests-poc/+merge/250533 Your team Widelands Developers is requested to

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/copyright-file into lp:~widelands-dev/widelands/debian

2015-03-05 Thread Hans Joachim Desserud
No problem Martin, that's completely understandable. Thanks for letting us know. :) In the meantime, I'll just put this branch on ice, and we'll get back to it when we have a better idea on how to proceed. I'll try to adjust the review status so that it doesn't show up in the list of active

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/copyright-file into lp:~widelands-dev/widelands/debian

2015-03-04 Thread Hans Joachim Desserud
ping. hjd, what is the state of this branch? Hello hello. Not much has happened since the previous commit/comment. Like I talked about in https://code.launchpad.net/~hjd/widelands/tests-poc/+merge/250533, the main intent with this branch was to get the packaging in a better shape to make it

Re: [Widelands-dev] [Merge] lp:~hjd/widelands/tests-poc into lp:~widelands-dev/widelands/debian

2015-03-02 Thread Hans Joachim Desserud
we can continue gather knowledge for a while longer. Ok, good, I feel like I haven't had time to look properly at all of it yet. When talking about the ecosystem around GitHub I was mainly thinking about the Continuous Integration and similar services. That is really something we should have

[Widelands-dev] [Merge] lp:~hjd/widelands-website/django1.3.7 into lp:widelands-website

2014-12-30 Thread Hans Joachim Desserud
Hans Joachim Desserud has proposed merging lp:~hjd/widelands-website/django1.3.7 into lp:widelands-website. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~hjd/widelands-website/django1.3.7/+merge/245447 It's not the big Django

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/copyright-file into lp:~widelands-dev/widelands/debian

2014-12-27 Thread Hans Joachim Desserud
This is surprisingly hard. I did have some progress when I discovered that I can open fonts in FontViewer on Ubuntu and it will be able to disply embedded information such as copyright information. -- https://code.launchpad.net/~widelands-dev/widelands/copyright-file/+merge/245297 Your team

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/copyright-file into lp:~widelands-dev/widelands/debian

2014-12-21 Thread Hans Joachim Desserud
Hans Joachim Desserud has proposed merging lp:~widelands-dev/widelands/copyright-file into lp:~widelands-dev/widelands/debian. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/copyright-file/+merge/245297

Re: [Widelands-dev] [Merge] lp:~hjd/widelands/use-bundled-fonts into lp:~widelands-dev/widelands/debian

2014-12-20 Thread Hans Joachim Desserud
The copyright file should be updated, but I don't think it's critical. (At least not for our part). Though, in the meantime the PPA builders fail. Should I just merge this and then we can deal with adding the various font licenses later? --

Re: [Widelands-dev] [Merge] lp:~hjd/widelands/use-bundled-fonts into lp:~widelands-dev/widelands/debian

2014-12-20 Thread Hans Joachim Desserud
Thanks. :) Filed bug 1404539 for follow-up. -- https://code.launchpad.net/~hjd/widelands/use-bundled-fonts/+merge/243323 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/debian. ___ Mailing list:

Re: [Widelands-dev] [Merge] lp:~hjd/widelands/use-bundled-fonts into lp:~widelands-dev/widelands/debian

2014-12-15 Thread Hans Joachim Desserud
I have dropped a license file into each font folder, and I grabbed them at the same time that I downloaded the fonts. Is this what you need? Probably :) I saw you had added them, which should make this easier. To be honest I'm not familiar with this file, but I've looked at the current

[Widelands-dev] [Merge] lp:~hjd/widelands/utils-buildcat into lp:widelands

2014-12-14 Thread Hans Joachim Desserud
Hans Joachim Desserud has proposed merging lp:~hjd/widelands/utils-buildcat into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~hjd/widelands/utils-buildcat/+merge/244683 My hobby: browsing utils/ I found a couple

[Widelands-dev] [Merge] lp:~hjd/widelands/install-fonts into lp:widelands

2014-12-13 Thread Hans Joachim Desserud
Hans Joachim Desserud has proposed merging lp:~hjd/widelands/install-fonts into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1402253 in widelands: Install fails (file INSTALL cannot find /fonts) https://bugs.launchpad.net/widelands/+bug

Re: [Widelands-dev] [Merge] lp:~hjd/widelands/use-bundled-fonts into lp:~widelands-dev/widelands/debian

2014-12-13 Thread Hans Joachim Desserud
Updated to take into account that the fonts directory has been moved into i18n, please re-review this. :) (debian/copyright should probably be updated with the various licenses the new fonts are available under, but I don't have a complete overview for this) --

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1219914 into lp:widelands

2014-12-07 Thread Hans Joachim Desserud
ls -la /bin/bash What is it pointing to? Sounds like it might be symlinked to sh or something. pushd and popd are some of the specific features which are only found i bash, not a standard POSIX-shell. (Probably why SirVer told you to specify bash insted of sh in the first line of the file.

[Widelands-dev] [Merge] lp:~hjd/widelands/use-bundled-fonts into lp:~widelands-dev/widelands/debian

2014-12-01 Thread Hans Joachim Desserud
Hans Joachim Desserud has proposed merging lp:~hjd/widelands/use-bundled-fonts into lp:~widelands-dev/widelands/debian. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #973714 in widelands: fonts are different between daily ppa and bzr repository https

[Widelands-dev] [Merge] lp:~hjd/widelands/section-initialization into lp:widelands

2014-11-22 Thread Hans Joachim Desserud
Hans Joachim Desserud has proposed merging lp:~hjd/widelands/section-initialization into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~hjd/widelands/section-initialization/+merge/242577 Found by scan-build. -- Your

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/reducing-paths into lp:widelands

2014-11-09 Thread Hans Joachim Desserud
using the localedir entry fro the config file. I don't see this mentioned in my config file. Is it an optional value using default if nothing is specified? Logic says it's probably something like that, but I believed the game would store all settings to this file. when a new language gets

[Widelands-dev] [Merge] lp:~hjd/widelands/include-ctime into lp:widelands

2014-11-07 Thread Hans Joachim Desserud
Hans Joachim Desserud has proposed merging lp:~hjd/widelands/include-ctime into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~hjd/widelands/include-ctime/+merge/241135 -- https://code.launchpad.net/~hjd/widelands

[Widelands-dev] [Merge] lp:~hjd/widelands/size-to-empty into lp:widelands

2014-10-31 Thread Hans Joachim Desserud
Hans Joachim Desserud has proposed merging lp:~hjd/widelands/size-to-empty into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~hjd/widelands/size-to-empty/+merge/240323 (Note that the test suite for codecheck rules

[Widelands-dev] [Merge] lp:~hjd/widelands/cppcheck-fixes-again into lp:widelands

2014-10-31 Thread Hans Joachim Desserud
Hans Joachim Desserud has proposed merging lp:~hjd/widelands/cppcheck-fixes-again into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~hjd/widelands/cppcheck-fixes-again/+merge/240336 Ran a new cppcheck release

  1   2   3   >