From: Brian S. <xue...@us...> - 2006-02-06 16:52:12
|
Update of /cvsroot/popfile/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32195 Modified Files: Tag: b0_22_2 installer-SecMinPerl-body.nsh installer-SecPOPFile-body.nsh installer-SecPOPFile-func.nsh installer-Uninstall.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: installer-SecPOPFile-body.nsh =================================================================== RCS file: /cvsroot/popfile/windows/installer-SecPOPFile-body.nsh,v retrieving revision 1.3.2.4 retrieving revision 1.3.2.5 diff -C2 -d -r1.3.2.4 -r1.3.2.5 *** installer-SecPOPFile-body.nsh 19 Dec 2005 11:45:36 -0000 1.3.2.4 --- installer-SecPOPFile-body.nsh 6 Feb 2006 16:52:03 -0000 1.3.2.5 *************** *** 8,17 **** # in a separate file (see 'installer-SecPOPFile-func.nsh') # ! # Copyright (c) 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. # --- 8,17 ---- # in a separate file (see 'installer-SecPOPFile-func.nsh') # ! # Copyright (c) 2005-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. # Index: installer-SecPOPFile-func.nsh =================================================================== RCS file: /cvsroot/popfile/windows/installer-SecPOPFile-func.nsh,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** installer-SecPOPFile-func.nsh 19 Dec 2005 11:45:36 -0000 1.1.2.3 --- installer-SecPOPFile-func.nsh 6 Feb 2006 16:52:03 -0000 1.1.2.4 *************** *** 4,13 **** # used by the 'installer-SecPOPFile-body.nsh' file. # ! # Copyright (c) 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. # --- 4,13 ---- # used by the 'installer-SecPOPFile-body.nsh' file. # ! # Copyright (c) 2005-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. # Index: installer-SecMinPerl-body.nsh =================================================================== RCS file: /cvsroot/popfile/windows/installer-SecMinPerl-body.nsh,v retrieving revision 1.2.2.4 retrieving revision 1.2.2.5 diff -C2 -d -r1.2.2.4 -r1.2.2.5 *** installer-SecMinPerl-body.nsh 19 Dec 2005 11:45:36 -0000 1.2.2.4 --- installer-SecMinPerl-body.nsh 6 Feb 2006 16:52:03 -0000 1.2.2.5 *************** *** 10,19 **** # optional POPFile component. # ! # Copyright (c) 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 ---- # optional POPFile component. # ! # Copyright (c) 2005-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. # Index: installer-Uninstall.nsh =================================================================== RCS file: /cvsroot/popfile/windows/installer-Uninstall.nsh,v retrieving revision 1.4.2.4 retrieving revision 1.4.2.5 diff -C2 -d -r1.4.2.4 -r1.4.2.5 *** installer-Uninstall.nsh 19 Dec 2005 11:45:36 -0000 1.4.2.4 --- installer-Uninstall.nsh 6 Feb 2006 16:52:03 -0000 1.4.2.5 *************** *** 4,13 **** # NSIS 'installer.nsi' script used to create the POPFile installer. # ! # Copyright (c) 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. # --- 4,13 ---- # NSIS 'installer.nsi' script used to create the POPFile installer. # ! # Copyright (c) 2005-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. # *************** *** 91,97 **** ; running the uninstaller (e.g. so we can check ownership of any local 'User Data' we find) ! ClearErrors ! UserInfo::GetName ! IfErrors 0 got_name ; Assume Win9x system, so user has 'Admin' rights --- 91,97 ---- ; running the uninstaller (e.g. so we can check ownership of any local 'User Data' we find) ! ClearErrors ! UserInfo::GetName ! IfErrors 0 got_name ; Assume Win9x system, so user has 'Admin' rights *************** *** 103,107 **** got_name: ! Pop $G_WINUSERNAME StrCmp $G_WINUSERNAME "" 0 get_usertype StrCpy $G_WINUSERNAME "UnknownUser" --- 103,107 ---- got_name: ! Pop $G_WINUSERNAME StrCmp $G_WINUSERNAME "" 0 get_usertype StrCpy $G_WINUSERNAME "UnknownUser" *************** *** 109,113 **** get_usertype: UserInfo::GetAccountType ! Pop $G_WINUSERTYPE StrCmp $G_WINUSERTYPE "Admin" start_uninstall StrCmp $G_WINUSERTYPE "Power" start_uninstall --- 109,113 ---- get_usertype: UserInfo::GetAccountType ! Pop $G_WINUSERTYPE StrCmp $G_WINUSERTYPE "Admin" start_uninstall StrCmp $G_WINUSERTYPE "Power" start_uninstall |