[adonthell-wastesedge-commits] remove_sdl1_2 b044632 19/29: ADDED larger icons and updated .desktop file accordingly

[Kai Sterker]

tag: remove_sdl1_2
commit b04463258dbd303224f2dca404091217a66a969e
Author: Kai Sterker <address@hidden>
Commit: Kai Sterker <address@hidden>

    ADDED larger icons and updated .desktop file accordingly
---
 Makefile.am                         |   18 ++-
 pixmaps/128x128/apps/wastesedge.png |  Bin 0 -> 42274 bytes
 pixmaps/48x48/apps/wastesedge.png   |  Bin 0 -> 6689 bytes
 pixmaps/Makefile.am                 |    8 +-
 pixmaps/wastesedge_16x16.xpm        |  211 --------------------------
 pixmaps/wastesedge_32x32.xpm        |  279 -----------------------------------
 wastesedge.desktop.in               |    9 +-
 7 files changed, 18 insertions(+), 507 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 5218916..be56292 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,15 +4,17 @@ pkgdatadir = $(gamedatadir)
 
 pkgdata_DATA = gamename.txt character.data mapengine.data quest.data audio.data
 
+desktopdir = $(datadir)/applications
+dist_desktop_DATA = wastesedge.desktop
+
 EXTRA_DIST = config.rpath mkinstalldirs  config.rpath  $(pkgdata_DATA) PLAYING 
autogen.sh ABOUT-NLS \
        debian/README.debian debian/adonthell-wastesedge.6 debian/changelog \
-        debian/control debian/copyright debian/dirs debian/rules debian/menu \
-        debian/compat debian/docs wastesedge.spec.in wastesedge.spec \
+       debian/control debian/copyright debian/dirs debian/rules debian/menu \
+       debian/compat debian/docs wastesedge.spec.in wastesedge.spec 
wastesedge.desktop.in \
        win32/COPYING win32/PLAYING.txt win32/prepare.bat win32/README.txt \
        win32/wastesedge.ico win32/wastesedge.nsi \
-       pixmaps/wastesedge_16x16.xpm pixmaps/wastesedge_32x32.xpm \
-        osx/Copying.html osx/Install.html osx/Playing.html osx/ReadMe.html \
-       osx/adonthell.icns wastesedge.desktop.in 
+       osx/Copying.html osx/Install.html osx/Playing.html osx/ReadMe.html \
+       osx/adonthell.icns
 
 bin_SCRIPTS = adonthell-wastesedge
 
@@ -20,14 +22,14 @@ CLEANFILES = $(bin_SCRIPTS)
 
 # -- clean game directory before installing
 install-exec-local:
-       rm -Rf $DESTDIR$(gamedatadir)
+       rm -Rf $(DESTDIR)$(gamedatadir)
 
 adonthell-wastesedge: Makefile
-       echo -e "#!/bin/sh\n\n$(adonthell_binary) wastesedge" > 
adonthell-wastesedge
+       echo -e "#!/bin/sh\n\$(adonthell_binary) wastesedge" > 
adonthell-wastesedge
 
 # -- make sure the data directory gets deleted
 uninstall-local:
-       rm -rf $DESTDIR$(gamedatadir)
+       rm -rf $(DESTDIR)$(gamedatadir)
 
 
 ACLOCAL_AMFLAGS = -I m4
diff --git a/pixmaps/128x128/apps/wastesedge.png 
b/pixmaps/128x128/apps/wastesedge.png
new file mode 100644
index 0000000..b469ad2
Binary files /dev/null and b/pixmaps/128x128/apps/wastesedge.png differ
diff --git a/pixmaps/48x48/apps/wastesedge.png 
b/pixmaps/48x48/apps/wastesedge.png
new file mode 100644
index 0000000..f0cef7a
Binary files /dev/null and b/pixmaps/48x48/apps/wastesedge.png differ
diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
index 0900968..d7a8913 100644
--- a/pixmaps/Makefile.am
+++ b/pixmaps/Makefile.am
@@ -1,5 +1,5 @@
-pixmapdir = $(datadir)/pixmaps
+iconsdir = $(datadir)/icons/hicolor
 
