Complete.Org:
Mailing Lists:
Archives:
freeciv-dev:
August 2005: [Freeciv-Dev] Re: (PR#13730) 12+1 nations patch |
[Freeciv-Dev] Re: (PR#13730) 12+1 nations patch[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
<URL: http://bugs.freeciv.org/Ticket/Display.html?id=13730 > On 2005-08-24, at 11.24, Mateusz Stefek wrote: > > You should rerun ./autogen.sh, it will create Makefile.in from > Makefile.am > You will need automake and autoconf packages installed to do that, > luckily this isn't needed to test the patch (someone else can check if > make install works properly) > > Your patch doesn't apply: > [mateusz@localhost:nations]$ patch -p1 <~/14nations.patch > patching file data/default/nations.ruleset > patching file data/flags/Makefile.am > patching file data/flags/aborigines.svg > patch: **** malformed patch at line 304: > Line 304 is empty (without '+'). Removing it fixes the problem. > > -- > mateusz > It seems like aborigines.svg didn't survive the diff. I hope the file itself isn't malformed. It did open just fine in Inkscape. Copied and pasted the contents into a new document, so hopefully there will be no trouble. Here I've separated the files that needs changing from the files that's added. Please copy the rulesets to /data/nation and images to /data/flags and the apply patch. Rename: ~/data/flags/columbian.svg -> colombian.svg ~/data/flags/iraq_old.svg -> iraq.svg With Colombian, it's up to 15 now. So here's 15 nations. (This is the first and last time I make a nation patch this size... :-/ ) Daniel
aborigines.svg
15_nations.patch
srilanka.svg
sapmi.svg
qing.svg
tibet.svg
turkestan.svg
algeria.svg
algeria.svg
sudan.svg
libya.svg
maori.svg
cuban.ruleset
maori.ruleset
ryukyuan.ruleset
aborigines.ruleset
sudanese.ruleset
ryukyu.svg
libyan.ruleset
uyghur.ruleset
tunisian.ruleset
sami.ruleset
colombian.ruleset
lankese.ruleset
iraq_old.svg
algerian.ruleset
tibetan.ruleset
iraqi.ruleset
manchu.ruleset
|