Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/gci18nfixes into lp:widelands
Do you have any ideas how to get rid of the added/removed/deleted conflicts? I did a full manual merge and now bzr wants to track something somewhere and is generating these conflicts. I tried saving my work, doing a bzr merge and then copying my files over, but then I get the same conflicts directly in the branch. I tried stuff like deleting the test and po directories and copying them over from trunk, how to I tell bzr to shut up and accept the changes already? -- https://code.launchpad.net/~widelands-dev/widelands/gci18nfixes/+merge/192288 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/gci18nfixes 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:~qcumber-some/widelands/bug1287241 into lp:~widelands-dev/widelands/debian
Jens Beyer (Qcumber-some) has proposed merging
lp:~qcumber-some/widelands/bug1287241 into lp:~widelands-dev/widelands/debian.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1287241 in widelands: "Parallel compilation on launchpad builder is
broken"
https://bugs.launchpad.net/widelands/+bug/1287241
For more details, see:
https://code.launchpad.net/~qcumber-some/widelands/bug1287241/+merge/209091
I don't know how the original rules file was created.
But in my eyes there are two changes necessary - the first line does not work
at all, and the second line seems to be an error.
--
https://code.launchpad.net/~qcumber-some/widelands/bug1287241/+merge/209091
Your team Widelands Developers is requested to review the proposed merge of
lp:~qcumber-some/widelands/bug1287241 into lp:~widelands-dev/widelands/debian.
=== modified file 'debian/rules'
--- debian/rules 2014-02-25 18:12:33 +
+++ debian/rules 2014-03-03 16:16:07 +
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
# parallel building
-parallel=$(shell echo $$DEB_BUILD_OPTIONS | grep parallel > /dev/null && echo -j$$(test -f /proc/cpuinfo && cat /proc/cpuinfo | (grep ^processor || echo 1) | wc -l))
+parallel=$(shell echo "-j `cat /proc/cpuinfo | grep -c 'processor'`")
# Hardening flags
CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
@@ -24,7 +24,7 @@
../ && cat src/config.h
override_dh_auto_build:
- cd build-debian && make VERBOSE=1 ${parallel}
+ cd build-debian && make VERBOSE=1 $(parallel)
override_dh_auto_install:
cd build-debian && make install DESTDIR=`pwd`/../debian/tmp
___
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] [Build #5654244] i386 build of widelands 1:18-ppa0-bzr6843-201403031534~ubuntu12.04.1 in ubuntu precise RELEASE (widelands-dev-widelands-daily-precise PPA)
* Source Package: widelands * Version: 1:18-ppa0-bzr6843-201403031534~ubuntu12.04.1 * Architecture: i386 * Archive: widelands-dev-widelands-daily-precise PPA * Component: main * State: Failed to build * Duration: 9 minutes * Build Log: https://launchpad.net/~widelands-dev/+archive/widelands-daily-precise/+build/5654244/+files/buildlog_ubuntu-precise-i386.widelands_1%3A18-ppa0-bzr6843-201403031534%7Eubuntu12.04.1_FAILEDTOBUILD.txt.gz * Builder: https://launchpad.net/builders/wani06 * Source: not available If you want further information about this situation, feel free to contact a member of the Launchpad Buildd Administrators team. -- i386 build of widelands 1:18-ppa0-bzr6843-201403031534~ubuntu12.04.1 in ubuntu precise RELEASE https://launchpad.net/~widelands-dev/+archive/widelands-daily-precise/+build/5654244 ___ 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:~qcumber-some/widelands/bug1287241 into lp:~widelands-dev/widelands/debian
Try to ping emptty on IRC. He'll likely be able to answer (and maybe even add the patch upstream). :) -- https://code.launchpad.net/~qcumber-some/widelands/bug1287241/+merge/209091 Your team Widelands Developers is requested to review the proposed merge of lp:~qcumber-some/widelands/bug1287241 into lp:~widelands-dev/widelands/debian. ___ 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/gci18nfixes into lp:widelands
just fyi: We did some more hacking on properly merging this branch yesterday. The result can be found in lp:~widelands-dev/widelands/i18n - that is the branch that we are going to merge on wednesday. This merge request is therefore kinda outdated. -- https://code.launchpad.net/~widelands-dev/widelands/gci18nfixes/+merge/192288 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/gci18nfixes 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
