[Tux4kids-commits] r1680 - in tuxtype/trunk: . doc doc/en

David Bruce dbruce-guest at alioth.debian.org
Mon Dec 7 19:46:42 UTC 2009 

Author: dbruce-guest
Date: 2009-12-07 19:46:41 +0000 (Mon, 07 Dec 2009)
New Revision: 1680

Modified:
   tuxtype/trunk/Makefile.am
   tuxtype/trunk/doc/OFL
   tuxtype/trunk/doc/en/TuxType_port_Mac.txt
   tuxtype/trunk/tuxtype.spec.in
   tuxtype/trunk/tuxtype_preview.spec.in
Log:
converted two files to unix textfile line endings

Modified: tuxtype/trunk/Makefile.am
===================================================================
--- tuxtype/trunk/Makefile.am	2009-11-28 13:10:58 UTC (rev 1679)
+++ tuxtype/trunk/Makefile.am	2009-12-07 19:46:41 UTC (rev 1680)
@@ -49,7 +49,7 @@
 # Global sites for game state data (e.g. /var/games/tuxtype):
 	$(MKDIR_P) -m 2755 $(DESTDIR)$(pkglocalstatedir)
 	$(MKDIR_P) -m 2755 $(DESTDIR)$(pkglocalstatedir)/words
-	chown root:games $(DESTDIR)$(pkglocalstatedir)
+#	chown root:games $(DESTDIR)$(pkglocalstatedir)
 	chown root:games $(DESTDIR)$(pkglocalstatedir)/words
 
 

Modified: tuxtype/trunk/doc/OFL
===================================================================
--- tuxtype/trunk/doc/OFL	2009-11-28 13:10:58 UTC (rev 1679)
+++ tuxtype/trunk/doc/OFL	2009-12-07 19:46:41 UTC (rev 1680)
@@ -1,97 +1,97 @@
-Copyright (c) <dates>, <Copyright Holder> (<URL|email>),
-with Reserved Font Name <Reserved Font Name>.
-Copyright (c) <dates>, <additional Copyright Holder> (<URL|email>),
-with Reserved Font Name <additional Reserved Font Name>.
-Copyright (c) <dates>, <additional Copyright Holder> (<URL|email>).
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
+Copyright (c) <dates>, <Copyright Holder> (<URL|email>),
+with Reserved Font Name <Reserved Font Name>.
+Copyright (c) <dates>, <additional Copyright Holder> (<URL|email>),
+with Reserved Font Name <additional Reserved Font Name>.
+Copyright (c) <dates>, <additional Copyright Holder> (<URL|email>).
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

