diff -u criticalmass-1.0.0/debian/criticalmass-data.dirs criticalmass-1.0.0/debian/criticalmass-data.dirs --- criticalmass-1.0.0/debian/criticalmass-data.dirs +++ criticalmass-1.0.0/debian/criticalmass-data.dirs @@ -2,0 +3,2 @@ +usr/share/pixmaps +usr/share/applications diff -u criticalmass-1.0.0/debian/control criticalmass-1.0.0/debian/control --- criticalmass-1.0.0/debian/control +++ criticalmass-1.0.0/debian/control @@ -1,7 +1,8 @@ Source: criticalmass Section: games Priority: optional -Maintainer: Daniel Burrows +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Daniel Burrows Build-Depends: debhelper (>= 7.1), libgl1-mesa-dev | libgl-dev, libsdl-image1.2-dev (>= 1.2.2), libsdl-mixer1.2-dev, libsdl1.2-dev, zlib1g-dev, g++ (>= 3:3.2.2), autotools-dev Standards-Version: 3.8.4 Homepage: http://freshmeat.net/projects/criticalmass diff -u criticalmass-1.0.0/debian/criticalmass-data.install criticalmass-1.0.0/debian/criticalmass-data.install --- criticalmass-1.0.0/debian/criticalmass-data.install +++ criticalmass-1.0.0/debian/criticalmass-data.install @@ -1,0 +2,3 @@ +critter.png usr/share/pixmaps +debian/critter.xpm usr/share/pixmaps +debian/criticalmass.desktop usr/share/applications diff -u criticalmass-1.0.0/debian/changelog criticalmass-1.0.0/debian/changelog --- criticalmass-1.0.0/debian/changelog +++ criticalmass-1.0.0/debian/changelog @@ -1,7 +1,15 @@ +criticalmass (1:1.0.0-1.4ubuntu1) maverick; urgency=low + + * Merge from debian unstable (LP: #595020). Remaining changes: + - Added a .desktop file and updated menu file + - Installed provided png file, and generated xpm icon + + -- Angel Abad Sat, 05 Jun 2010 19:25:31 +0100 + criticalmass (1:1.0.0-1.4) unstable; urgency=low * Non-maintainer upload. - * debian/control: Build-Depends + * debian/control: Build-Depends - replace xlibmesa-dev to libgl1-mesa-dev (Closes: #581825) -- tony mancill Sun, 16 May 2010 13:30:07 -0700 @@ -34,6 +42,19 @@ -- Jari Aalto Sun, 02 May 2010 21:49:33 +0300 +criticalmass (1:1.0.0-1.2ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, (LP: #229260) remaining changes: + - Added a .desktop file and updated menu file + - Installed provided png file, and generated xpm icon + + debian/control + - Set Ubuntu Maintainer + - Add Homepage field + + debian/rules + - Move DH_COMPAT to debian/compat + + -- Gabriele Postorino Sun, 11 May 2008 20:50:17 +0200 + criticalmass (1:1.0.0-1.2) unstable; urgency=low * Non-maintainer upload. @@ -42,6 +63,18 @@ -- Marc 'HE' Brockschmidt Sun, 16 Mar 2008 17:11:36 +0100 +criticalmass (1:1.0.0-1.1ubuntu1) hardy; urgency=low + + * Merge with Debian. Retained Ubuntu changes: + - Added a .desktop file and updated menu file + - Installed provided png file, and generated xpm icon + * Set Ubuntu Maintainer + * Add Homepage to package description + * Updated .desktop file to match current standards + * Move DH_COMPAT to debian/compat + + -- Emmet Hikory Sun, 28 Oct 2007 14:59:16 +0900 + criticalmass (1:1.0.0-1.1) unstable; urgency=medium * Non-maintainer upload. @@ -50,6 +83,13 @@ -- Luk Claes Sat, 01 Sep 2007 14:55:46 +0000 +criticalmass (1:1.0.0-1ubuntu1) feisty; urgency=low + + * Added a .desktop file and updated menu file (closes Ubuntu: #60291) + * Installed provided png icon, and generated xpm icon + + -- Emmet Hikory Wed, 17 Jan 2007 20:12:27 +0900 + criticalmass (1:1.0.0-1) unstable; urgency=low * New upstream release @@ -218 +257,0 @@ - diff -u criticalmass-1.0.0/debian/menu criticalmass-1.0.0/debian/menu --- criticalmass-1.0.0/debian/menu +++ criticalmass-1.0.0/debian/menu @@ -1,2 +1,3 @@ -?package(criticalmass):needs="X11" section="Games/Adventure"\ - title="Critical Mass" command="/usr/games/critter" +?package(criticalmass):needs="X11" section="Games/Arcade"\ + title="Critical Mass" command="/usr/games/critter" \ + icon="/usr/share/pixmaps/critter.xpm" only in patch2: unchanged: --- criticalmass-1.0.0.orig/debian/criticalmass.desktop +++ criticalmass-1.0.0/debian/criticalmass.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Criticalmass +Comment=Play a shoot-em-up a la galaxian +Exec=critter +Icon=critter +StartupNotify=false +Terminal=false +Type=Application +Categories=Game;ArcadeGame; only in patch2: unchanged: --- criticalmass-1.0.0.orig/debian/critter.xpm +++ criticalmass-1.0.0/debian/critter.xpm @@ -0,0 +1,321 @@ +/* XPM */ +static char * critter_xpm[] = { +"32 23 295 2", +" c None", +". c #000000", +"+ c #83C3FE", +"@ c #8BC7FE", +"# c #A2D2FE", +"$ c #B4DAFC", +"% c #AACEEE", +"& c #399BF7", +"* c #3FA1FC", +"= c #3EA1FD", +"- c #3B9FFD", +"; c #3997EE", +"> c #236BAF", +", c #88C6FE", +"' c #A4D3FE", +") c #ECF6FE", +"! c #B8DDFE", +"~ c #9BBCDA", +"{ c #3CA0FC", +"] c #40A2FD", +"^ c #3DA0FD", +"/ c #2F7CC3", +"( c #8AC5FC", +"_ c #F6FAFE", +": c #F8FBFE", +"< c #B9DDFE", +"[ c #A6CBEC", +"} c #2A669E", +"| c #01488B", +"1 c #01488A", +"2 c #014A8E", +"3 c #014A8D", +"4 c #1869B5", +"5 c #42A3FD", +"6 c #3CA0FD", +"7 c #246098", +"8 c #F2F6F9", +"9 c #F8FCFE", +"0 c #7C9FC0", +"a c #002E58", +"b c #01498C", +"c c #014C91", +"d c #003362", +"e c #3FA1FD", +"f c #20507C", +"g c #6CB7FD", +"h c #70B9FD", +"i c #75BBFB", +"j c #5488B8", +"k c #5C5E5F", +"l c #F9FCFE", +"m c #9ABCDC", +"n c #072B4B", +"o c #002241", +"p c #01407C", +"q c #00407A", +"r c #00407B", +"s c #014788", +"t c #013D76", +"u c #134675", +"v c #3896EC", +"w c #49A7FD", +"x c #276095", +"y c #020407", +"z c #051320", +"A c #0C3962", +"B c #399CF8", +"C c #4B90D0", +"D c #3B70A2", +"E c #74BBFD", +"F c #6FB8FD", +"G c #71B9FD", +"H c #78BDFD", +"I c #73B7F6", +"J c #68A1D5", +"K c #BEC1C4", +"L c #EAEEF1", +"M c #BBDEFE", +"N c #3F6486", +"O c #00213F", +"P c #003E77", +"Q c #00417C", +"R c #003F79", +"S c #01417D", +"T c #014C94", +"U c #002343", +"V c #124677", +"W c #48A6FD", +"X c #134370", +"Y c #2175C4", +"Z c #2695FD", +"` c #399EFD", +" . c #57ADFD", +".. c #5EADF8", +"+. c #396C9C", +"@. c #6DB7FD", +"#. c #78BCFC", +"$. c #76BAF9", +"%. c #3D6182", +"&. c #BAC4CD", +"*. c #6288AC", +"=. c #062A4B", +"-. c #002445", +";. c #002240", +">. c #003F78", +",. c #003F7A", +"'. c #003567", +"). c #01498D", +"!. c #002648", +"~. c #388FE1", +"{. c #275E92", +"]. c #12487B", +"^. c #2893F7", +"/. c #2393FD", +"(. c #49A6FD", +"_. c #5FB0FD", +":. c #386B9B", +"<. c #6AB4F9", +"[. c #6FB8FC", +"}. c #79BEFD", +"|. c #619ED7", +"1. c #002344", +"2. c #002546", +"3. c #001F3B", +"4. c #003669", +"5. c #002444", +"6. c #0F4A81", +"7. c #2B97FD", +"8. c #2595FD", +"9. c #2896FD", +"0. c #2796FD", +"a. c #3A9FFD", +"b. c #61B1FD", +"c. c #2E577E", +"d. c #73BAFB", +"e. c #7BBFFD", +"f. c #75BBFD", +"g. c #002342", +"h. c #001F3C", +"i. c #014687", +"j. c #013E78", +"k. c #094883", +"l. c #1B90FD", +"m. c #2494FD", +"n. c #2997FD", +"o. c #399FFD", +"p. c #347EC3", +"q. c #050A0E", +"r. c #6DB0EE", +"s. c #7BBEFD", +"t. c #72BAFD", +"u. c #00203D", +"v. c #002B52", +"w. c #003C73", +"x. c #014280", +"y. c #074782", +"z. c #188EFD", +"A. c #2A97FD", +"B. c #123659", +"C. c #65A2DC", +"D. c #74BAFB", +"E. c #7ABEFD", +"F. c #75BCFD", +"G. c #6AB6FD", +"H. c #00213E", +"I. c #00315F", +"J. c #1C2E5A", +"K. c #084680", +"L. c #1A8FFD", +"M. c #1E91FD", +"N. c #3997EF", +"O. c #153D64", +"P. c #5D8FBD", +"Q. c #77BCFD", +"R. c #69B6FD", +"S. c #611223", +"T. c #232649", +"U. c #00315E", +"V. c #A11120", +"W. c #00407C", +"X. c #002A50", +"Y. c #198FFD", +"Z. c #2594FD", +"`. c #173857", +" + c #5287B8", +".+ c #6BB5F9", +"++ c #6BB7FD", +"@+ c #0B345A", +"#+ c #C80000", +"$+ c #461F3B", +"%+ c #422243", +"&+ c #E50306", +"*+ c #19315F", +"=+ c #003260", +"-+ c #0A5499", +";+ c #178EFD", +">+ c #1C90FD", +",+ c #1988F1", +"'+ c #2A84D9", +")+ c #4778A5", +"!+ c #5A99D4", +"~+ c #6BB6FD", +"{+ c #4886BF", +"]+ c #3C172B", +"^+ c #CE0000", +"/+ c #48203E", +"(+ c #522141", +"_+ c #FA0000", +":+ c #A91526", +"<+ c #003463", +"[+ c #168EFD", +"}+ c #1D90FD", +"|+ c #06325B", +"1+ c #131F2B", +"2+ c #5996D0", +"3+ c #67AFF2", +"4+ c #4885BE", +"5+ c #730E1A", +"6+ c #BC050A", +"7+ c #AA0D18", +"8+ c #C20A13", +"9+ c #E00C13", +"0+ c #A02438", +"a+ c #0A3E6F", +"b+ c #003E79", +"c+ c #014B90", +"d+ c #115EA7", +"e+ c #051E35", +"f+ c #233C52", +"g+ c #4B7FAF", +"h+ c #4886C0", +"i+ c #213A50", +"j+ c #445666", +"k+ c #193D5E", +"l+ c #002F5A", +"m+ c #482343", +"n+ c #78253F", +"o+ c #01529D", +"p+ c #568DC1", +"q+ c #A0B4C7", +"r+ c #708FAB", +"s+ c #2666A2", +"t+ c #167AD8", +"u+ c #12528E", +"v+ c #17334E", +"w+ c #48545F", +"x+ c #9B9B9B", +"y+ c #A2A9B0", +"z+ c #003160", +"A+ c #A81828", +"B+ c #EB2C33", +"C+ c #4762B3", +"D+ c #D7E7F5", +"E+ c #FFFFFF", +"F+ c #BED7ED", +"G+ c #1569B8", +"H+ c #031628", +"I+ c #001A31", +"J+ c #9C9C9C", +"K+ c #C1C1C1", +"L+ c #625D77", +"M+ c #CD252F", +"N+ c #FF5A5A", +"O+ c #BBAFCF", +"P+ c #659DD0", +"Q+ c #014585", +"R+ c #000E1B", +"S+ c #566675", +"T+ c #C4C4C4", +"U+ c #A6A3B4", +"V+ c #443A65", +"W+ c #444973", +"X+ c #446691", +"Y+ c #F5F9FC", +"Z+ c #015BAF", +"`+ c #001E39", +" @ c #304456", +".@ c #B0B4B7", +"+@ c #5695CF", +"@@ c #013E77", +"#@ c #001B34", +"$@ c #8B98A4", +"%@ c #00417D", +"&@ c #4C81B2", +"*@ c #1A70C1", +"=@ c #001324", +"-@ c #014F99", +";@ c #0157A7", +">@ c #0156A6", +",@ c #0158A9", +"'@ c #013C73", +")@ c #012F5B", +"!@ c #002649", +"~@ c #00203E", +"{@ c #000A13", +". . . . . . . + @ # $ % . . . . . . . . & * = - ; > . . . . . . ", +". . . . . . . , ' ) ! ! ~ . . . . . . . { = ] ] ^ / . . . . . . ", +". . . . . . . ( _ : < < [ } | 1 1 2 3 4 - = = 5 6 7 . . . . . . ", +". . . . . . . 8 9 9 < < 0 a b 1 1 1 c d = = e 5 5 f . . . . . . ", +". . g h i j . k l l < m n o p q r r s t u v ] w x y z A B C D . ", +"E F G G H I J . K L M N o O P Q R R S T U V ] W . X Y Z ` ...+.", +"@.h h E H H #.$.%.&.*.=.-.;.P >.,.,.'.).-.!.~.{.].^./.Z - (._.:.", +"<.[.E E H H }.}.H |.1.1.2.3.q Q R R 4.2 ;.5.6.7.8.9.0.0.a.a.b.c.", +". d.E E e.e.H H f.g -.-.g.h.a S r ,.4.i.j.-.k.l.m.Z n.9.o.] p.q.", +". r.E E H s.H t.g g -.-.g.u.v.q r w.4.4.x.2.y.l.z.Z A.0.a.a.B.. ", +". . C.D.E.e.F.g G.G.U U H.u.-.a I.J.4.4.S -.K.L.z.M.Z 7.N.O.. . ", +". . . P.Q.E g R.g g g.U u.u.S.T.U.V.4.4.W.X.y.z.Y.Y.Z.A.`.. . . ", +". . . . +.+g ++g g @+5.u.u.#+$+%+&+*+4.r =+-+Y.;+>+,+'+. . . . ", +". . . . . )+!+g ~+~+{+g.u.]+^+/+(+_+:+4.W.<+Y.[+}+}+|+. . . . . ", +". . . . . . 1+2+3+g 4+u.u.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+E+E+P+Q+. . . . . . . . . . ", +". . . . . . . . . . . R+S+T+U+V+W+X+E+Y+Z+`+. . . . . . . . . . ", +". . . . . . . . . . . . @.@P Q Q Q E++@@@. . . . . . . . . . . ", +". . . . . . . . . . . . #@$@R %@W.W.&@*@=@. . . . . . . . . . . ", +". . . . . . . . . . . . . -@;@>@;@;@,@s . . . . . . . . . . . . ", +". . . . . . . . . . . . . @@'@)@!@o ~@{@. . . . . . . . . . . . "};