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

2016-05-22 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/trident-sp into lp:widelands 
has been updated.

Status: Needs review => Work in progress

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/trident-sp/+merge/292121
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/trident-sp into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


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

2016-05-22 Thread GunChleoc
Retargeting.
-- 
https://code.launchpad.net/~widelands-dev/widelands/trident-sp/+merge/292121
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/trident-sp into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


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

2016-05-22 Thread GunChleoc
The proposal to merge lp:~widelands-dev/widelands/fh1_multiline_textarea into 
lp:widelands has been updated.

Status: Needs review => Work in progress

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/fh1_multiline_textarea/+merge/292033
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~widelands-dev/widelands/fh1_multiline_textarea into lp:widelands.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


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

2016-05-22 Thread GunChleoc
Should be all fixed now.
-- 
https://code.launchpad.net/~widelands-dev/widelands-website/encyclopedia/+merge/287410
Your team Widelands Developers is subscribed to branch lp:widelands-website.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


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

2016-05-22 Thread noreply
The proposal to merge lp:~widelands-dev/widelands-website/encyclopedia into 
lp:widelands-website has been updated.

Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands-website/encyclopedia/+merge/287410
-- 
Your team Widelands Developers is subscribed to branch lp:widelands-website.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


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

2016-05-22 Thread kaputtnik
Widelands is updated on the server and a cronjob was fixed to get the 
WIDELANDS_SVN_DIR updated (many thanks to janus for help).

I have installed this on the alpha site and get an error when trying to update 
the help:
---
$ ./manage.py update_help
JSON files will be written to: 
/var/www/django_projects/alpha/wlwebsite/code/widelands/media/map_object_info
selected language: en
No corresponding locale found - trying to set it via LANGUAGE=en, LANG=en
Exception: 
[/build/widelands-x6lppq/widelands-18-ppa0-bzr8009/src/website/map_object_info.cc:56]
 Unable to initialize SDL: Failed to connect to the Mir Server.
SoundHandler closing times 0, freq -1216634769, format 46873, chan -1222176768
Error: Unable to execute 'wl_map_object_info' for generating the JSON files.

Reading JSON files in: 
/var/www/django_projects/alpha/wlwebsite/code/widelands/media/map_object_info

All JSON files are OK.
---

Seems that there is somewhere a dependency for an x-server... (Mir). Uploading 
maps works as usual, even it depends also on the graphics (wl_map_info). No 
json files where written. Any ideas?

-- 
https://code.launchpad.net/~widelands-dev/widelands-website/encyclopedia/+merge/287410
Your team Widelands Developers is subscribed to branch lp:widelands-website.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


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

2016-05-22 Thread Klaus Halfmann
kaputtnik: waht you need is a, so called, headless mode.

Either SDL can provide this (No idea how o do this, thiugh).
Or you can set um some X-Server thats works on some local
Bitmaps, which may be sufficent for your case.

Perhpas it is not needed so set up any graphics fo this case,
but the code forgot about that?

Just my 2cents of Knowledge
-- 
https://code.launchpad.net/~widelands-dev/widelands-website/encyclopedia/+merge/287410
Your team Widelands Developers is subscribed to branch lp:widelands-website.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


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

2016-05-22 Thread Klaus Halfmann
Review: Approve code review, compile, test

Works for me.

The effect may still be void as the trees may have grown again after the port 
was placed. (WHich would be some nic tactic to stop a port by some enemy).


-- 
https://code.launchpad.net/~widelands-dev/widelands/port-clearance/+merge/295236
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/port-clearance.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


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

2016-05-22 Thread kaputtnik
Review: Needs Fixing in widelands code

Because the culprit is in widelands wl_map_object_info and not on the website 
code, i leave this branch merged. But i do not deploy it on the productive 
website until wl_map_object_info is fixed.

Klaus, the map_info uses also an initialized SDL to get some informations of a 
map when someone wants to upload a map. The code looks similar to me, so i 
don't know why map_info works whereas map_object_info doesn't. And i am not as 
familiar with c++ than GunChleoc (or others) is/are.

The alpha site is stopped for now.
-- 
https://code.launchpad.net/~widelands-dev/widelands-website/encyclopedia/+merge/287410
Your team Widelands Developers is subscribed to branch lp:widelands-website.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


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

2016-05-22 Thread GunChleoc
Thanks!

@bunnybot merge
-- 
https://code.launchpad.net/~widelands-dev/widelands/port-clearance/+merge/295236
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/port-clearance.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


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

2016-05-22 Thread GunChleoc
The only thing that is different is the call to i18n::set_locale("en"); in line 
53 - could you try removing that line to see if it works? And if it does, move 
that line down?
-- 
https://code.launchpad.net/~widelands-dev/widelands-website/encyclopedia/+merge/287410
Your team Widelands Developers is subscribed to branch lp:widelands-website.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp


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

2016-05-22 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/port-clearance into 
lp:widelands has been updated.

Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/port-clearance/+merge/295236
-- 
Your team Widelands Developers is subscribed to branch 
lp:~widelands-dev/widelands/port-clearance.

___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help   : https://help.launchpad.net/ListHelp