Author: bugman Date: Fri Jan 12 04:05:04 2007 New Revision: 2985 URL: http://svn.gna.org/viewcvs/relax?rev=2985&view=rev Log: Ported r2984 of the 1.3 line using the command: svn merge -r2983:2984 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3 ........ r2984 | bugman | 2007-01-12 14:01:40 +1100 (Fri, 12 Jan 2007) | 3 lines Fixed the commented out manual construction targets for the 'binary_dist' and 'source_dist' targets. ........ Modified: tags/1.2.10/sconstruct tags/1.2.10/version.py Modified: tags/1.2.10/sconstruct URL: http://svn.gna.org/viewcvs/relax/tags/1.2.10/sconstruct?rev=2985&r1=2984&r2=2985&view=diff ============================================================================== --- tags/1.2.10/sconstruct (original) +++ tags/1.2.10/sconstruct Fri Jan 12 04:05:04 2007 @@ -201,7 +201,7 @@ binary_dist_env.dummy(target='binary_dist', source=None) binary_dist_env.Depends('binary_dist', 'version_check') # First check the program version number. binary_dist_env.Depends('binary_dist', self.relax_fit_object) # Compile the C code. - #binary_dist_env.Depends('binary_dist', 'user_manual_pdf') # Compile the PDF version of the user manual. + binary_dist_env.Depends('binary_dist', 'user_manual_pdf') # Compile the PDF version of the user manual. binary_dist_env.Depends('binary_dist', 'manual_clean_nodeps') # Clean up the temporary manual files. binary_dist_env.Depends('binary_dist', 'clean_temp') # Then clean up all other temporary files. binary_dist_env.Depends('binary_dist', 'package_bin') # Package the binary distribution. @@ -211,7 +211,7 @@ source_dist_env = Environment(BUILDERS={'dummy' : Builder(action=self.dummy)}) source_dist_env.dummy(target='source_dist', source=None) source_dist_env.Depends('source_dist', 'version_check') # First check the program version number. - #source_dist_env.Depends('source_dist', 'user_manual_pdf') # Compile the PDF version of the user manual. + source_dist_env.Depends('source_dist', 'user_manual_pdf') # Compile the PDF version of the user manual. source_dist_env.Depends('source_dist', 'manual_clean_nodeps') # Clean up the temporary manual files. source_dist_env.Depends('source_dist', 'clean') # Then clean up the sources. source_dist_env.Depends('source_dist', 'package_src') # Package the source distribution. Modified: tags/1.2.10/version.py URL: http://svn.gna.org/viewcvs/relax/tags/1.2.10/version.py?rev=2985&r1=2984&r2=2985&view=diff ============================================================================== --- tags/1.2.10/version.py (original) +++ tags/1.2.10/version.py Fri Jan 12 04:05:04 2007 @@ -1,1 +1,1 @@ -version = "repository checkout" +version = "1.2.10"