Modified: tuxtype/trunk/doc/en/TuxType_port_Mac.txt
===================================================================
--- tuxtype/trunk/doc/en/TuxType_port_Mac.txt	2009-11-28 13:10:58 UTC (rev 1679)
+++ tuxtype/trunk/doc/en/TuxType_port_Mac.txt	2009-12-07 19:46:41 UTC (rev 1680)
@@ -1,52 +1,52 @@
-How I Ported Tuxtype to Mac OS X:
-
-**Note** I am writing this from memory.  These steps should work, but if they do not, contact the tuxtype developer team and search google for answers.  That is how I was able to port Tuxtype.
-
-**Note** My tuxtye.xcodeproj should exist in the Tuxtype SVN.  Open that to see my settings for the project.
-
-Requirements:  
-1. Mac OS 10.4 or higher (10.3, SDL, and Quicktime causes an error, so use 10.4)
-2. Xcode 2.5 [a free download from Apple's website] (or Xcode 3 should work but has not been tested)
-
-
-Steps to get Tuxtype working on a Mac:
-
-1. Download the following source codes:
-     a. SDL       (I used version 1.2.12) [http://www.libsdl.org/download-1.2.php]
-     b. SDL_image (I used version 1.2.6)  [http://www.libsdl.org/projects/SDL_image/]
-     c. SDL_mixer (I used version 1.2.8)  [http://www.libsdl.org/projects/SDL_mixer/]
-     d. SDL_ttf   (I used version 2.0.9)  [http://www.libsdl.org/projects/SDL_ttf/]
-
-2. Once you have SDL, open the SDL directory and unzip the Xcode.tar.gz.  Open the Xcode folder, then the SDL folder, then open SDL.xcodeproj in Xcode.  Change the Active Target to Framework and the Active Build Configuration to Deployment.  Click Build.  You now have the framework for SDL. Repeat these steps for SDL_image, SDL_mixer, and SDL_ttf to build their frameworks.
-
-3. Download the source code for Tuxtype.  
-
-4. Open Xcode.  Go to File --> New Project --> SDL Application.  This will be the base of your Tuxtype application.  I reccomend naming your project tuxtype.
-
-5. Delete the file Main.c (this is the SDL demo one, we will add the main.c from tuxtype later).
-
-6. Under linked frameworks, add the following frameworks you built: SDL.framework, SDL_ttf.framework, SDL_image.framework, and SDL_mixer.framework.
-
-7. Drag the 4 SDL Frameworks (From inside your project name then the Frameworks folder in the left pane) into the Copy Frameworks into .app bundle (From targets, then your project name).  This will make your .app come bundled with the SDL framworks so the application can stand alone.
-
-8. Add all of the files from the Tuxtype sourcecode to the project.  Ensure that under "classes" is SDLMain.h and SDLMain.m.  Under "other sources" is all the .c and .h files.  Under "Resources" is the "data" folder and all its contents inside it.  Having the right structure of folders is very important so Tuxtype knows where to find files.
-
-9. Disable SDLPango.  To do this, open alphabet.c and ensure that #IFNDEF MACOSX and #endif enclose all the code for SDLPango.  This should already be done and is done for WIN32 as well. 
-
-10. Open setup.c.  Ensure that DATA_PREFIX is on the of PATHS.
-
-12. Time to set the compiler options.  Go to Project -> Edit project settings, then Build.  Architecture should be "ppc i386", "prepocessor Macros" are MACOSX=1 DATA_PREFIX=\"tuxtype.app/Contents/Resources/data\"  Under Header Search Paths, ensure the location to the SDL frameworks is included.  My header search paths are "/Library/Frameworks/SDL.framework/Headers" "/Library/Frameworks/SDL_image.framework/Headers" etc.
-
-13. In the main Xcode screen, change Active Build Configuration to Release.
-
-14. Pray, then hit Build.  You should now have a tuxtype.app in the build/release/ folder of your xcode project.
-
-15. Search Google for how to add an icon to a .app (I did it by editing a .plist file).  Also search for how to create a .dmg.  Many good tutorials alreayd exist for these, so I will not add instructions for them.
-
-**Note:  A very good SVN client for Mac is SmartSVN.  It has the built in svn+ssh support for alioth.debian.org**
-**Note: If you run into odd compiler errors listing many problems in SDL functions, try rebuilding the SDL frameworks.**
-**Note: Tuxtype on 10.3 will require a different build then on 10.4.  This is because 10.3 uses gcc3.3 and 10.4 uses gcc4.0.  To compile an app for 10.3, see http://bura-bura.com/blog/archives/2005/08/02/how-to-compile-an-application-for-102-or-103-using-xcode-21/**   
-
-Best of luck,
-Alex Shorthouse
+How I Ported Tuxtype to Mac OS X:
+
+**Note** I am writing this from memory.  These steps should work, but if they do not, contact the tuxtype developer team and search google for answers.  That is how I was able to port Tuxtype.
+
+**Note** My tuxtye.xcodeproj should exist in the Tuxtype SVN.  Open that to see my settings for the project.
+
+Requirements:  
+1. Mac OS 10.4 or higher (10.3, SDL, and Quicktime causes an error, so use 10.4)
+2. Xcode 2.5 [a free download from Apple's website] (or Xcode 3 should work but has not been tested)
+
+
+Steps to get Tuxtype working on a Mac:
+
+1. Download the following source codes:
+     a. SDL       (I used version 1.2.12) [http://www.libsdl.org/download-1.2.php]
+     b. SDL_image (I used version 1.2.6)  [http://www.libsdl.org/projects/SDL_image/]
+     c. SDL_mixer (I used version 1.2.8)  [http://www.libsdl.org/projects/SDL_mixer/]
+     d. SDL_ttf   (I used version 2.0.9)  [http://www.libsdl.org/projects/SDL_ttf/]
+
+2. Once you have SDL, open the SDL directory and unzip the Xcode.tar.gz.  Open the Xcode folder, then the SDL folder, then open SDL.xcodeproj in Xcode.  Change the Active Target to Framework and the Active Build Configuration to Deployment.  Click Build.  You now have the framework for SDL. Repeat these steps for SDL_image, SDL_mixer, and SDL_ttf to build their frameworks.
+
+3. Download the source code for Tuxtype.  
+
+4. Open Xcode.  Go to File --> New Project --> SDL Application.  This will be the base of your Tuxtype application.  I reccomend naming your project tuxtype.
+
+5. Delete the file Main.c (this is the SDL demo one, we will add the main.c from tuxtype later).
+
+6. Under linked frameworks, add the following frameworks you built: SDL.framework, SDL_ttf.framework, SDL_image.framework, and SDL_mixer.framework.
+
+7. Drag the 4 SDL Frameworks (From inside your project name then the Frameworks folder in the left pane) into the Copy Frameworks into .app bundle (From targets, then your project name).  This will make your .app come bundled with the SDL framworks so the application can stand alone.
+
+8. Add all of the files from the Tuxtype sourcecode to the project.  Ensure that under "classes" is SDLMain.h and SDLMain.m.  Under "other sources" is all the .c and .h files.  Under "Resources" is the "data" folder and all its contents inside it.  Having the right structure of folders is very important so Tuxtype knows where to find files.
+
+9. Disable SDLPango.  To do this, open alphabet.c and ensure that #IFNDEF MACOSX and #endif enclose all the code for SDLPango.  This should already be done and is done for WIN32 as well. 
+
+10. Open setup.c.  Ensure that DATA_PREFIX is on the of PATHS.
+
+12. Time to set the compiler options.  Go to Project -> Edit project settings, then Build.  Architecture should be "ppc i386", "prepocessor Macros" are MACOSX=1 DATA_PREFIX=\"tuxtype.app/Contents/Resources/data\"  Under Header Search Paths, ensure the location to the SDL frameworks is included.  My header search paths are "/Library/Frameworks/SDL.framework/Headers" "/Library/Frameworks/SDL_image.framework/Headers" etc.
+
+13. In the main Xcode screen, change Active Build Configuration to Release.
+
+14. Pray, then hit Build.  You should now have a tuxtype.app in the build/release/ folder of your xcode project.
+
+15. Search Google for how to add an icon to a .app (I did it by editing a .plist file).  Also search for how to create a .dmg.  Many good tutorials alreayd exist for these, so I will not add instructions for them.
+
+**Note:  A very good SVN client for Mac is SmartSVN.  It has the built in svn+ssh support for alioth.debian.org**
+**Note: If you run into odd compiler errors listing many problems in SDL functions, try rebuilding the SDL frameworks.**
+**Note: Tuxtype on 10.3 will require a different build then on 10.4.  This is because 10.3 uses gcc3.3 and 10.4 uses gcc4.0.  To compile an app for 10.3, see http://bura-bura.com/blog/archives/2005/08/02/how-to-compile-an-application-for-102-or-103-using-xcode-21/**   
+
+Best of luck,
+Alex Shorthouse
 ashorthouse at rsd13.org
\ No newline at end of file

Modified: tuxtype/trunk/tuxtype.spec.in
===================================================================
--- tuxtype/trunk/tuxtype.spec.in	2009-11-28 13:10:58 UTC (rev 1679)
+++ tuxtype/trunk/tuxtype.spec.in	2009-12-07 19:46:41 UTC (rev 1680)
@@ -167,7 +167,9 @@
 %attr(755, root, root) %_sysconfdir/%progname
 
 # create game state directories modifiable by members of "games" group:
-%attr(2755, root, games) %_localstatedir/games/%progname
+#%attr(2755, root, games) %_localstatedir/games/%progname
+# Perhaps only the words dir needs to have the non-default permissions:
+%_localstatedir/games/%progname
 %attr(2755, root, games) %_localstatedir/games/%progname/words
 
 

Modified: tuxtype/trunk/tuxtype_preview.spec.in
===================================================================
--- tuxtype/trunk/tuxtype_preview.spec.in	2009-11-28 13:10:58 UTC (rev 1679)
+++ tuxtype/trunk/tuxtype_preview.spec.in	2009-12-07 19:46:41 UTC (rev 1680)
@@ -172,7 +172,9 @@
 %attr(755, root, root) %_sysconfdir/%progname
 
 # create game state directories modifiable by members of "games" group:
-%attr(2755, root, games) %_localstatedir/games/%progname
+#%attr(2755, root, games) %_localstatedir/games/%progname
+# Perhaps only the words dir needs to have the non-default permissions:
+%_localstatedir/games/%progname
 %attr(2755, root, games) %_localstatedir/games/%progname/words

More information about the Tux4kids-commits mailing list