From: Thomas Thurman Date: Wed, 27 May 2009 20:23:19 +0000 (-0400) Subject: remove unused image files; update makefile to put extra files all in the same dir... X-Git-Url: http://vcs.maemo.org/git/?p=rfk;a=commitdiff_plain;h=e7ba06c3a13b660a4fa9b91d9d47375ca8c8e956 remove unused image files; update makefile to put extra files all in the same dir; fix one NKI --- diff --git a/Makefile b/Makefile index 45ec877..98f4dfc 100644 --- a/Makefile +++ b/Makefile @@ -8,17 +8,14 @@ rfk: rfk.c clean: rm -f rfk -# some of these are not needed, or are possibly in the wrong place install: rfk rfk.xpm rfk.desktop install -d ${DESTDIR}/usr/bin install rfk ${DESTDIR}/usr/bin install -d ${DESTDIR}/usr/share/applications/hildon install rfk.desktop ${DESTDIR}/usr/share/applications/hildon install -d ${DESTDIR}/usr/share/pixmaps - install rfk.xpm ${DESTDIR}/usr/share/pixmaps - install rfk-dimmed.xpm ${DESTDIR}/usr/share/pixmaps - install rfk-robot.png ${DESTDIR}/usr/share/pixmaps - install rfk-love.png ${DESTDIR}/usr/share/pixmaps - install rfk-kitten.png ${DESTDIR}/usr/share/pixmaps - install -d ${DESTDIR}/usr/share/icons/64x64/hildon/rfk.png - install rfk.png ${DESTDIR}/usr/share/icons/64x64/hildon/rfk.png \ No newline at end of file + install rfk.png ${DESTDIR}/usr/share/pixmaps + install -d ${DESTDIR}/usr/share/rfk + install rfk-robot.png ${DESTDIR}/usr/share/rfk + install rfk-love.png ${DESTDIR}/usr/share/rfk + install rfk-kitten.png ${DESTDIR}/usr/share/rfk diff --git a/debian/changelog b/debian/changelog index 422f307..ef479ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +rfk (1.20-1) unstable; urgency=low + + * Fix icon + * Fix one broken non-kitten item + * All files are installed to the same directory + + -- Thomas Thurman Tue, 27 May 2009 21:33:32 -0400 + rfk (1.10-1) unstable; urgency=low * Add keypresses diff --git a/rfk-dimmed.xpm b/rfk-dimmed.xpm deleted file mode 100644 index 651f467..0000000 --- a/rfk-dimmed.xpm +++ /dev/null @@ -1,169 +0,0 @@ -/* XPM */ -static char * rfk_dimmed_xpm[] = { -"32 26 140 2", -" c None", -". c #0B0B0B", -"+ c #121212", -"@ c #191919", -"# c #232323", -"$ c #2D2D2D", -"% c #373737", -"& c #3C3C3C", -"* c #363636", -"= c #2C2C2C", -"- c #1F1F1F", -"; c #242424", -"> c #333333", -", c #2F2F2F", -"' c #272727", -") c #1C1C1C", -"! c #131313", -"~ c #060606", -"{ c #030303", -"] c #020202", -"^ c #010101", -"/ c #080808", -"( c #0D0D0D", -"_ c #161616", -": c #545454", -"< c #535353", -"[ c #656565", -"} c #4A4A4A", -"| c #393939", -"1 c #2A2A2A", -"2 c #212121", -"3 c #434343", -"4 c #494949", -"5 c #4C4C4C", -"6 c #404040", -"7 c #313131", -"8 c #1E1E1E", -"9 c #111111", -"0 c #000000", -"a c #040404", -"b c #090909", -"c c #353535", -"d c #797979", -"e c #6C6C6C", -"f c #464646", -"g c #292929", -"h c #2B2B2B", -"i c #4E4E4E", -"j c #7A7A7A", -"k c #6B6B6B", -"l c #686868", -"m c #3A3A3A", -"n c #0F0F0F", -"o c #808080", -"p c #5C5C5C", -"q c #6D6D6D", -"r c #777777", -"s c #555555", -"t c #444444", -"u c #3D3D3D", -"v c #767676", -"w c #696969", -"x c #252525", -"y c #101010", -"z c #050505", -"A c #FF0000", -"B c #0E0E0E", -"C c #202020", -"D c #585858", -"E c #626262", -"F c #787878", -"G c #575757", -"H c #505050", -"I c #5F5F5F", -"J c #6F6F6F", -"K c #7C7C7C", -"L c #262626", -"M c #323232", -"N c #4F4F4F", -"O c #747474", -"P c #454545", -"Q c #7D7D7D", -"R c #727272", -"S c #303030", -"T c #7B7B7B", -"U c #7E7E7E", -"V c #757575", -"W c #666666", -"X c #3E3E3E", -"Y c #222222", -"Z c #343434", -"` c #4B4B4B", -" . c #515151", -".. c #5E5E5E", -"+. c #606060", -"@. c #525252", -"#. c #4D4D4D", -"$. c #565656", -"%. c #5A5A5A", -"&. c #6E6E6E", -"*. c #595959", -"=. c #818181", -"-. c #828282", -";. c #737373", -">. c #0C0C0C", -",. c #383838", -"'. c #5B5B5B", -"). c #878787", -"!. c #717171", -"~. c #939393", -"{. c #676767", -"]. c #8C8C8C", -"^. c #3F3F3F", -"/. c #1B1B1B", -"(. c #151515", -"_. c #858585", -":. c #707070", -"<. c #898989", -"[. c #616161", -"}. c #484848", -"|. c #3B3B3B", -"1. c #424242", -"2. c #6A6A6A", -"3. c #7F7F7F", -"4. c #2E2E2E", -"5. c #1A1A1A", -"6. c #414141", -"7. c #141414", -"8. c #8B8B8B", -"9. c #848484", -"0. c #888888", -"a. c #5D5D5D", -"b. c #474747", -"c. c #1D1D1D", -"d. c #646464", -"e. c #838383", -"f. c #636363", -"g. c #909090", -"h. c #9D9D9D", -"i. c #A0A0A0", -". + @ # $ % & & * = # - - ; = > % * , ' ) ! . ~ { ] ] ] ] ] ^ ^ ", -"/ ( _ ; * : < [ } | 1 2 # $ & 3 4 5 6 7 8 9 / { ^ 0 0 0 0 0 0 0 ", -"a b + # c d : d e f > g h | i j k l l m 2 n ~ ] 0 0 0 0 0 0 0 0 ", -"^ ~ n 2 * o p q r s t | u 5 [ j v w w 3 x y z A A 0 A A 0 0 0 0 ", -"^ z B C c o D E F f G H : I r J K w w f L n A A A A A A A 0 0 0 ", -"0 a B - M o N p O j s P s 5 Q l R w w 3 ; B a A A A A A 0 0 0 0 ", -"0 a B 8 S d 4 < : K d Q T U V [ W l l X Y B a 0 A A A 0 0 0 0 0 ", -"0 a B 8 Z w 5 N < ` < : D ...+.E ..@.u 2 B a ^ 0 A 0 0 0 0 0 0 ", -"0 a B - > V N G < s .#.N $.%.W &.W W 3 ' + b z { ] ^ 0 0 0 0 0 ", -"0 a B C * o *.O =.o < #.N W o -.;.w w H 7 ) + B >.b ~ { ^ 0 0 0 ", -"0 a B 2 ,.o '.).!.~.{. .< K ;.].V w w p ^.= Y 8 /.(.B / { ^ 0 0 ", -"0 a B - c o D _.:.].: .@.T :.<.!.w w [.}.|.M , 1 # /.y / { 0 0 ", -"0 a ( ) S K < w V V : #.5 1.r v !.w w 2.Q U U 3.U V ; /.B ~ ] 0 ", -"0 a ( ) 4.{.` H . .i 5 } ` #.< G .i } & * * Z * * Z g 5.( a ^ ", -"^ z B 8 M 6.4 ` } 5 i l t } f }.5 i 5 P m M , 7 ,.| !.% ' 7./ ] ", -"] / 7.g u N : s @.@.q 8.d t 5 N s G $.#.X 7 h $ ,.3 Q k c 8 B a ", -"{ . ) S O 3.v k R : < -.r f @.:.k Q U 2.< 1.| | 1.N &.T ^.g 7.b ", -"a B - * T <.K l q l t u m u e e &.9.0.e e a.< H : *.D v 1.Z 8 y ", -"/ + Y ,.X +.4 G ` u M h 1 4.m #.%.i : w v F v F F :.$.R F 6 4.C ", -"+ ) 1 % 1.b.}.f X > L ) @ ) L ,. .2.j k l w l w l W H ` k ` f & ", -"L M |.^.u |.u 6.6 ,.g ) ! ! ) $ f I O +.[ %.@.5 f 6 X t #.e q E ", -"P 4 J w 4 3 f i :.q m g c.) Y Z 5 d K d.D 4 6 |.% Z c ^.: e =.%.", -"{.9.=.2.E '.+.Q ).:.$.P ,.* |.` p 0.+.:.a.#.t 6 X u 6.5 E Q K 2.", -"q 8.D 0.e.K T _.:.e.j e f.[.d.:.r 0.H ).r k d.E E E d.q Q g.Q e ", -": K =.!.&.:.&.r =.V !.&.J :.&.:.: F O w J :.&.&.J :.J &.e W o s ", -"l e.@.< J :.J h.Q [ e !.:.:.:.:.: i.F !.!.:.R !.!.!.J !.:.J !.8."}; diff --git a/rfk.c b/rfk.c index b93ac34..7dcf03b 100644 --- a/rfk.c +++ b/rfk.c @@ -269,7 +269,7 @@ static char* messages[] = "It's an autographed copy of \"Secondary Colors,\" by Bob Ross.", "It is a marzipan dreadnought that appears to have melted and stuck.", "It's a DVD of \"Crouching Monkey, Hidden Kitten\", region encoded for the moon.", - "It's Kieran Hervold. Damn dyslexia!" + "It's Kieran Hervold. Damn dyslexia!", "A non-descript box of crackers.", "Carbonated Water, High Fructose Corn Syrup, Color, Phosphoric Acid, Flavors, Caffeine.", "\"Move along! Nothing to see here!\"", @@ -475,9 +475,9 @@ ending_animation_step (gpointer data) static void ending_animation () { - robot_pic = gdk_pixbuf_new_from_file ("/usr/share/pixmaps/rfk-robot.png", NULL); - love_pic = gdk_pixbuf_new_from_file ("/usr/share/pixmaps/rfk-love.png", NULL); - kitten_pic = gdk_pixbuf_new_from_file ("/usr/share/pixmaps/rfk-kitten.png", NULL); + robot_pic = gdk_pixbuf_new_from_file ("/usr/share/rfk/rfk-robot.png", NULL); + love_pic = gdk_pixbuf_new_from_file ("/usr/share/rfk/rfk-love.png", NULL); + kitten_pic = gdk_pixbuf_new_from_file ("/usr/share/rfk/rfk-kitten.png", NULL); animation_area = gtk_drawing_area_new (); gtk_container_remove (GTK_CONTAINER (window), GTK_WIDGET (table)); @@ -596,6 +596,7 @@ main (gint argc, int x, y; gtk_init (&argc, &argv); + g_set_application_name ("robot finds kitten"); srandom (time(0)); window = gtk_window_new (GTK_WINDOW_TOPLEVEL); diff --git a/rfk.png b/rfk.png index 96b71fa..92676f6 100644 Binary files a/rfk.png and b/rfk.png differ diff --git a/rfk.xpm b/rfk.xpm deleted file mode 100644 index 962ce4f..0000000 --- a/rfk.xpm +++ /dev/null @@ -1,91 +0,0 @@ -/* XPM */ -static char * rfk_xpm[] = { -"32 26 62 1", -" c None", -". c #050505", -"+ c #0A0A0A", -"@ c #0B0B0B", -"# c #020202", -"$ c #000000", -"% c #545454", -"& c #656565", -"* c #090909", -"= c #030303", -"- c #797979", -"; c #6C6C6C", -"> c #7A7A7A", -", c #6B6B6B", -"' c #686868", -") c #808080", -"! c #6D6D6D", -"~ c #777777", -"{ c #010101", -"] c #696969", -"^ c #FF0000", -"/ c #787878", -"( c #272727", -"_ c #6F6F6F", -": c #747474", -"< c #0D0D0D", -"[ c #323232", -"} c #0E0E0E", -"| c #494949", -"1 c #7D7D7D", -"2 c #070707", -"3 c #7C7C7C", -"4 c #7B7B7B", -"5 c #7E7E7E", -"6 c #757575", -"7 c #0C0C0C", -"8 c #040404", -"9 c #666666", -"0 c #818181", -"a c #828282", -"b c #878787", -"c c #939393", -"d c #676767", -"e c #8C8C8C", -"f c #858585", -"g c #898989", -"h c #717171", -"i c #1B1B1B", -"j c #767676", -"k c #6A6A6A", -"l c #7F7F7F", -"m c #080808", -"n c #0F0F0F", -"o c #8B8B8B", -"p c #727272", -"q c #707070", -"r c #6E6E6E", -"s c #060606", -"t c #848484", -"u c #888888", -"v c #606060", -"w c #3E3E3E", -".+@@@@@@@@@@@@@@@@@@@@@@@@@@@@+#", -"$$$$$%$&$$$$$$$*+==$$$$$$$$$$$$$", -"$$$$.-+-;$$$$$$>,''$$$$$$$$$$$$$", -"$$$$.).!~$$$$$&>{]]$$$$^^$^^$$$$", -"$$$$.).=/($$$$~_$]]$$$^^^^^^^$$$", -"$$$$.).$:><[}|12$]]$$$$^^^^^$$$$", -"$$$$.-.$.3-1456$$''$$$$$^^^$$$$$", -"$$$$$]$$$<=#$7$$$88$$$$$$^$$$$$$", -"$$$$.6.$8$$$$$8{$99$$$$$$$$$$$$$", -"$$$$.).:0){$$9)a+]]$$$$$$$$$$$$$", -"$$$$.)+b$cd$$3$e6]]$$$$$$$$$$$$$", -"$$$$.)@f$e%$$4$gh]]{.#8888$$$$$$", -"$$$$.3.]66$$$i~j$]]k155l56@$$$$$", -"$$$$$d$$$$$$$${$$mm8@727+m#$$$$$", -"$$$$$$$$$$#'n$$$$$$$$$$$$7h#$$$$", -"$$$$={=$$$!o-}$$$={$$$$$$=1,$$$$", -"$$$2:lj,p$$a~7$q,15k$$$$$$r4#$$$", -"$$$24g3'!'{s+*;;rtu;$$$$$$.j@$$$", -"$$$$[vi$$$$$$$$$*[%]j/j//qsp/$$$", -"$$$$$$$$$$$$$$$$$$$<']']'9$.,#$$", -"$$$$$$$$$$$$$$$$${:v$$$$$$$$=;!$", -"$7_]$$$#q!$$$$$$$-3=$$$$$$$$$;0(", -"$t0k$$$1bq{$$$$$.uv$$$$$$$$$$$3k", -"!o[8$$#fq=$$$$$$su|$$$$$$$$$$$1;", -"%30hrqr~06hr_qrq%/:(_qrr_q_r;9)w", -"##||_q_si[;hqqqq|7/hhqphhh_hq_h$"};