-pixmap_DATA = wastesedge_16x16.xpm wastesedge_32x32.xpm
-
-EXTRA_DIST = $(pixmap_DATA)
+nobase_dist_icons_DATA = \
+    48x48/apps/wastesedge.png \
+    128x128/apps/wastesedge.png
\ No newline at end of file
diff --git a/pixmaps/wastesedge_16x16.xpm b/pixmaps/wastesedge_16x16.xpm
deleted file mode 100644
index f39fb07..0000000
--- a/pixmaps/wastesedge_16x16.xpm
+++ /dev/null
@@ -1,211 +0,0 @@
-/* XPM */
-static char * wastesedge_16x16_xpm[] = {
-"16 16 192 2",
-"      c None",
-".     c #0F2C1A",
-"+     c #083218",
-"@     c #95A39C",
-"#     c #292B32",
-"$     c #0E1A13",
-"%     c #13171A",
-"&     c #083A1C",
-"*     c #0E4C25",
-"=     c #2F6444",
-"-     c #AEC1B6",
-";     c #365B45",
-">     c #153722",
-",     c #10251A",
-"'     c #030B08",
-")     c #08361D",
-"!     c #09562C",
-"~     c #296D46",
-"{     c #437D5A",
-"]     c #779884",
-"^     c #CEDAD2",
-"/     c #6A8472",
-"(     c #3B5D47",
-"_     c #183E28",
-":     c #132E20",
-"<     c #031D10",
-"[     c #0B542C",
-"}     c #37895A",
-"|     c #81B597",
-"1     c #A7C6B3",
-"2     c #DEE8E1",
-"3     c #DAE1DC",
-"4     c #EEF2EF",
-"5     c #D9E0DB",
-"6     c #9DACA1",
-"7     c #83978A",
-"8     c #5F7B68",
-"9     c #465F4F",
-"0     c #03180A",
-"a     c #0F6833",
-"b     c #16813E",
-"c     c #127A3A",
-"d     c #2E7F4C",
-"e     c #3D7752",
-"f     c #577962",
-"g     c #8FA395",
-"h     c #C5CDC5",
-"i     c #6A7B6E",
-"j     c #496150",
-"k     c #2F4C38",
-"l     c #083B1B",
-"m     c #072C15",
-"n     c #09461F",
-"o     c #1D924C",
-"p     c #1F8C49",
-"q     c #147C43",
-"r     c #107036",
-"s     c #0A5C27",
-"t     c #0B3F1A",
-"u     c #405E49",
-"v     c #A2B0A7",
-"w     c #17321D",
-"x     c #05240E",
-"y     c #073316",
-"z     c #0A3A1C",
-"A     c #062B13",
-"B     c #062B15",
-"C     c #1B8849",
-"D     c #2EAA67",
-"E     c #279756",
-"F     c #168244",
-"G     c #107338",
-"H     c #0A5F29",
-"I     c #094820",
-"J     c #1C482A",
-"K     c #8FA296",
-"L     c #122F1A",
-"M     c #062912",
-"N     c #09391A",
-"O     c #083A1B",
-"P     c #052E14",
-"Q     c #146234",
-"R     c #3BB074",
-"S     c #45BD82",
-"T     c #37AC71",
-"U     c #1B9050",
-"V     c #0F7439",
-"W     c #0B632B",
-"X     c #095222",
-"Y     c #0C431F",
-"Z     c #698471",
-"`     c #0B2D16",
-" .    c #073015",
-"..    c #083919",
-"+.    c #0A2B16",
-"@.    c #0C1E14",
-"#.    c #20834B",
-"$.    c #49BD83",
-"%.    c #4FBE89",
-"&.    c #46B17C",
-"*.    c #219158",
-"=.    c #168348",
-"-.    c #0F7539",
-";.    c #0D5D2E",
-">.    c #0A4821",
-",.    c #4C735B",
-"'.    c #093818",
-").    c #093B1B",
-"!.    c #0A361A",
-"~.    c #0A3219",
-"{.    c #2E9C62",
-"].    c #53C58F",
-"^.    c #5BC693",
-"/.    c #55BE8A",
-"(.    c #3AA36F",
-"_.    c #208F54",
-":.    c #167D43",
-"<.    c #0E6834",
-"[.    c #0B5428",
-"}.    c #3B6F4C",
-"|.    c #0A4A22",
-"1.    c #0D4D23",
-"2.    c #0A3F1C",
-"3.    c #0F2019",
-"4.    c #0D4323",
-"5.    c #329F63",
-"6.    c #55C48F",
-"7.    c #63CE9B",
-"8.    c #60C896",
-"9.    c #4AAF7D",
-"0.    c #36A46D",
-"a.    c #1E8E50",
-"b.    c #157C41",
-"c.    c #116834",
-"d.    c #116835",
-"e.    c #10622F",
-"f.    c #0F582A",
-"g.    c #083117",
-"h.    c #0E3D21",
-"i.    c #289157",
-"j.    c #54C490",
-"k.    c #6ACFA1",
-"l.    c #75CFA7",
-"m.    c #58BD8E",
-"n.    c #45AE7C",
-"o.    c #34A267",
-"p.    c #1D8F4D",
-"q.    c #198043",
-"r.    c #15733B",
-"s.    c #136B34",
-"t.    c #0C4E23",
-"u.    c #06170E",
-"v.    c #0B2F1A",
-"w.    c #207F49",
-"x.    c #47BD82",
-"y.    c #6ED0A2",
-"z.    c #70CFA4",
-"A.    c #59C594",
-"B.    c #51BF88",
-"C.    c #3FB57A",
-"D.    c #31A567",
-"E.    c #1F8B4C",
-"F.    c #157037",
-"G.    c #0E4C23",
-"H.    c #041E0F",
-"I.    c #06140C",
-"J.    c #18693B",
-"K.    c #2E9A5F",
-"L.    c #4DC087",
-"M.    c #5CC895",
-"N.    c #4FBF89",
-"O.    c #44B87F",
-"P.    c #32A96A",
-"Q.    c #249656",
-"R.    c #187940",
-"S.    c #1C4B32",
-"T.    c #0B2518",
-"U.    c #144A2F",
-"V.    c #1E6B42",
-"W.    c #268650",
-"X.    c #36A36A",
-"Y.    c #3BA971",
-"Z.    c #2FA065",
-"`.    c #21884C",
-" +    c #136935",
-".+    c #0E4925",
-"++    c #1D2929",
-"@+    c #0D2F1B",
-"#+    c #15522E",
-"$+    c #176136",
-"%+    c #155F35",
-"&+    c #1D4433",
-"                . + @ # $ $     ",
-"            % & * = - ; > , $   ",
-"        ' ) ! ~ { ] ^ / ( _ : $ ",
-"      < [ } | 1 2 3 4 5 6 7 8 9 ",
-"    0 a b c d e f g h i j k l m ",
-"    n o p q r s t u v w x y z A ",
-"  B C D E F G H I J K L M N O P ",
-"  Q R S T U V W X Y Z `  ...O +.",
-"@.#.$.%.&.*.=.-.;.>.,.N '.).!.  ",
-"~.{.].^./.(._.:.<.[.}.|.1.2.3.  ",
-"4.5.6.7.8.9.0.a.b.c.d.e.f.g.    ",
-"h.i.j.k.l.m.n.o.p.q.r.s.t.u.    ",
-"v.w.x.y.z.A.B.C.D.E.F.G.H.      ",
-"I.J.K.L.M.N.O.P.Q.R.S.T.        ",
-"  U.V.W.X.Y.Z.`. +.+            ",
-"    address@hidden&+                "};
diff --git a/pixmaps/wastesedge_32x32.xpm b/pixmaps/wastesedge_32x32.xpm
deleted file mode 100644
index b2991bc..0000000
--- a/pixmaps/wastesedge_32x32.xpm
+++ /dev/null
@@ -1,279 +0,0 @@
-/* XPM */
-static char * wastesedge_32x32_xpm[] = {
-"32 32 244 2",
-"      c None",
-".     c #1D1810",
-"+     c #281E14",
-"@     c #271A12",
-"#     c #17110C",
-"$     c #120A06",
-"%     c #1F120D",
-"&     c #221710",
-"*     c #120F0A",
-"=     c #0E110B",
-"-     c #151A0C",
-";     c #2D2715",
-">     c #593E2A",
-",     c #7C5A3B",
-"'     c #765E42",
-")     c #201E17",
-"!     c #2E1D16",
-"~     c #0C0A08",
-"{     c #402E1D",
-"]     c #624222",
-"^     c #7E563A",
-"/     c #85674D",
-"(     c #684A32",
-"_     c #463722",
-":     c #3A2F1C",
-"<     c #222716",
-"[     c #362E1A",
-"}     c #5A421E",
-"|     c #8A6747",
-"1     c #B08760",
-"2     c #B68A66",
-"3     c #906A48",
-"4     c #322218",
-"5     c #3B261A",
-"6     c #52311D",
-"7     c #613C22",
-"8     c #67422A",
-"9     c #795438",
-"0     c #85593B",
-"a     c #926143",
-"b     c #89603F",
-"c     c #593A26",
-"d     c #4E3722",
-"e     c #6C4F30",
-"f     c #A67A58",
-"g     c #AA815E",
-"h     c #352A1C",
-"i     c #422A1C",
-"j     c #764E30",
-"k     c #9A664B",
-"l     c #A26E4E",
-"m     c #926649",
-"n     c #976A4A",
-"o     c #A27652",
-"p     c #A57F5B",
-"q     c #9C7857",
-"r     c #524428",
-"s     c #422A2A",
-"t     c #A87457",
-"u     c #B17E5F",
-"v     c #A27254",
-"w     c #916F4E",
-"x     c #4E3E26",
-"y     c #977250",
-"z     c #7D6040",
-"A     c #34261E",
-"B     c #975D43",
-"C     c #A66E54",
-"D     c #AF7A5A",
-"E     c #8E6145",
-"F     c #73492B",
-"G     c #725036",
-"H     c #8A624A",
-"I     c #826042",
-"J     c #40321F",
-"K     c #523B27",
-"L     c #5A3232",
-"M     c #B2765A",
-"N     c #6E482C",
-"O     c #5E3622",
-"P     c #543624",
-"Q     c #867666",
-"R     c #664626",
-"S     c #86503E",
-"T     c #B78262",
-"U     c #925A3E",
-"V     c #60442D",
-"W     c #5F4E32",
-"X     c #3F3621",
-"Y     c #2C2216",
-"Z     c #252E19",
-"`     c #26321B",
-" .    c #7A8276",
-"..    c #BE8C6A",
-"+.    c #965642",
-"@.    c #976E49",
-"#.    c #1E2A1E",
-"$.    c #123E1E",
-"%.    c #0A522E",
-"&.    c #8AAA99",
-"*.    c #2E361E",
-"=.    c #462618",
-"-.    c #463E28",
-";.    c #0C2E1C",
-">.    c #10643C",
-",.    c #65BB96",
-"'.    c #AAD6C6",
-").    c #70917E",
-"!.    c #2A321A",
-"~.    c #A6694B",
-"{.    c #725A3E",
-"].    c #6E422A",
-"^.    c #584A31",
-"/.    c #162418",
-"(.    c #0C3A20",
-"_.    c #22452F",
-":.    c #3E5442",
-"<.    c #6A7E72",
-"[.    c #7EA492",
-"}.    c #84C6AA",
-"|.    c #BEEADA",
-"1.    c #E6FAF2",
-"2.    c #D2EAE0",
-"3.    c #7E9A8A",
-"4.    c #4E564E",
-"5.    c #464E42",
-"6.    c #12321C",
-"7.    c #7E4232",
-"8.    c #465349",
-"9.    c #0F5B3C",
-"0.    c #0E4A30",
-"a.    c #16763E",
-"b.    c #C8F1E1",
-"c.    c #82DABA",
-"d.    c #166846",
-"e.    c #1B3B25",
-"f.    c #185C3C",
-"g.    c #0C4226",
-"h.    c #402E26",
-"i.    c #3C2A1C",
-"j.    c #0D3E27",
-"k.    c #1E8E56",
-"l.    c #23825F",
-"m.    c #0E361E",
-"n.    c #225A38",
-"o.    c #308260",
-"p.    c #78CEAE",
-"q.    c #16AA86",
-"r.    c #307656",
-"s.    c #59B691",
-"t.    c #102512",
-"u.    c #4E6454",
-"v.    c #0D2A1A",
-"w.    c #144028",
-"x.    c #4A9A7E",
-"y.    c #1A7256",
-"z.    c #0B3219",
-"A.    c #2D3D2D",
-"B.    c #3C5C42",
-"C.    c #6E9A82",
-"D.    c #1D6546",
-"E.    c #1A4E2C",
-"F.    c #528A6E",
-"G.    c #90C8AC",
-"H.    c #48311F",
-"I.    c #172F1D",
-"J.    c #164628",
-"K.    c #092414",
-"L.    c #74887A",
-"M.    c #2A523A",
-"N.    c #437D61",
-"O.    c #104629",
-"P.    c #182A19",
-"Q.    c #1F895B",
-"R.    c #7BC7A9",
-"S.    c #115437",
-"T.    c #10261C",
-"U.    c #0B1E10",
-"V.    c #1E4226",
-"W.    c #427A52",
-"X.    c #5EA07E",
-"Y.    c #237852",
-"Z.    c #225236",
-"`.    c #574225",
-" +    c #46826A",
-".+    c #90DABE",
-"++    c #2A4434",
-"@+    c #223A2A",
-"#+    c #4A8A5E",
-"$+    c #42A26A",
-"%+    c #2ABE7E",
-"&+    c #5ED29E",
-"*+    c #03140C",
-"=+    c #1E6E4A",
-"-+    c #4E8E72",
-";+    c #5D866E",
-">+    c #36CA92",
-",+    c #7EE6BE",
-"'+    c #62AE8A",
-")+    c #1E3624",
-"!+    c #708076",
-"~+    c #1A3622",
-"{+    c #30A47A",
-"]+    c #214C34",
-"^+    c #368662",
-"/+    c #4EB88E",
-"(+    c #6AC29E",
-"_+    c #2E6E50",
-":+    c #4A5A4A",
-"<+    c #9ADEC2",
-"[+    c #86D2B6",
-"}+    c #52AE8A",
-"|+    c #76A48E",
-"1+    c #133A24",
-"2+    c #725638",
-"3+    c #4A4E36",
-"4+    c #249462",
-"5+    c #269A6A",
-"6+    c #6EA68C",
-"7+    c #36946A",
-"8+    c #86BA9E",
-"9+    c #345644",
-"0+    c #326852",
-"a+    c #42725E",
-"b+    c #A1BAAD",
-"c+    c #040202",
-"d+    c #308E68",
-"e+    c #AEE6CE",
-"f+    c #020A06",
-"g+    c #BAEADA",
-"h+    c #2A8A66",
-"i+    c #26684A",
-"j+    c #DAF2EA",
-"k+    c #B6CEC2",
-"l+    c #A6C2B2",
-"m+    c #327E58",
-"n+    c #42AE7E",
-"o+    c #52D6A2",
-"p+    c #B8E0D0",
-"q+    c #CEE2D6",
-"r+    c #28AA76",
-"s+    c #52725E",
-"t+    c #18543C",
-"u+    c #5A665E",
-"                                          . . + @ .             ",
-"                      # $ % @ & # * * = - ; > , ' > )           ",
-"            @ ! @ ~ % { ] ^ / , ( _ : < [ } | 1 2 3 : -         ",
-"      @ @ 4 5 6 7 8 9 0 a b 0 c { { d > e b f 1 g 1 ' h         ",
-"    ! i ] j 0 k l k m m 0 ] { { c 0 , , n o 3 ^ ^ p q r =       ",
-"  ; s 9 a t u u u v m 9 c i { 7 w 1 g p p 3 0 x ( / y z +       ",
-"  A 8 B C D u D t E F 6 G > > H q f m b I e J { K / G z K *     ",
-"A L B C u M C k B N O , ( P , w w e r _ 5 4 { { _ Q x G R .     ",
-"h S M T T t U S 7 R I V P ^ y w W X Y @ & ! h Z `  ._ ] e 5     ",
-"s k ....u l +.7 6 @.z c b p p z X A . # @ @ #.$.%.&.*.X c :     ",
-"J C ....t B 8 =.b y K N m y z -.! . * # # # ;.>.,.'.).!._ h     ",
-"@ I T T ~.+.O O @.{.P ].n 3 ^.< - /.(._.:.<.[.}.|.1.2.3.4.5.6.  ",
-"@ ( l D ~.7.=.F f d c j n , X 8.(.%.>.9.0.(.$.a.,.b.c.d.;.e.f.g.",
-"# h.^ a U ].{ 3 z i.j 3 3 ^.Z :.j.f.k.l.>.(.m.n.o.p.q.>.g.r.s.9.",
-"  + > j F O h | ( c n f ' *.t.u.v.w.o.x.y.z.- A.B.C.D.w.E.F.G.d.",
-"  ~ ! c ] X X , H.9 f q ^.I.J.C.0.(.$.f.E.K.t.I.B.L.e.I.` M.N.O.",
-"    @ A H.i.; R _ ^ g 9 P.z.Q.R.a.S.m.I.;.T.U.V.W.X.Q.Y.Z.e.6.U.",
-"      . . : _ `.6 b 1 e P. +s..+s. address@hidden:./._.#+$+%+&+p.r.P.*+",
-"        ; ^.' x =.b p e < E.=+X.D.w.;.m.w.-+D._.;+k.>+,+b.'+I.  ",
-"        L y z : + z p {.{ #.)+!+~+m.j.l.{+.+{+=+<.]+^+/+(+_+m.  ",
-"        O y z J @ e y 3 } ; #.:+K.;.r.s.R.<+[+}+|+1+Z.Y.D.e.v.  ",
-"          2+n b X ! e b G 7 K 3+` ]+4+5+Q.6+^+7+8+_.K.1+T.;.    ",
-"          ; ^.o @.c @ ] j R R ^.!.9+Q.D.S.0+E.=+&.]+z.K.        ",
-"            . V 3 z { $ ! 5 i.-.; ]+S.(.v.(.j.a+b+0+O.z.        ",
-"            h i.9 w V * ~ c+c+*.+ Z O.;.g.S.d+R.e+}+Q.>.m.      ",
-"            > N b w h.            f+v.1+Y.{+c.g+b.R.7+h+i+~+    ",
-"            _ y o W s               <.[.G.e+b.j+2.k+l+b+&.L.    ",
-"              V 2+Y                 A.m+n+o+}.p+q+b+).).;+u.    ",
-"                                    f+9.4+r+7+6+b+s+j.(.v.K.    ",
-"                                      *+>.Q.a.F.&.M.1+K.U.      ",
-"                                      c+*+w.t+a+)._.m.U.*+      ",
-"                                          f+*+8.u+T.K.          "};
diff --git a/wastesedge.desktop.in b/wastesedge.desktop.in
index 1020a27..b03572d 100644
--- a/wastesedge.desktop.in
+++ b/wastesedge.desktop.in
@@ -1,11 +1,10 @@
 [Desktop Entry]
+Type=Application
+Version=1.0
 Encoding=UTF-8
 Name=Waste's Edge
-GenericName=Waste's Edge
 Comment=A 2D graphical RPG
-Exec=adonthell-wastesedge
-Icon=wastesedge_32x32
address@hidden@ wastesedge
+Icon=wastesedge
 Terminal=false
-Type=Application
 Categories=Game;RolePlaying;
address@hidden@