Complete.Org: Mailing Lists: Archives: freeciv-dev: August 2005:
[Freeciv-Dev] Re: (PR#13730) 12+1 nations patch
Home

[Freeciv-Dev] Re: (PR#13730) 12+1 nations patch

[Top] [All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
Subject: [Freeciv-Dev] Re: (PR#13730) 12+1 nations patch
From: "Daniel Markstedt" <himasaram@xxxxxxxx>
Date: Wed, 24 Aug 2005 04:41:20 -0700
Reply-to: bugs@xxxxxxxxxxx

<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

Attachment: aborigines.svg
Description: Binary data

Attachment: 15_nations.patch
Description: Binary data

Attachment: srilanka.svg
Description: Binary data

Attachment: sapmi.svg
Description: Binary data

Attachment: qing.svg
Description: Binary data

Attachment: tibet.svg
Description: Binary data

Attachment: turkestan.svg
Description: Binary data

Attachment: algeria.svg
Description: application/applefile

Attachment: algeria.svg
Description: Binary data

Attachment: sudan.svg
Description: Binary data

Attachment: libya.svg
Description: Binary data

Attachment: maori.svg
Description: Binary data

Attachment: cuban.ruleset
Description: Binary data

Attachment: maori.ruleset
Description: Binary data

Attachment: ryukyuan.ruleset
Description: Binary data

Attachment: aborigines.ruleset
Description: Binary data

Attachment: sudanese.ruleset
Description: Binary data

Attachment: ryukyu.svg
Description: Binary data

Attachment: libyan.ruleset
Description: Binary data

Attachment: uyghur.ruleset
Description: Binary data

Attachment: tunisian.ruleset
Description: Binary data

Attachment: sami.ruleset
Description: Binary data

Attachment: colombian.ruleset
Description: Binary data

Attachment: lankese.ruleset
Description: Binary data

Attachment: iraq_old.svg
Description: Binary data

Attachment: algerian.ruleset
Description: Binary data

Attachment: tibetan.ruleset
Description: Binary data

Attachment: iraqi.ruleset
Description: Binary data

Attachment: manchu.ruleset
Description: Binary data


[Prev in Thread] Current Thread [Next in Thread]