From: Brian S. <xue...@us...> - 2006-02-06 16:59:31
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2504 Modified Files: Tag: b0_22_2 MonitorCC.nsi runpopfile.nsi runsqlite.nsi stop_popfile.nsi WriteEnvStr.nsh Log Message: Change GPL license to remove the option for the person using POPFile to license it under any version of the GPL other than v2 Index: stop_popfile.nsi =================================================================== RCS file: /cvsroot/popfile/windows/stop_popfile.nsi,v retrieving revision 1.14.4.2 retrieving revision 1.14.4.3 diff -C2 -d -r1.14.4.2 -r1.14.4.3 *** stop_popfile.nsi 19 Dec 2005 11:45:36 -0000 1.14.4.2 --- stop_popfile.nsi 6 Feb 2006 16:59:16 -0000 1.14.4.3 *************** *** 3,12 **** # stop_popfile.nsi --- A simple 'command-line' utility to shutdown POPFile silently. # ! # Copyright (c) 2003-2005 John Graham-Cumming # # This file is part of POPFile # # POPFile is free software; you can redistribute it and/or modify it ! # under the terms version 2 of the GNU General Public License as # published by the Free Software Foundation. # --- 3,12 ---- # stop_popfile.nsi --- A simple 'command-line' utility to shutdown POPFile silently. # ! # Copyright (c) 2003-2006 John Graham-Cumming # # This file is part of POPFile # # POPFile is free software; you can redistribute it and/or modify it ! # under the terms of version 2 of the GNU General Public License as # published by the Free Software Foundation. # *************** *** 123,127 **** Caption "POPFile Silent Shutdown Utility" ! !define C_VERSION "0.5.11" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "stop_pf.exe" --- 123,127 ---- Caption "POPFile Silent Shutdown Utility" ! !define C_VERSION "0.5.13" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "stop_pf.exe" *************** *** 170,174 **** VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org/" VIAddVersionKey "CompanyName" "The POPFile Project" ! VIAddVersionKey "LegalCopyright" "Copyright (c) 2005 John Graham-Cumming" VIAddVersionKey "FileDescription" "POPFile Silent Shutdown Utility" VIAddVersionKey "FileVersion" "${C_VERSION}" --- 170,174 ---- VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org/" VIAddVersionKey "CompanyName" "The POPFile Project" ! VIAddVersionKey "LegalCopyright" "Copyright (c) 2006 John Graham-Cumming" VIAddVersionKey "FileDescription" "POPFile Silent Shutdown Utility" VIAddVersionKey "FileVersion" "${C_VERSION}" *************** *** 228,232 **** usage: MessageBox MB_OK "POPFile Silent Shutdown Utility v${C_VERSION} \ ! Copyright (c) 2005 John Graham-Cumming\ ${MB_NL}${MB_NL}\ This command-line utility shuts POPFile down silently, without opening a browser window.\ --- 228,232 ---- usage: MessageBox MB_OK "POPFile Silent Shutdown Utility v${C_VERSION} \ ! Copyright (c) 2006 John Graham-Cumming\ ${MB_NL}${MB_NL}\ This command-line utility shuts POPFile down silently, without opening a browser window.\ *************** *** 253,257 **** ${MB_NL} :DONE\ ${MB_NL}${MB_NL}\ ! Distributed under the terms of the GNU General Public License (GPL)." Goto error_exit --- 253,257 ---- ${MB_NL} :DONE\ ${MB_NL}${MB_NL}\ ! Distributed under the terms of the GNU General Public License (GPL) v2." Goto error_exit Index: runpopfile.nsi =================================================================== RCS file: /cvsroot/popfile/windows/runpopfile.nsi,v retrieving revision 1.11.4.2 retrieving revision 1.11.4.3 diff -C2 -d -r1.11.4.2 -r1.11.4.3 *** runpopfile.nsi 19 Dec 2005 11:45:36 -0000 1.11.4.2 --- runpopfile.nsi 6 Feb 2006 16:59:16 -0000 1.11.4.3 *************** *** 11,20 **** # mode is selected in 'popfile.cfg'. # ! # Copyright (c) 2004-2005 John Graham-Cumming # # This file is part of POPFile # # POPFile is free software; you can redistribute it and/or modify it ! # under the terms version 2 of the GNU General Public License as # published by the Free Software Foundation. # --- 11,20 ---- # mode is selected in 'popfile.cfg'. # ! # Copyright (c) 2004-2006 John Graham-Cumming # # This file is part of POPFile # # POPFile is free software; you can redistribute it and/or modify it ! # under the terms of version 2 of the GNU General Public License as # published by the Free Software Foundation. # *************** *** 106,110 **** ;-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.1.15" !define C_OUTFILE "runpopfile.exe" --- 106,110 ---- ;-------------------------------------------------------------------------- ! !define C_PFI_VERSION "0.1.17" !define C_OUTFILE "runpopfile.exe" *************** *** 153,157 **** VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org/" VIAddVersionKey "CompanyName" "The POPFile Project" ! VIAddVersionKey "LegalCopyright" "Copyright (c) 2005 John Graham-Cumming" VIAddVersionKey "FileDescription" "Enhanced front-end for POPFile starter program" VIAddVersionKey "FileVersion" "${C_PFI_VERSION}" --- 153,157 ---- VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org/" VIAddVersionKey "CompanyName" "The POPFile Project" ! VIAddVersionKey "LegalCopyright" "Copyright (c) 2006 John Graham-Cumming" VIAddVersionKey "FileDescription" "Enhanced front-end for POPFile starter program" VIAddVersionKey "FileVersion" "${C_PFI_VERSION}" *************** *** 192,199 **** ; Need to be able to confirm ownership when accessing the HKCU data ! ClearErrors ! UserInfo::GetName ! IfErrors default_name ! Pop ${L_WINUSERNAME} StrCmp ${L_WINUSERNAME} "" 0 find_popfile --- 192,199 ---- ; Need to be able to confirm ownership when accessing the HKCU data ! ClearErrors ! UserInfo::GetName ! IfErrors default_name ! Pop ${L_WINUSERNAME} StrCmp ${L_WINUSERNAME} "" 0 find_popfile Index: WriteEnvStr.nsh =================================================================== RCS file: /cvsroot/popfile/windows/WriteEnvStr.nsh,v retrieving revision 1.12.4.2 retrieving revision 1.12.4.3 diff -C2 -d -r1.12.4.2 -r1.12.4.3 *** WriteEnvStr.nsh 19 Dec 2005 11:45:36 -0000 1.12.4.2 --- WriteEnvStr.nsh 6 Feb 2006 16:59:16 -0000 1.12.4.3 *************** *** 10,14 **** # # POPFile is free software; you can redistribute it and/or modify it ! # under the terms version 2 of the GNU General Public License as # published by the Free Software Foundation. # --- 10,14 ---- # # POPFile is free software; you can redistribute it and/or modify it ! # under the terms of version 2 of the GNU General Public License as # published by the Free Software Foundation. # Index: runsqlite.nsi =================================================================== RCS file: /cvsroot/popfile/windows/runsqlite.nsi,v retrieving revision 1.1.4.2 retrieving revision 1.1.4.3 diff -C2 -d -r1.1.4.2 -r1.1.4.3 *** runsqlite.nsi 19 Dec 2005 11:45:36 -0000 1.1.4.2 --- runsqlite.nsi 6 Feb 2006 16:59:16 -0000 1.1.4.3 *************** *** 10,19 **** # utility is used to access the specified SQLite database file. # ! # Copyright (c) 2004-2005 John Graham-Cumming # # This file is part of POPFile # # POPFile is free software; you can redistribute it and/or modify it ! # under the terms version 2 of the GNU General Public License as # published by the Free Software Foundation. # --- 10,19 ---- # utility is used to access the specified SQLite database file. # ! # Copyright (c) 2004-2006 John Graham-Cumming # # This file is part of POPFile # # POPFile is free software; you can redistribute it and/or modify it ! # under the terms of version 2 of the GNU General Public License as # published by the Free Software Foundation. # *************** *** 75,79 **** ;-------------------------------------------------------------------------- ! !define C_VERSION "0.0.4" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "runsqlite.exe" --- 75,79 ---- ;-------------------------------------------------------------------------- ! !define C_VERSION "0.0.6" ; see 'VIProductVersion' comment below for format details !define C_OUTFILE "runsqlite.exe" *************** *** 113,117 **** VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org/" VIAddVersionKey "CompanyName" "The POPFile Project" ! VIAddVersionKey "LegalCopyright" "Copyright (c) 2005 John Graham-Cumming" VIAddVersionKey "FileDescription" "Run SQLite Utility for POPFile" VIAddVersionKey "FileVersion" "${C_VERSION}" --- 113,117 ---- VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org/" VIAddVersionKey "CompanyName" "The POPFile Project" ! VIAddVersionKey "LegalCopyright" "Copyright (c) 2006 John Graham-Cumming" VIAddVersionKey "FileDescription" "Run SQLite Utility for POPFile" VIAddVersionKey "FileVersion" "${C_VERSION}" Index: MonitorCC.nsi =================================================================== RCS file: /cvsroot/popfile/windows/MonitorCC.nsi,v retrieving revision 1.19.4.2 retrieving revision 1.19.4.3 diff -C2 -d -r1.19.4.2 -r1.19.4.3 *** MonitorCC.nsi 19 Dec 2005 11:45:36 -0000 1.19.4.2 --- MonitorCC.nsi 6 Feb 2006 16:59:16 -0000 1.19.4.3 *************** *** 5,14 **** # needs to be converted to the new SQL database format. # ! # Copyright (c) 2004-2005 John Graham-Cumming # # This file is part of POPFile # # POPFile is free software; you can redistribute it and/or modify it ! # under the terms version 2 of the GNU General Public License as # published by the Free Software Foundation. # --- 5,14 ---- # needs to be converted to the new SQL database format. # ! # Copyright (c) 2004-2006 John Graham-Cumming # # This file is part of POPFile # # POPFile is free software; you can redistribute it and/or modify it ! # under the terms of version 2 of the GNU General Public License as # published by the Free Software Foundation. # *************** *** 113,117 **** Name "${C_PFI_PRODUCT}" ! !define C_PFI_VERSION "0.1.19" !define C_OUTFILE "monitorcc.exe" --- 113,117 ---- Name "${C_PFI_PRODUCT}" ! !define C_PFI_VERSION "0.1.20" !define C_OUTFILE "monitorcc.exe" *************** *** 145,149 **** VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org/" VIAddVersionKey "CompanyName" "The POPFile Project" ! VIAddVersionKey "LegalCopyright" "Copyright (c) 2005 John Graham-Cumming" VIAddVersionKey "FileDescription" "POPFile Corpus Conversion Monitor" VIAddVersionKey "FileVersion" "${C_PFI_VERSION}" --- 145,149 ---- VIAddVersionKey "Comments" "POPFile Homepage: http://getpopfile.org/" VIAddVersionKey "CompanyName" "The POPFile Project" ! VIAddVersionKey "LegalCopyright" "Copyright (c) 2006 John Graham-Cumming" VIAddVersionKey "FileDescription" "POPFile Corpus Conversion Monitor" VIAddVersionKey "FileVersion" "${C_PFI_VERSION}" |