This is an automated email from the git hooks/post-receive script. detiste-guest pushed a commit to branch master in repository game-data-packager.
commit 61858df77c9ae41a60fe2d531c02344ffff5f5dd Author: Alexandre Detiste <[email protected]> Date: Thu Mar 5 14:16:21 2015 +0100 doom_common.py: add support for alternative bitmap icons + ugly stub icon for Chex Quest --- data/chex.svg | 186 ++++++++++++++++++++++++++++++++ data/chex.xpm | 141 ++++++++++++++++++++++++ data/{doom2.xpm => doom-common.xpm} | 0 game_data_packager/games/doom_common.py | 10 +- 4 files changed, 335 insertions(+), 2 deletions(-) diff --git a/data/chex.svg b/data/chex.svg new file mode 100644 index 0000000..2067758 --- /dev/null +++ b/data/chex.svg @@ -0,0 +1,186 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- + (c) 2015 Alexandre Detiste + own work licensed under the terms of the GPL-2 + or any later version. + + This is ugly, feel free to make in better +--> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="107.67512mm" + height="104.25407mm" + viewBox="0 0 381.52601 369.40421" + id="svg2" + version="1.1" + inkscape:version="0.91 r13725" + sodipodi:docname="waffle.svg"> + <defs + id="defs4" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="0.49497475" + inkscape:cx="654.32828" + inkscape:cy="-105.01178" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="false" + inkscape:window-width="1920" + inkscape:window-height="994" + inkscape:window-x="-3" + inkscape:window-y="-3" + inkscape:window-maximized="1" + fit-margin-top="0.1" + fit-margin-right="0.1" + fit-margin-bottom="0.1" + fit-margin-left="0.1" /> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Calque 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(-29.450242,-33.274104)"> + <rect + style="fill:#ffcc00;stroke:#684918;stroke-width:1.00275123;stroke-opacity:0.78431373" + id="rect3336" + width="379.81461" + height="367.69278" + x="30.305948" + y="34.12981" /> + <rect + style="fill:#c87137;stroke:#684918;stroke-opacity:0.78431373" + id="rect3338" + width="66.670067" + height="66.670067" + x="60.609154" + y="310.91025" /> + <rect + style="fill:#c87137;stroke:#684918;stroke-opacity:0.78431373" + id="rect3338-2" + width="66.670067" + height="66.670067" + x="144.45183" + y="309.90009" /> + <rect + style="fill:#c87137;stroke:#684918;stroke-opacity:0.78431373" + id="rect3338-3" + width="66.670067" + height="66.670067" + x="229.30464" + y="309.90009" /> + <rect + style="fill:#c87137;stroke:#684918;stroke-opacity:0.78431373" + id="rect3338-3-2" + width="66.670067" + height="66.670067" + x="314.15744" + y="307.87979" /> + <rect + style="fill:#c87137;stroke:#684918;stroke-opacity:0.78431373" + id="rect3338-7" + width="66.670067" + height="66.670067" + x="62.124397" + y="226.56252" /> + <rect + style="fill:#c87137;stroke:#684918;stroke-opacity:0.78431373" + id="rect3338-2-5" + width="66.670067" + height="66.670067" + x="145.96706" + y="225.55235" /> + <rect + style="fill:#c87137;stroke:#684918;stroke-opacity:0.78431373" + id="rect3338-3-20" + width="66.670067" + height="66.670067" + x="230.81987" + y="225.55235" /> + <rect + style="fill:#c87137;stroke:#684918;stroke-opacity:0.78431373" + id="rect3338-3-2-3" + width="66.670067" + height="66.670067" + x="315.67267" + y="223.53206" /> + <rect + style="fill:#c87137;stroke:#684918;stroke-opacity:0.78431373" + id="rect3338-1" + width="66.670067" + height="66.670067" + x="60.104073" + y="145.75029" /> + <rect + style="fill:#c87137;stroke:#684918;stroke-opacity:0.78431373" + id="rect3338-2-2" + width="66.670067" + height="66.670067" + x="143.94675" + y="144.74013" /> + <rect + style="fill:#c87137;stroke:#684918;stroke-opacity:0.78431373" + id="rect3338-3-9" + width="66.670067" + height="66.670067" + x="228.79955" + y="144.74013" /> + <rect + style="fill:#c87137;stroke:#684918;stroke-opacity:0.78431373" + id="rect3338-3-2-34" + width="66.670067" + height="66.670067" + x="313.65234" + y="142.71983" /> + <rect + style="fill:#c87137;stroke:#684918;stroke-opacity:0.78431373" + id="rect3338-72" + width="66.670067" + height="66.670067" + x="60.104073" + y="64.938103" /> + <rect + style="fill:#c87137;stroke:#684918;stroke-opacity:0.78431373" + id="rect3338-2-4" + width="66.670067" + height="66.670067" + x="143.94675" + y="63.927937" /> + <rect + style="fill:#c87137;stroke:#684918;stroke-opacity:0.78431373" + id="rect3338-3-3" + width="66.670067" + height="66.670067" + x="228.79955" + y="63.927937" /> + <rect + style="fill:#c87137;stroke:#684918;stroke-opacity:0.78431373" + id="rect3338-3-2-5" + width="66.670067" + height="66.670067" + x="313.65234" + y="61.907642" /> + </g> +</svg> diff --git a/data/chex.xpm b/data/chex.xpm new file mode 100644 index 0000000..fd801aa --- /dev/null +++ b/data/chex.xpm @@ -0,0 +1,141 @@ +/* XPM */ +/* + converted from chex.svg + (c) 2015 Alexandre Detiste + license under the terms of the GPL-2 + or any later version +*/ +static char *chex[] = { +/* columns rows colors chars-per-pixel */ +"64 62 67 1 ", +" c #B67229", +". c #BD752B", +"X c #BE722E", +"o c #BF6D34", +"O c #BF7031", +"+ c #C17D24", +"@ c #C1772C", +"# c #C77E29", +"$ c #C3782C", +"% c #C16E35", +"& c #C67036", +"* c #C87137", +"= c #C6871E", +"- c #C7881E", +"; c #CA8D1B", +": c #C98B1C", +"> c #CB8D1C", +", c #CE8D1E", +"< c #D18F1E", +"1 c #CD901A", +"2 c #D09417", +"3 c #D59A15", +"4 c #D49817", +"5 c #D69916", +"6 c #D99F14", +"7 c #DA9E15", +"8 c #D1911B", +"9 c #D29519", +"0 c #D6961A", +"q c #D3911C", +"w c #D7AA06", +"e c #DEA80E", +"r c #DBA211", +"t c #DAA013", +"y c #DDA311", +"u c #DEA212", +"i c #DEA511", +"p c #DCA114", +"a c #E3AF0A", +"s c #E1A90E", +"d c #E0A80F", +"f c #E3AD0C", +"g c #E4AD0C", +"h c #E4AE0D", +"j c #EAB706", +"k c #E9BA03", +"l c #EBB905", +"z c #E4B109", +"x c #E6B10B", +"c c #ECB608", +"v c #ECB808", +"b c #C48222", +"n c #C78620", +"m c #CD8723", +"M c #C88324", +"N c #C98226", +"B c #CB8821", +"V c #CE8A22", +"C c #F4C003", +"Z c #F4C202", +"A c #F5C302", +"S c #F7C402", +"D c #F8C402", +"F c #F9C702", +"G c #FBC901", +"H c #FCCA00", +"J c #FFCC00", +/* pixels */ +"wkkkkkkkkkkkkkkklkkkkkkkkkkkkkkkkkkkkkkklkkkkkkkkkkkkkkkkkkkkkkw", +"kJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJk", +"kJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJk", +"kJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJk", +"kJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJCffhhhggggghJJJJk", +"kJJJJ=MMMMMMMMMMsJJb$$$$$$$$$$tJJ1$$$$$$$$$$>JJu*&********$JJJJk", +"kJJJJ$**********uJJ#****&*****pJJ>**********BHJu**********$JJJJk", +"kJJJJ$**********uJJ#**********7JJV**********BJJu**********$JJJJk", +"kJJJJ$**********uJJ#**********7JJ,&*********BJJu**********$JJJJk", +"kJJJJ$**********uJJ#**********7JJ,**********BJJu**********$JJJJk", +"kJJJJ$**********uJJ#**********7JJ,**********BJJu**********$JJJJk", +"kJJJJ$**********uJJ#**********7JJ,**********BJJu**********$HJJJk", +"kJJJJ$**********uJJ#**********7JJ,**********BJJu**********$JJJJk", +"kJJJJ$**********uJJ#**********7JJ,**********BJJu**********$JJJJk", +"kJJJJ$**********uJJ#**********7JJ,**********BJJi**********$JJJJk", +"kJJJJ$**********pJJ#**********7JJ,**********BJJt%%%%%%%%%%.JJJJk", +"kJJJJ28888888888zJJippppppppppcJJhppppppppppsJHHSCCASSACAAAJJJJl", +"kJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJHJJJJJJJJJHJJJJJk", +"kJJJJzaaaaaaaaaaCJJsiiiiiiiiiivJJxiiiiiiiiiihJJhVVVVVVVVVV1JJJJk", +"kJJJJ$**********uJJ#**********7JJ,**********BJJu*&&&****&*$JJJJk", +"kJJJJ$**********uJJ#**********7JJ,**********BJJu********&&$JJJJk", +"kJJJJ$**********uJJ#**********7JJ,**********BJJu*********&$JJJJk", +"kJJJJ$**********uJJ#**********7JJ,**********BJJu**********$JJJJk", +"kJJJJ$**********uJJ#**********7JJ,**********BJJu**********$JJJJk", +"kJJJJ$**********uJJ#**********7JJ,**********>HJu**********$JJJJv", +"kJJJJ$**********uJJ#**********7JJ,**********BJJu**********$JJJJk", +"kJJJJ$**********uJJ#**********tJJ,*********&BJJu**********$JJJJk", +"kJJJJ$**********uJJ#**********7JJ,*********&BJJp**********$JJJJk", +"kJJJJ$**********uJJ#**&&**&***tHJ>*&*&**&&*&BJJp****&&****$JJJJk", +"kJJJJ@&&&&&&&&&&uJJ+.&&.&@&.&.tJJ>&.&.&$.&$&-JJxV11VV>V11V1JJJJk", +"kJJJJljjjjjjjjjjSJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJHJJGJJJJJJJk", +"kJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJGlvlllcllvllGJJJk", +"lJJJJiVVV1V1V1V<3JHpNNNNNNNNNN<JJzNNNNNNNNNN+JJFo&&&&&&&&&%hJJJl", +"lJJJJ9**********VJJ0**********MJJe**********&GJSO&*********hJJJk", +"lJJJJ8**********mHJ0**********NJJe&*********oGJF%**********hJJJk", +"kJJJJ8**********mJJ0**********NJJe**********OGJS%**********hJJJk", +"kJJJJ8**********mJJ0**********NJJe**********OGJS%**********hJJJk", +"kJJJJ8**********mJJ0**********NJJe**********OGJF%**********hJJJk", +"kJJJJ8**********mJJ0**********NJJe*********&OGJF%*********&hJJJk", +"kJJJJ9**********mJJ0**********NJJe*********&OGJF%*********&xJJJk", +"kJJJJ8**********mJJ0**********NJJe**********&GJF%**********hHJJl", +"kJJJJ1**********mJH0**********NJJe**********oGJS%**********hHHJk", +"kJJJJ8**********mJJ0******&&**NGJe**********OGJS%*&***&**&*fJJJk", +"kJJJJpVVVVVVVVVV4JJh0000000000pGJv00000000009JJJzfaaaxazfzxSJJJk", +"kJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJk", +"kJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJk", +"kJJJGt3033033434hJJ4<<<<<<<<8<eJJi88<<<<<<<<0JJi.OXXXXO.XX GJJJk", +"kJJJJN**********3JJN*********&0JJ0**********MHJe***&*****&OGJJJk", +"kJJJJ#&*********3JJN**********0JJ0**********NJJd**********OGJJJk", +"kJJJJ#**********4JJN**********0JJ0**********NJJd**********OGJJJk", +"kJJJJ#**********3JJN**********0JJ0**********NJJd**********&GJJJk", +"kJJJJN**********4JJN**********0JJ0**********NJJd**********OGJJJk", +"kJJJJ#**********3JJN**********0JJ0**********NJJd********&&OGJJJk", +"kJJJJ#**********0JJN**********0JJ0**********NJJd*********&OGJJJk", +"kJJJJ#&*********3JJN**********0JJ0**********NJJd**********OGJJJk", +"kJJJJ#&*********3JJN**********0JJ0**********NJJd**********OGJJJk", +"kJJJGN**********4JJN&********&0JJ0&*********NJJs******&&**&GJJJk", +"kJJJGMNN###N####pJJ9VVVVVVVVVViJJeVVVVVVVVVV9JJlrrrrrrrrrrtJJJJk", +"kJJJGJJJGJJJJJGGJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJk", +"kJJJJJJJJJJJJJJGJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJk", +"kJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJk", +"wkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkklkkkkkkkkkkkkkkkkkkkkkkkkkkw" +}; diff --git a/data/doom2.xpm b/data/doom-common.xpm similarity index 100% rename from data/doom2.xpm rename to data/doom-common.xpm diff --git a/game_data_packager/games/doom_common.py b/game_data_packager/games/doom_common.py index a6907aa..83548c1 100644 --- a/game_data_packager/games/doom_common.py +++ b/game_data_packager/games/doom_common.py @@ -145,8 +145,14 @@ class DoomGameData(GameData): mkdir_p(pixdir) # FIXME: would be nice if non-Doom games could replace this # Cacodemon with something appropriate - install_data(os.path.join(DATADIR, 'doom2.png'), - os.path.join(pixdir, '%s.png' % wad_base)) + for basename in (package.name, self.shortname, 'doom-common'): + from_ = os.path.join(DATADIR, basename + '.png') + if os.path.exists(from_): + install_data(from_, + os.path.join(pixdir, '%s.png' % wad_base)) + break + else: + raise AssertionError('doom-common.png should have existed') docdir = os.path.join(destdir, 'usr/share/doc/%s' % package.name) mkdir_p(docdir) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

