Author: evgeni Date: 2011-08-10 19:53:17 +0000 (Wed, 10 Aug 2011) New Revision: 12571
Added: packages/trunk/foobillard/debian/foobillard.xpm Modified: packages/trunk/foobillard/debian/ packages/trunk/foobillard/debian/changelog packages/trunk/foobillard/debian/compat packages/trunk/foobillard/debian/control packages/trunk/foobillard/debian/foobillard.desktop packages/trunk/foobillard/debian/foobillard.menu packages/trunk/foobillard/debian/patches/07_superfluous_link_libraries packages/trunk/foobillard/debian/rules Log: merge from ubuntu Property changes on: packages/trunk/foobillard/debian ___________________________________________________________________ Added: svn-bp:origUrl + http://pkg-games.alioth.debian.org/tarballs/foobillard_3.0a.orig.tar.gz Modified: packages/trunk/foobillard/debian/changelog =================================================================== --- packages/trunk/foobillard/debian/changelog 2011-08-08 23:04:21 UTC (rev 12570) +++ packages/trunk/foobillard/debian/changelog 2011-08-10 19:53:17 UTC (rev 12571) @@ -1,3 +1,19 @@ +foobillard (3.0a-5) unstable; urgency=low + + * Team upload. + * Merge from Ubuntu: + - update .desktop file to be freedesktop and GNOME HIG compliant + - debian/control: + - bump build-dependency: debhelper (>= 5) + - debian/compat: + - bumped to 5 + - debian/foobillard.menu: + - added icon + * Adjust debian/patches/07_superfluous_link_libraries to fix linking + with newer toolchain. (LP: #770877) + + -- Evgeni Golov <[email protected]> Wed, 10 Aug 2011 21:09:55 +0200 + foobillard (3.0a-4) unstable; urgency=low * Team upload. @@ -16,6 +32,20 @@ -- Bruno "Fuddl" Kleinert <[email protected]> Mon, 27 Jun 2011 18:00:44 +0200 +foobillard (3.0a-3ubuntu1) hardy; urgency=low + + * Merge from Debian unstable (LP: #162912) remaining changes: + - update .desktop file to be freedesktop and GNOME HIG compliant + - debian/control: + - bump build-dependency: debhelper (>= 5) + - updated Maintainer field + - debian/compat: + - bumped to 5 + * debian/foobillard.menu: + - added icon field + + -- Mario Bonino <[email protected]> Thu, 15 Nov 2007 16:44:31 +0100 + foobillard (3.0a-3) unstable; urgency=low [ Frank Gevaerts ] @@ -57,6 +87,33 @@ -- Frank Gevaerts <[email protected]> Thu, 15 Nov 2007 15:42:12 +0930 +foobillard (3.0a-2ubuntu3) gutsy; urgency=low + + * provided an icon for the menu entry (LP: #143969) + * update .desktop file to be freedesktop and GNOME HIG compliant + + -- Mario Bonino <[email protected]> Sat, 22 Sep 2007 12:43:54 +0200 + +foobillard (3.0a-2ubuntu2) gutsy; urgency=low + + [ Matti Lindell ] + * updated the .desktop file. (LP: #61325) + + [ Lionel Le Folgoc ] + * debian/control: + - adhere to DebianMaintainerField + - Build-Depend on libglu1-mesa-dev | libglu-dev, libgl1-mesa-dev | libgl-dev. + * Bump DH_COMPAT to 5, bump build-dependency: debhelper (>= 5). + * Bump Standards-Version to 3.7.2, no changes. + + -- Lionel Le Folgoc <[email protected]> Thu, 26 Apr 2007 23:48:31 +0200 + +foobillard (3.0a-2ubuntu1) breezy; urgency=low + + * added a .desktop file + + -- Benjamin Montgomery <[email protected]> Sat, 17 Sep 2005 22:25:05 -0500 + foobillard (3.0a-2) unstable; urgency=low * Fixed autobuild Modified: packages/trunk/foobillard/debian/compat =================================================================== --- packages/trunk/foobillard/debian/compat 2011-08-08 23:04:21 UTC (rev 12570) +++ packages/trunk/foobillard/debian/compat 2011-08-10 19:53:17 UTC (rev 12571) @@ -1 +1 @@ -4 +5 Modified: packages/trunk/foobillard/debian/control =================================================================== --- packages/trunk/foobillard/debian/control 2011-08-08 23:04:21 UTC (rev 12570) +++ packages/trunk/foobillard/debian/control 2011-08-10 19:53:17 UTC (rev 12571) @@ -4,7 +4,7 @@ Maintainer: Debian Games Team <[email protected]> Uploaders: Frank Gevaerts <[email protected]> Standards-Version: 3.7.2 -Build-Depends: libfreetype6-dev, libpng3-dev, libsdl1.2-dev, debhelper (>= 4.0), quilt, sharutils, autoconf, automake +Build-Depends: libfreetype6-dev, libpng3-dev, libsdl1.2-dev, debhelper (>= 5), quilt, sharutils, autoconf, automake Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/foobillard/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/foobillard/?op=log Homepage: http://foobillard.sourceforge.net/ Modified: packages/trunk/foobillard/debian/foobillard.desktop =================================================================== --- packages/trunk/foobillard/debian/foobillard.desktop 2011-08-08 23:04:21 UTC (rev 12570) +++ packages/trunk/foobillard/debian/foobillard.desktop 2011-08-10 19:53:17 UTC (rev 12571) @@ -1,6 +1,7 @@ [Desktop Entry] Name=Foobillard -Comment=A 3D billiards game using OpenGL +GenericName=Billiards game +Comment=3D billiards game using OpenGL Exec=foobillard Icon=foobillard Terminal=false Modified: packages/trunk/foobillard/debian/foobillard.menu =================================================================== --- packages/trunk/foobillard/debian/foobillard.menu 2011-08-08 23:04:21 UTC (rev 12570) +++ packages/trunk/foobillard/debian/foobillard.menu 2011-08-10 19:53:17 UTC (rev 12571) @@ -1,2 +1,3 @@ ?package(foobillard):needs="X11" section="Games/Simulation" \ - title="Foobillard" command="/usr/games/foobillard" + title="Foobillard" command="/usr/games/foobillard" \ + icon="/usr/share/pixmaps/foobillard.xpm" Added: packages/trunk/foobillard/debian/foobillard.xpm =================================================================== --- packages/trunk/foobillard/debian/foobillard.xpm (rev 0) +++ packages/trunk/foobillard/debian/foobillard.xpm 2011-08-10 19:53:17 UTC (rev 12571) @@ -0,0 +1,482 @@ +/* XPM */ +static char * foobillard_xpm[] = { +"32 32 447 2", +" c None", +". c #625924", +"+ c #817329", +"@ c #897A2B", +"# c #93822E", +"$ c #9A8E35", +"% c #9F9133", +"& c #151409", +"* c #4B4315", +"= c #887F2C", +"- c #736822", +"; c #484117", +"> c #7B6E23", +", c #706A2A", +"' c #7F732F", +") c #B4A745", +"! c #B6A33B", +"~ c #BAA434", +"{ c #C8B139", +"] c #D1BF3F", +"^ c #C2B43B", +"/ c #26230E", +"( c #B49E2B", +"_ c #BFB43E", +": c #CCB736", +"< c #5B5219", +"[ c #AF9E32", +"} c #AC9B30", +"| c #BAB144", +"1 c #4E4B1F", +"2 c #534A1B", +"3 c #A79537", +"4 c #B6A741", +"5 c #BFB345", +"6 c #C0AA35", +"7 c #CBB435", +"8 c #DAC43B", +"9 c #A19B35", +"0 c #636024", +"a c #B9A42B", +"b c #151408", +"c c #A7952B", +"d c #B3A12D", +"e c #BDAC33", +"f c #141307", +"g c #8D8937", +"h c #655B1E", +"i c #82752E", +"j c #A69332", +"k c #B5A138", +"l c #C4B947", +"m c #CDC044", +"n c #CEB52E", +"o c #E3CD3B", +"p c #7E7826", +"q c #7D7C2F", +"r c #8F8729", +"s c #16160A", +"t c #BCB132", +"u c #C1B02F", +"v c #988E2B", +"w c #101007", +"x c #9F9636", +"y c #5E571F", +"z c #A1903A", +"A c #B3A03C", +"B c #B29E31", +"C c #C3AF39", +"D c #D4CE4D", +"E c #DBCA3B", +"F c #E9D135", +"G c #544E17", +"H c #72712C", +"I c #C6C53F", +"J c #A5A53C", +"K c #E9E840", +"L c #827E24", +"M c #C9C13C", +"N c #9D9D3F", +"O c #D8CB43", +"P c #2A2A13", +"Q c #AB993B", +"R c #B8A53E", +"S c #C0AD3D", +"T c #BFA830", +"U c #89802D", +"V c #888632", +"W c #8D7D1E", +"X c #1D1C09", +"Y c #2D2D14", +"Z c #ADAD3F", +"` c #D7D749", +" . c #6A6A23", +".. c #1B1B0B", +"+. c #A7A63E", +"@. c #D8D34D", +"#. c #736F2B", +"$. c #000000", +"%. c #605621", +"&. c #AA9837", +"*. c #B7A33A", +"=. c #C5B13E", +"-. c #9B8F31", +";. c #423B12", +">. c #494315", +",. c #2F2F14", +"'. c #505016", +"). c #4C4C1F", +"!. c #050502", +"~. c #030301", +"{. c #2E2E11", +"]. c #111109", +"^. c #272710", +"/. c #1F1D08", +"(. c #1B1B0A", +"_. c #A39237", +":. c #AA9734", +"<. c #B5A135", +"[. c #C3AD36", +"}. c #D5C23E", +"|. c #E5D844", +"1. c #F4DB34", +"2. c #9A983B", +"3. c #FFFF53", +"4. c #FFFF62", +"5. c #CDCD6E", +"6. c #232311", +"7. c #E0E05F", +"8. c #88883F", +"9. c #C8C84D", +"0. c #C2C144", +"a. c #585823", +"b. c #6F642A", +"c. c #51491F", +"d. c #625822", +"e. c #A29135", +"f. c #AD9A36", +"g. c #B7A234", +"h. c #C3AC32", +"i. c #D5BB33", +"j. c #EBD73D", +"k. c #FCF84D", +"l. c #9B9A2B", +"m. c #FFFF79", +"n. c #FFFF61", +"o. c #FFFF99", +"p. c #A9A956", +"q. c #AEAE69", +"r. c #727239", +"s. c #B1B138", +"t. c #D8D860", +"u. c #3E3E19", +"v. c #626124", +"w. c #605B21", +"x. c #352F12", +"y. c #4E461B", +"z. c #71652B", +"A. c #4F481F", +"B. c #716526", +"C. c #A39134", +"D. c #AC9833", +"E. c #B7A232", +"F. c #C5AE31", +"G. c #D7BD31", +"H. c #EFD233", +"I. c #E4D939", +"J. c #B5B545", +"K. c #FFFF5D", +"L. c #FFFF92", +"M. c #FFFFA2", +"N. c #F8F8B3", +"O. c #202017", +"P. c #FBFBB7", +"Q. c #868640", +"R. c #9B9B5A", +"S. c #EFEF70", +"T. c #5F5F25", +"U. c #EEE74A", +"V. c #DAC940", +"W. c #29250D", +"X. c #A49131", +"Y. c #665B20", +"Z. c #A39135", +"`. c #786C2B", +" + c #4E461D", +".+ c #86782F", +"++ c #A49234", +"@+ c #A9962F", +"#+ c #B49F2E", +"$+ c #C3AB2D", +"%+ c #D6BB2D", +"&+ c #F0D12E", +"*+ c #B6AA27", +"=+ c #E3E342", +"-+ c #FFFF6F", +";+ c #FFFF90", +">+ c #FFFFC1", +",+ c #FFFFE9", +"'+ c #595952", +")+ c #EAEAB4", +"!+ c #979772", +"~+ c #8D8D5B", +"{+ c #F9F96B", +"]+ c #A09F34", +"^+ c #AEA42F", +"/+ c #B8A32C", +"(+ c #5F5419", +"_+ c #B6A132", +":+ c #6C6125", +"<+ c #7C6F2B", +"[+ c #655A25", +"}+ c #4F471E", +"|+ c #938433", +"1+ c #9B892E", +"2+ c #A3902C", +"3+ c #B39D2B", +"4+ c #C1A829", +"5+ c #D3B828", +"6+ c #E9CA27", +"7+ c #978B1D", +"8+ c #F6F63B", +"9+ c #FFFF54", +"0+ c #FFFF8D", +"a+ c #FFFFD6", +"b+ c #FFFFF8", +"c+ c #7A7A76", +"d+ c #D0D0C1", +"e+ c #B0B081", +"f+ c #888847", +"g+ c #F9F94F", +"h+ c #A19B28", +"i+ c #AB9D2A", +"j+ c #A9982E", +"k+ c #706421", +"l+ c #B8A438", +"m+ c #5B5121", +"n+ c #8A7C30", +"o+ c #867931", +"p+ c #453E1B", +"q+ c #060503", +"r+ c #27230D", +"s+ c #BDAA37", +"t+ c #CAB636", +"u+ c #DBC535", +"v+ c #665C17", +"w+ c #0B0B04", +"x+ c #DADA49", +"y+ c #FFFF72", +"z+ c #FFFFFE", +"A+ c #7D7D7D", +"B+ c #B5B5B0", +"C+ c #CACA75", +"D+ c #86863E", +"E+ c #EDED58", +"F+ c #686720", +"G+ c #F3E33F", +"H+ c #B5A430", +"I+ c #6D621F", +"J+ c #B09D34", +"K+ c #2B260F", +"L+ c #A89638", +"M+ c #9C8B36", +"N+ c #171509", +"O+ c #5E5924", +"P+ c #C4BD4A", +"Q+ c #D2CE4E", +"R+ c #E2E053", +"S+ c #575621", +"T+ c #747224", +"U+ c #858528", +"V+ c #FAFA7E", +"W+ c #FFFFAF", +"X+ c #FFFFDC", +"Y+ c #EDEDE7", +"Z+ c #4C4C4C", +"`+ c #4E4E4D", +" @ c #6B6B59", +".@ c #414129", +"+@ c #6C6C30", +"@@ c #070702", +"#@ c #6F6820", +"$@ c #574F18", +"%@ c #332D0F", +"&@ c #524919", +"*@ c #3B3515", +"=@ c #2C2710", +"-@ c #7D7027", +";@ c #BAA634", +">@ c #C5AE2E", +",@ c #D3BA2B", +"'@ c #756B1C", +")@ c #FEF445", +"!@ c #FFFF57", +"~@ c #FFFF78", +"{@ c #FFFF9C", +"]@ c #FFFFBD", +"^@ c #FFFFF9", +"/@ c #E3E3D5", +"(@ c #2A2A23", +"_@ c #8A7B29", +":@ c #BCA938", +"<@ c #CDBD3E", +"[@ c #BEB23A", +"}@ c #978A25", +"|@ c #FFF843", +"1@ c #FFFF64", +"2@ c #FFFF66", +"3@ c #FFFF82", +"4@ c #FFFFA1", +"5@ c #FFFFF6", +"6@ c #FFFFDD", +"7@ c #BFBF85", +"8@ c #A9993A", +"9@ c #BCA939", +"0@ c #C6AF33", +"a@ c #8F7F24", +"b@ c #C1BD3E", +"c@ c #FEF64D", +"d@ c #FFFA43", +"e@ c #FFFF68", +"f@ c #FFFF58", +"g@ c #FFFFA5", +"h@ c #FFFFE0", +"i@ c #FDFD7D", +"j@ c #1F1F0E", +"k@ c #BBA739", +"l@ c #CBBA40", +"m@ c #6B6624", +"n@ c #DAC632", +"o@ c #F5E23A", +"p@ c #FFFE58", +"q@ c #FFFF36", +"r@ c #FFFFA4", +"s@ c #FFFFB5", +"t@ c #FFFFCA", +"u@ c #FFFF65", +"v@ c #3E3E20", +"w@ c #605625", +"x@ c #B4A23F", +"y@ c #C0B044", +"z@ c #C7B63F", +"A@ c #584E17", +"B@ c #C5B636", +"C@ c #DCD648", +"D@ c #E1CF27", +"E@ c #E2E243", +"F@ c #E4E461", +"G@ c #FDFD8D", +"H@ c #FFFF94", +"I@ c #FFFFAC", +"J@ c #FFFF5F", +"K@ c #3B3B13", +"L@ c #574E22", +"M@ c #81752F", +"N@ c #837529", +"O@ c #81711D", +"P@ c #131005", +"Q@ c #FFFF81", +"R@ c #FFFF93", +"S@ c #1C1C06", +"T@ c #534B23", +"U@ c #5B5221", +"V@ c #544A18", +"W@ c #5C521C", +"X@ c #676126", +"Y@ c #6C6220", +"Z@ c #726317", +"`@ c #7D6E1A", +" # c #8C8124", +".# c #918A2B", +"+# c #9B9B36", +"@# c #FBFB72", +"## c #FFFF71", +"$# c #FFFF7D", +"%# c #DFDF63", +"&# c #010100", +"*# c #796D2F", +"=# c #988731", +"-# c #A29134", +";# c #B5A642", +"># c #BDAC3F", +",# c #BAA42D", +"'# c #C5AD2B", +")# c #DCC435", +"!# c #EDD537", +"~# c #FBF352", +"{# c #FFFA58", +"]# c #FFFF5C", +"^# c #FFFF6B", +"/# c #8B8B41", +"(# c #81742D", +"_# c #A0903C", +":# c #AC9C42", +"<# c #B1A03E", +"[# c #AD9930", +"}# c #B29C2A", +"|# c #C4AD31", +"1# c #D8C23B", +"2# c #E1CA37", +"3# c #F0E54B", +"4# c #FAF25C", +"5# c #FEFA4C", +"6# c #FFFF5B", +"7# c #F5F55A", +"8# c #1F1F10", +"9# c #998A3E", +"0# c #A69644", +"a# c #A7973F", +"b# c #A49233", +"c# c #A6922D", +"d# c #B19C2F", +"e# c #C6B13A", +"f# c #CCB434", +"g# c #DACC44", +"h# c #E4D03D", +"i# c #EDE759", +"j# c #F3EA47", +"k# c #F7F553", +"l# c #71702C", +"m# c #4E4723", +"n# c #9C8D42", +"o# c #9E8F3F", +"p# c #9B8A35", +"q# c #9D8B30", +"r# c #A69331", +"s# c #B39F36", +"t# c #BEA939", +"u# c #C4AD34", +"v# c #D2C747", +"w# c #D9C53C", +"x# c #E1D850", +"y# c #E6D945", +"z# c #807C2A", +"A# c #020201", +"B# c #4F4823", +"C# c #736931", +"D# c #72672C", +"E# c #726728", +"F# c #776A27", +"G# c #7D7028", +"H# c #88792D", +"I# c #897A29", +"J# c #94862F", +"K# c #9A8F33", +"L# c #9D9235", +"M# c #88802E", +"N# c #373312", +" ", +" ", +" ", +" . + @ # $ % & * = - ; > , ", +" ' ) ! ~ { ] ^ / ( _ : < [ } | 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 ` ...+.@.#.$. ", +" %.&.*.=.-.;.>.,.'.).!.~.$.{.].^./.(. ", +" _.:.<.[.}.|.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.`. + ", +" .+++@+#+$+%+&+*+=+-+;+>+,+'+)+!+~+{+]+^+/+(+_+:+<+[+}+ ", +" |+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+`+ @.@+@@@#@$@%@&@$.*@=@$. ", +" -@;@>@,@'@)@!@~@{@]@^@/@(@$.$.$. $.$.$. $. ", +" _@:@<@[@}@|@1@2@3@4@5@6@7@ ", +" 8@9@0@a@b@c@d@e@f@g@h@h@i@j@ ", +" f.k@l@m@n@o@p@q@1@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@$.$.$.$.$.5.Q@R@e@S@ ", +" T@U@V@W@X@Y@Z@`@ #.#+#@###$#%#&# ", +" *#=#-#;#>#,#'#)#!#~#{#]#u@^#/#$. ", +" (#_#:#<#[#}#|#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#$. ", +" $.$.$.$.$.$.$.$.$.$.$.$. ", +" ", +" "}; Modified: packages/trunk/foobillard/debian/patches/07_superfluous_link_libraries =================================================================== --- packages/trunk/foobillard/debian/patches/07_superfluous_link_libraries 2011-08-08 23:04:21 UTC (rev 12570) +++ packages/trunk/foobillard/debian/patches/07_superfluous_link_libraries 2011-08-10 19:53:17 UTC (rev 12571) @@ -2,11 +2,10 @@ =================================================================== --- foobillard-3.0a.orig/src/Makefile.am 2006-10-12 16:45:59.000000000 +0200 +++ foobillard-3.0a/src/Makefile.am 2006-10-12 16:46:05.000000000 +0200 -@@ -85,4 +85,6 @@ +@@ -84,5 +84,4 @@ #LIBS = -L$(LIBDIR) -lglut -lGLU -lGL -lXext -lXaw -lm -lXi -lpng -lz - AM_LDFLAGS = ${all_libraries} `freetype-config --libs` ${SDL_LIBS} ${GLUT_LIBS} + #LIBS = -L$(LIBDIR) -lglut -lGLU -lGL -lXext -lXaw -lm -lXi -lpng -lz +-AM_LDFLAGS = ${all_libraries} `freetype-config --libs` ${SDL_LIBS} ${GLUT_LIBS} #LDADD = ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS} -lGL -lGLU -lXaw -lm -lXi -lpng -lz -L/home/floh/nvsdk/OpenGL/lib/ -lnvparse -LDADD = ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS} -lGL -lGLU -lXaw -lm -lXi -lpng -lz -+#LDADD = ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS} -lGL -lGLU -lXaw -lm -lXi -lpng -lz -+#LDADD = ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS} -lm -lGL -lGLU -lpng -+LDADD = -lm -lGL -lGLU -lpng ++LIBS = ${all_libraries} `freetype-config --libs` ${SDL_LIBS} ${GLUT_LIBS} -lm -lGL -lGLU -lpng Modified: packages/trunk/foobillard/debian/rules =================================================================== --- packages/trunk/foobillard/debian/rules 2011-08-08 23:04:21 UTC (rev 12570) +++ packages/trunk/foobillard/debian/rules 2011-08-10 19:53:17 UTC (rev 12571) @@ -57,6 +57,7 @@ dh_installdirs dh_install -a debian/foobillard.png usr/share/icons dh_install -a debian/foobillard.desktop usr/share/applications + dh_install -a debian/foobillard.xpm usr/share/pixmaps $(MAKE) install DESTDIR=$(CURDIR)/debian/foobillard _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
