- SCR: Update default values per BOINC defaults.

- PTP: Add files needed by the installer(s).
    
	clientscr/progress/
	    <Added and Deleted various files>
	clientscr/
	    screensaver.h
	win_build/installerv2/
	    Progress.ism
	    Progressx64.ism
	win_build/installerv2/redist/0409/
		ptp-eula.rtf
	win_build/installerv2/redist/Progress/
		acct_mgr_url.xml
		progress.ico
		ss_config.xml

svn path=/trunk/boinc/; revision=18383

checkin_notes

@@ -5443,3 +5443,21 @@ David  11 June 2009
     tools/
         make_project
         upgrade
+
+Rom    11 June 2009
+    - SCR: Update default values per BOINC defaults.
+    - PTP: Add files needed by the installer(s).
+    
+	clientscr/progress/
+	    <Added and Deleted various files>
+	clientscr/
+	    screensaver.h
+	win_build/installerv2/
+	    Progress.ism
+	    Progressx64.ism
+	win_build/installerv2/redist/0409/
+		ptp-eula.rtf
+	win_build/installerv2/redist/Progress/
+		acct_mgr_url.xml
+		progress.ico
+		ss_config.xml

clientscr/screensaver.h

@@ -20,9 +20,9 @@
 #define __SCREENSAVER_H__
 
 // Default values, overriden by screensaver config file ss_config.xml
-#define GFX_DEFAULT_PERIOD 600 /* if default OpenGL screensaver exists, display it for 600 secs */
-#define GFX_SCIENCE_PERIOD 1800 /* Display various science graphics apps for 1800 secs */
-#define GFX_CHANGE_PERIOD 600 /* if > 1 CPUs, change screensaver every 600 secs */
+#define GFX_DEFAULT_PERIOD 120 /* if default OpenGL screensaver exists, display it for 2 minutes */
+#define GFX_SCIENCE_PERIOD 600 /* Display various science graphics apps for 10 minutes */
+#define GFX_CHANGE_PERIOD 300  /* if > 1 CPUs, change screensaver every 5 minutes */
 
 enum SS_PHASE {
     DEFAULT_SS_PHASE,

win_build/installerv2/redist/0409/ptp-eula.rtf

@@ -0,0 +1,22 @@
+{\rtf1\ansi\ansicpg1252\deff0\deflang1033\deflangfe1033{\fonttbl{\f0\fmodern\fprq1\fcharset0 Courier New;}}
+{\colortbl ;\red0\green0\blue255;}
+{\*\generator Msftedit 5.41.21.2506;}\viewkind4\uc1\pard\nowidctlpar\f0\fs20 Progress Thru Processors\par
+\par
+License Agreement\par
+\par
+Please carefully read the following terms and conditions before using this software. Your use of this software indicates your acceptance of this license agreement and warranty.\par
+\par
+Disclaimer of Warranty\par
+\par
+THIS SOFTWARE AND THE ACCOMPANYING FILES ARE DISTRIBUTED "AS IS" AND WITHOUT WARRANTIES OF ANY KIND, AND THE IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. ANY STATUTORY WARRANTY OF NON-INFRINGEMENT IS ALSO DISCLAIMED.\par
+\par
+Restrictions\par
+\par
+You may use this software on a computer system only if you own the system or have the permission of the owner.\par
+\par
+Distribution\par
+\par
+\pard This is free software. It is distributed under the terms of the GNU Lesser General Public License as published by the Free Software Foundation (http://www.fsf.org/). The source code may be obtained from the BOINC web site (http://boinc.berkeley.edu/).\par
+\par
+}
+ 

win_build/installerv2/redist/Progress/acct_mgr_url.xml

@@ -0,0 +1,16 @@
+<acct_mgr>
+     <name>GridRepublic</name>
+     <url>http://www.gridrepublic.org/</url>
+     <signing_key>
+1024
+9c3af22a230f1eb122b8eab256e5e46b49f6d357e65d00e414cf6af105aef217
+1de0793353097bbbb918413f79cb5bfaa4532daf061ece07b63f209690a3e1b1
+8906a9ae4f521ec25e6fb79b8679dd4c18c0f022dcb95baefeca091d572c7738
+e1b1d542bbec94552e0e37c698427f4538b947b79072d112ebcf4d9c509b16d9
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000010001
+.
+     </signing_key>
+</acct_mgr> 

win_build/installerv2/redist/Progress/ss_config.xml

@@ -0,0 +1,3 @@
+<ss_config>
+    <default_ss_first>1</default_ss_first>
+</ss_config>