diff options
| -rw-r--r-- | Makefile | 17 | ||||
| -rw-r--r-- | media/openttd.32.xpm | 295 | ||||
| -rw-r--r-- | os/debian/README.Debian | 15 | ||||
| -rw-r--r-- | os/debian/changelog | 37 | ||||
| -rw-r--r-- | os/debian/control | 3 | ||||
| -rw-r--r-- | os/debian/docs | 1 | ||||
| -rw-r--r-- | os/debian/menu | 2 | ||||
| -rw-r--r-- | os/debian/rules | 2 |
8 files changed, 360 insertions, 12 deletions
@@ -83,8 +83,10 @@ # PREFIX: Normally /usr/local # BINARY_DIR: The location of the binary, normally games. (Will be prefixed # with $PREFIX) -# DATA_DIR: The location of the data (lang, data and gm), normally -# share/games/openttd. (Will be prefixed with $PREFIX) +# DATA_DIR: The location of the data (lang, data, gm and scenario), normally +# share/games/openttd. (Will be prefixed with $PREFIX) Note that scenarios +# are only put here if USE_HOMEDIR is true, otherwise they are placed in +# PERSONAL_DIR/scenario # PERSONAL_DIR: The directory where openttd.cfg and the save folder will be # stored. You cannot use ~ here, define USE_HOMEDIR for that. # USE_HOMEDIR: If this variable is set, PERSONAL_DIR will be prefixed with @@ -954,13 +956,22 @@ endif $(DATA_DIR_INSTALL)/data \ $(DATA_DIR_INSTALL)/gm \ $(BINARY_DIR_INSTALL) - mkdir -p $(PERSONAL_DIR)/scenario +ifndef USE_HOMEDIR + mkdir -p $(PERSONAL_DIR)/scenario +else + mkdir -p $(DATA_DIR_INSTALL)/scenario +endif install $(TTD) $(BINARY_DIR_INSTALL) install -m 644 lang/*.lng $(DATA_DIR_INSTALL)/lang install -m 644 data/*.grf $(DATA_DIR_INSTALL)/data install -m 644 data/opntitle.dat $(DATA_DIR_INSTALL)/data install -m 644 media/openttd.64.png $(DATA_DIR_INSTALL) + install -m 644 media/openttd.32.xpm $(DATA_DIR_INSTALL) +ifndef USE_HOMEDIR cp scenario/* $(PERSONAL_DIR)/scenario/ +else + cp scenario/* $(DATA_DIR_INSTALL)/scenario/ +endif else #MorphOS install: $(error make install is not supported on MorphOS) diff --git a/media/openttd.32.xpm b/media/openttd.32.xpm new file mode 100644 index 000000000..9cebcf89e --- /dev/null +++ b/media/openttd.32.xpm @@ -0,0 +1,295 @@ +/* XPM */ +static char *openttd.32[] = { +/* columns rows colors chars-per-pixel */ +"32 32 257 2", +" c #000000", +". c #00000A", +"X c #03090D", +"o c #000017", +"O c #00001C", +"+ c #060D12", +"@ c #060C1C", +"# c #0C131B", +"$ c #0A1117", +"% c #15031F", +"& c #1D1B18", +"* c #0D0024", +"= c #070022", +"- c #0C1827", +"; c #150223", +": c #180324", +"> c #1B0C22", +", c #19002A", +"< c #151825", +"1 c #1A1E34", +"2 c #1A242C", +"3 c #1E2327", +"4 c #1A2630", +"5 c #201825", +"6 c #201427", +"7 c #21262C", +"8 c #24292D", +"9 c #28292B", +"0 c #232C33", +"q c #2C2631", +"w c #3B2C2F", +"e c #352B30", +"r c #37392D", +"t c #313231", +"y c #353C31", +"u c #383532", +"i c #351C43", +"p c #383D42", +"a c #294335", +"s c #2A4C36", +"d c #2C5436", +"f c #2F5935", +"g c #354031", +"h c #384533", +"j c #3B542D", +"k c #315F33", +"l c #326B2E", +"z c #30642F", +"x c #3A762D", +"c c #3B7B2D", +"v c #36712E", +"b c #3E4042", +"n c #432D2D", +"m c #4B312B", +"M c #52352B", +"N c #6B3B29", +"B c #763D21", +"V c #4F335D", +"C c #405C32", +"Z c #5A402A", +"A c #5F4435", +"S c #456B33", +"D c #4D6A3F", +"F c #487434", +"G c #4B7D33", +"H c #537D3F", +"J c #7D401F", +"K c #684527", +"L c #634734", +"P c #7D502B", +"I c #72583A", +"U c #434241", +"Y c #4B4640", +"T c #43484F", +"R c #424C56", +"E c #434D59", +"W c #49535D", +"Q c #46505B", +"! c #544A40", +"~ c #564C59", +"^ c #4C5661", +"/ c #555D65", +"( c #5A4763", +") c #55606B", +"_ c #7F6549", +"` c #63696F", +"' c #6E7377", +"] c #7A6F62", +"[ c #7E7162", +"{ c #7A7C7B", +"} c #3E822D", +"| c #40862D", +" . c #4E8334", +".. c #518B35", +"X. c #508735", +"o. c #5CAB35", +"O. c #5EB335", +"+. c #61BB36", +"@. c #62C435", +"#. c #65CC34", +"$. c #69CF37", +"%. c #66D134", +"&. c #68D532", +"*. c #6BDB35", +"=. c #6EE236", +"-. c #71EA37", +";. c #833C03", +":. c #8A451C", +">. c #83421E", +",. c #944E1B", +"<. c #9A551A", +"1. c #8F5720", +"2. c #835834", +"3. c #995922", +"4. c #8C643C", +"5. c #9B6B3A", +"6. c #AC5306", +"7. c #BE4B00", +"8. c #BA5503", +"9. c #B15D16", +"0. c #A35A1B", +"q. c #BE661D", +"w. c #AE6324", +"e. c #A5743F", +"r. c #B36624", +"t. c #B76E31", +"y. c #BA773B", +"u. c #8A6643", +"i. c #936E47", +"p. c #9A754D", +"a. c #9C7552", +"s. c #907D6C", +"d. c #A67747", +"f. c #A77D50", +"g. c #B27D43", +"h. c #C05900", +"j. c #CD660D", +"k. c #CC6409", +"l. c #DB690A", +"z. c #D96706", +"x. c #D16E18", +"c. c #C16B23", +"v. c #CA762B", +"b. c #D87E30", +"n. c #CB792E", +"m. c #E36E0A", +"M. c #EA6D03", +"N. c #EC7105", +"B. c #F76F00", +"V. c #FE6F00", +"C. c #F37503", +"Z. c #FE7500", +"A. c #FE7A00", +"S. c #FD7C0C", +"D. c #F4790E", +"F. c #FE7E11", +"G. c #C27E42", +"H. c #9D8065", +"J. c #9A8570", +"K. c #BD834E", +"L. c #B5814B", +"P. c #B28452", +"I. c #BF8C56", +"U. c #BE8E63", +"Y. c #B79779", +"T. c #D5863F", +"R. c #FF8209", +"E. c #FE8215", +"W. c #FC821B", +"Q. c #EE8934", +"!. c #FC8623", +"~. c #FF8A23", +"^. c #FA8A2C", +"/. c #FA8728", +"(. c #F98E33", +"). c #F7953E", +"_. c #FC9234", +"`. c #F9933B", +"'. c #FF9B3D", +"]. c #C48B52", +"[. c #CD9456", +"{. c #C79156", +"}. c #D38D44", +"|. c #DA9D5B", +" X c #D39858", +".X c #C48A4A", +"XX c #C99561", +"oX c #C29D7A", +"OX c #C19C76", +"+X c #DEA15F", +"@X c #E18D43", +"#X c #EC9542", +"$X c #E09C52", +"%X c #F59741", +"&X c #F69945", +"*X c #F59D4A", +"=X c #FB9940", +"-X c #F89D49", +";X c #E3A25C", +":X c #EBA55A", +">X c #FFA047", +",X c #FFA74B", +"<X c #F4A353", +"1X c #FFAC55", +"2X c #FAAE5E", +"3X c #F5A757", +"4X c #FEB15D", +"5X c #F2AD62", +"6X c #FCB464", +"7X c #FFB866", +"8X c #FFBA68", +"9X c #948C81", +"0X c #969694", +"qX c #84888A", +"wX c #9DA2A4", +"eX c #A6998B", +"rX c #A69F97", +"tX c #B29B85", +"yX c #A7A29B", +"uX c #B8AB9D", +"iX c #BCB4AC", +"pX c #B9B7B2", +"aX c #BFC1BE", +"sX c #BEC6CA", +"dX c #BBCBD6", +"fX c #C2AB94", +"gX c #C6AC92", +"hX c #C8BCB0", +"jX c #C9C0B5", +"kX c #C1C1BE", +"lX c #C3C9CA", +"zX c #C9C6C1", +"xX c #CCCECC", +"cX c #C5C8C6", +"vX c #C6CED2", +"bX c #CFD1CF", +"nX c #CAD0D1", +"mX c #D2D1CC", +"MX c #DDD7CF", +"NX c #D3D9DC", +"BX c #DCD9D1", +"VX c #DCDDDB", +"CX c #D9D7D3", +"ZX c #D9E8F2", +"AX c #E3DED6", +"SX c #E3E2DC", +"DX c #EBECE9", +"FX c #E5EDF1", +"GX c #EDF0EE", +"HX c #ECF3F5", +"JX c #EEF7FA", +"KX c #F2F2EE", +"LX c #F3F4F1", +"PX c #F4FAFB", +"IX c #FEFEFE", +"UX c #F6F9F7", +"YX c None", +/* pixels */ +"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXT 8 YXYXYXYXYXYXYXYXYXYXYXYXYXYXYX", +"YXYXYXYXYXYXYXYXYXYXYXYXYXYXE ! u - YXYXYXYXYXYXYXYXYXYXYXYXYXYX", +"YXYXYXYXYXYXYXYXYXYXYXYXYXb ! 5XI.t # YXYXYXYXYXYXYXYXYXYXYXYXYX", +"YXYXYXYXYXYXYXYXYXYXYXYXR ! ;X8X6XP.8 # YXYXYXYXYXYXYXYXYXYXYXYX", +"YXYXYXYXYXYXYXYXYXYXYXR A ;X7X6X6X8XP.8 # YXYXYXYXYXYXYXYXYXYXYX", +"YXYXYXYXYXYXYXYXYXYXR Y +X6X+Xg..X5X8Xf.7 # YXYXYXYXYXYXYXYXYXYX", +"YXYXYXYXYXYXYXYXYXE Y |.6X8Xd.qX0X|.6X8Xf.7 # YXYXYXYXYXYXYXYXYX", +"YXYXYXYXYXYXYXYXQ C |.7X6X5X5.xXSX+X6X2X8Xa.7 $ YXYXYXYXYXYXYXYX", +"YXYXYXYXYXYXYXW Y X8X:Xe._ ] VXVXP.5.u.:X8Xa.2 $ YXYXYXYXYXYXYX", +"YXYXYXYXYXYX^ U [.8X:XI 0XVXPXGXLXlXyXlXXX4X4Xi.2 $ YXYXYXYXYXYX", +"YXYXYXYXYX^ U [.7X6X4.wXIXLXmXDXKXIXUXHXY.1X<X1Xu.7 $ YXYXYXYXYX", +"YXYXYXYX/ p {.6X5X$X[ GXPXgXd.bXMXeXHXIXfX#X-X-X,X2.2 $ YXYXYXYX", +"YXYXYX( p ].6X5X2X}.9XUXUXgX,.lXBXn.tXIXmXT.'.%X`.'.2.2 + YXYXYX", +"YXYX) C K.6X3X<X<X#XJ.PXKXDXrXVXmXn.c.iXuX@X_.(.(._._.2.2 X YXYX", +"YX` U L.1X<X*X*X*X-Xy.dXIXKXUXKXDXuXa.w.^.(.(.^.^././.~.P 2 & YX", +"' p d.,X*X&X&X%X%X=X'.n.kXJXIXKXHXPXHXpXt.W.!.W.W.E.F.E.R.K 2 YX", +") 0 A &X=X).`.`.`.Q.r.<.c.U.hXKXKXIXKXIXlXx.E.S.S.Z.A.A.j.r < YX", +"YXYX- A (._.(.(._.q.{ lXK.R.9.nXSXiXKXKXPXU.Z.Z.Z.Z.A.j.q = YXYX", +"YXYX~ a L ~.~./.~.l.yXIXzXl.8.lXMX8.Y.PXIXfXB.Z.Z.A.j.t c y o YX", +"YX( H &.f N E.E.S.M.s.JXIXfX;.cXMX7.u.JXPXOXZ.Z.A.l.e } =.O.g ; ", +"V D *.=.&.f N A.A.V.5.FXIXPXsXSXSXs.aXIXNXb.Z.A.l.w } *.*.=.C % ", +"q u o.=.*.&.f B A.Z.0.ZXhXbXIXKXKXIXIXNX].Z.A.m.w c *.*.*.S % YX", +"YX. e o.=.*.%.d B A.k.eX}.k.Y.DXDXjXoXv.Z.A.m.w x &.*.=.S % YXYX", +"YXYXO t o.=.*.%.s J A.Z.A.Z.8.vXMXx.Z.Z.A.M.w x &.*.=.F % YXYXYX", +"YXYXYXO t o.=.=.%.s >.A.Z.A.6.dXNXm.Z.A.N.n v &.*.=.F : YXYXYXYX", +"YXYXYXYXO y +.=.*.#.s >.A.A.z.K.XXD.A.N.m l &.*.=.G > YXYXYXYXYX", +"YXYXYXYXYX= y +.=.*.@.s :.A.A.Z.Z.A.C.m l &.*.-. .> YXYXYXYXYXYX", +"YXYXYXYXYXYX* y +.=.=.@.s ,.A.Z.A.C.M z &.*.=.X.> YXYXYXYXYXYXYX", +"YXYXYXYXYXYXYX* g @.*.-.G 4 <.A.C.Z - j $.-.X.> YXYXYXYXYXYXYXYX", +"YXYXYXYXYXYXYXYX; h $...< @ 0 <.K - YX, C X.5 YXYXYXYXYXYXYXYX", +"YXYXYXYXYXYXYXYXYX: y 9 YX3 0 2 YXYX6 6 YXYXYXYXYXYXYXYXYX", +"YXYXYXYXYXYXYXYXYXYX. YXYXYX YXYXYXYXYXYXYXYXYXYXYXYXYXYXYX" +}; diff --git a/os/debian/README.Debian b/os/debian/README.Debian index 489c82deb..f26d1b920 100644 --- a/os/debian/README.Debian +++ b/os/debian/README.Debian @@ -7,13 +7,22 @@ You should copy the data files from the original TTD into the data directory -Music For in game music (optional), you should copy all files in the data/gm - folder of you ttd installation to /usr/share/games/openttd/gm. You + folder of your ttd installation to /usr/share/games/openttd/gm. You should also install timdity and a soundfont (freepats is packaged in debian and works out of the box). Don't forget to use -m extmidi if you want music, and if you have problems, remember that not all audio devices support multiple audiostreams (music and sound), so you might have to use software - mixing. AC97 codec cannot do hardware mixing, for example. + mixing. My VIA AC97 device cannot do hardware mixing, for example. - -- Matthijs Kooijman <m.kooijman@student.utwente.nl>, Wed, 15 Sep 2004 00:24:01 +0200 +-Scenarios + There are a few scenarios included in this release. When you start openttd + it will look for scenarios in ~/.openttd/scenario, while the premade + scenarios are in /usr/share/games/openttd/data/scenario. You have two + options to use the scenarios. + * Navigate to /usr/share/games/openttd/data/scenario within openttd. + * Copy scenarios from /usr/share/games/openttd/data/scenario to + ~/.openttd/scenario. We are looking into a better solution for this. + + -- Matthijs Kooijman <m.kooijman@student.utwente.nl>, Tue, 25 Jan 2004 14:11:01 +0200 diff --git a/os/debian/changelog b/os/debian/changelog index 9161cf5ad..1d2474ed9 100644 --- a/os/debian/changelog +++ b/os/debian/changelog @@ -1,6 +1,39 @@ -openttd (0.3.4.1-1) unstable; urgency=low +openttd (0.4.0.1-2) unstable; urgency=low + + * Added Suggests: timidity, freepats + + -- Matthijs Kooijman <m.kooijman@student.utwente.nl> Fri, 27 May 2005 02:19:24 +0200 + +openttd (0.4.0.1-1) unstable; urgency=low + + * New upstream release + + -- Matthijs Kooijman <matthijs@katherina.student.utwente.nl> Mon, 23 May 2005 13:04:24 +0200 + +openttd (0.4.0-1) unstable; urgency=low + + * New upstream release + + -- Matthijs Kooijman <matthijs@katherina.student.utwente.nl> Mon, 16 May 2005 00:16:17 +0200 + +openttd (0.3.6-1) unstable; urgency=low + + * New upstream release + * Modifed Makefile to install xpm icon and scenarios in /usr/share/games/openttd/ + * Added openttd.32.xpm, openttd.64.xpm was too big + + -- root <root@katherina.student.utwente.nl> Tue, 25 Jan 2005 19:21:08 +0100 + +openttd (0.3.5-2) unstable; urgency=low + + * Fixed some lintian warnings. + * Added openttd.64.xpm (icon for menu). + + -- Matthijs Kooijman <matthijs@katherina.student.utwente.nl> Mon, 27 Dec 2004 01:51:36 +0100 + +openttd (0.3.5-1) unstable; urgency=low * Initial Release. - -- Matthijs Kooijman <matthijs@katherina.student.utwente.nl> Thu, 16 Sep 2004 00:59:38 +0200 + -- Matthijs Kooijman <matthijs@katherina.student.utwente.nl> Fri, 24 Dec 2004 02:58:47 +0100 diff --git a/os/debian/control b/os/debian/control index 4a819253d..18e46f38e 100644 --- a/os/debian/control +++ b/os/debian/control @@ -8,7 +8,8 @@ Standards-Version: 3.6.0 Package: openttd Architecture: any Depends: ${shlibs:Depends} -Description: An open source clone of the Microprose game "Transport Tycoon Deluxe" +Suggests: timidity, freepats +Description: open source clone of the Microprose game "Transport Tycoon Deluxe" An enhanced open source clone of the Microprose game "Transport Tycoon Deluxe". You require the data files of the original Transport Tycoon Deluxe for Windows to play the game. You have to MANUALLY copy them to the diff --git a/os/debian/docs b/os/debian/docs index 84e254122..24a607f07 100644 --- a/os/debian/docs +++ b/os/debian/docs @@ -2,4 +2,3 @@ changelog.txt readme.txt docs/Manual.txt docs/multiplayer.txt -known-bugs.txt diff --git a/os/debian/menu b/os/debian/menu index a3da87e28..d15a0fd53 100644 --- a/os/debian/menu +++ b/os/debian/menu @@ -1,2 +1,2 @@ ?package(openttd):needs="X11" section="Games/Simulation" title="Openttd"\ -command="/usr/games/openttd" icon="/usr/share/games/openttd/openttd.64.xpm" +command="/usr/games/openttd" icon="/usr/share/games/openttd/openttd.32.xpm" diff --git a/os/debian/rules b/os/debian/rules index c7be3f31a..cc4ea34cc 100644 --- a/os/debian/rules +++ b/os/debian/rules @@ -34,7 +34,7 @@ build-stamp: configure-stamp # Add here commands to compile the package. - rm Makefile.config + rm Makefile.config || true $(MAKE) PREFIX=/usr MIDI=/usr/bin/timidity INSTALL=1 BINARY_DIR=games DATA_DIR=share/games/openttd PERSONAL_DIR=.openttd USE_HOMEDIR=1 #/usr/bin/docbook-to-man debian/openttd.sgml > openttd.1 |