[Freeciv-Dev] Re: (PR#13730) 12+1 nations patch
[Top] [All Lists]
[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
Description: Binary data
15_nations.patch
Description: Binary data
srilanka.svg
Description: Binary data
sapmi.svg
Description: Binary data
qing.svg
Description: Binary data
tibet.svg
Description: Binary data
turkestan.svg
Description: Binary data
algeria.svg
Description: application/applefile
algeria.svg
Description: Binary data
sudan.svg
Description: Binary data
libya.svg
Description: Binary data
maori.svg
Description: Binary data
cuban.ruleset
Description: Binary data
maori.ruleset
Description: Binary data
ryukyuan.ruleset
Description: Binary data
aborigines.ruleset
Description: Binary data
sudanese.ruleset
Description: Binary data
ryukyu.svg
Description: Binary data
libyan.ruleset
Description: Binary data
uyghur.ruleset
Description: Binary data
tunisian.ruleset
Description: Binary data
sami.ruleset
Description: Binary data
colombian.ruleset
Description: Binary data
lankese.ruleset
Description: Binary data
iraq_old.svg
Description: Binary data
algerian.ruleset
Description: Binary data
tibetan.ruleset
Description: Binary data
iraqi.ruleset
Description: Binary data
manchu.ruleset
Description: Binary data
- [Freeciv-Dev] Re: (PR#13730) 12+1 nations patch, Daniel Markstedt, 2005/08/22
- [Freeciv-Dev] Re: (PR#13730) 12+1 nations patch, Jason Short, 2005/08/22
- [Freeciv-Dev] Re: (PR#13730) 12+1 nations patch, Daniel Markstedt, 2005/08/22
- [Freeciv-Dev] Re: (PR#13730) 12+1 nations patch, Daniel Markstedt, 2005/08/23
- [Freeciv-Dev] (PR#13730), Daniel Markstedt, 2005/08/24
- [Freeciv-Dev] (PR#13730) 12+1 nations patch, Mateusz Stefek, 2005/08/24
- [Freeciv-Dev] Re: (PR#13730) 12+1 nations patch,
Daniel Markstedt <=
- [Freeciv-Dev] Re: (PR#13730) 12+1 nations patch, Jason Short, 2005/08/24
- [Freeciv-Dev] Re: (PR#13730) 12+1 nations patch, Daniel Markstedt, 2005/08/24
- [Freeciv-Dev] (PR#13730) Licensing, Daniel Markstedt, 2005/08/26
- [Freeciv-Dev] Re: (PR#13730) Licensing, Christian Knoke, 2005/08/26
- [Freeciv-Dev] Re: (PR#13730) Licensing, Jason Short, 2005/08/26
|