Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21377
Modified Files:
Tag: b0_22_2
CBP.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: CBP.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/CBP.nsh,v
retrieving revision 1.33.4.2
retrieving revision 1.33.4.3
diff -C2 -d -r1.33.4.2 -r1.33.4.3
*** CBP.nsh 19 Dec 2005 11:45:36 -0000 1.33.4.2
--- CBP.nsh 6 Feb 2006 16:30:05 -0000 1.33.4.3
***************
*** 11,15 ****
#
# 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,15 ----
#
# 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.
#
***************
*** 314,321 ****
StrCpy ${CBP_L_RESULT} ${CBP_L_TEMP} 7
StrCmp ${CBP_L_RESULT} "corpus " got_flat_corpus
!
StrCpy ${CBP_L_RESULT} ${CBP_L_TEMP} 13
StrCmp ${CBP_L_RESULT} "bayes_corpus " got_bdb_corpus
!
StrCpy ${CBP_L_RESULT} ${CBP_L_TEMP} 18
StrCmp ${CBP_L_RESULT} "database_database " got_sql_corpus
--- 314,321 ----
StrCpy ${CBP_L_RESULT} ${CBP_L_TEMP} 7
StrCmp ${CBP_L_RESULT} "corpus " got_flat_corpus
!
StrCpy ${CBP_L_RESULT} ${CBP_L_TEMP} 13
StrCmp ${CBP_L_RESULT} "bayes_corpus " got_bdb_corpus
!
StrCpy ${CBP_L_RESULT} ${CBP_L_TEMP} 18
StrCmp ${CBP_L_RESULT} "database_database " got_sql_corpus
***************
*** 1108,1112 ****
; WARNING:
! ; This 'FileWrite' uses a string which is only SIX characters less than the maximum allowed !
FileWrite ${L_INI_HANDLE} \
--- 1108,1112 ----
; WARNING:
! ; This 'FileWrite' uses a string which is a few dozen chars less than the maximum allowed !
FileWrite ${L_INI_HANDLE} \
***************
*** 1115,1126 ****
# CBP.ini --- generated by the 'CBP_CreateINIfile' function${MB_NL}\
#${MB_NL}\
! # Copyright (c) 2003-2004 John Graham-Cumming${MB_NL}\
#${MB_NL}\
# This file is part of POPFile${MB_NL}\
#${MB_NL}\
! # POPFile is free software; you can redistribute it and/or modify${MB_NL}\
! # it under the terms of the GNU General Public License as published by${MB_NL}\
! # the Free Software Foundation; either version 2 of the License, or${MB_NL}\
! # (at your option) any later version.${MB_NL}\
#${MB_NL}\
# POPFile is distributed in the hope that it will be useful,${MB_NL}\
--- 1115,1125 ----
# CBP.ini --- generated by the 'CBP_CreateINIfile' function${MB_NL}\
#${MB_NL}\
! # Copyright (c) 2003-2005 John Graham-Cumming${MB_NL}\
#${MB_NL}\
# This file is part of POPFile${MB_NL}\
#${MB_NL}\
! # POPFile is free software; you can redistribute it and/or modify it${MB_NL}\
! # under the terms of version 2 of the GNU General Public License as${MB_NL}\
! # published by the Free Software Foundation.${MB_NL}\
#${MB_NL}\
# POPFile is distributed in the hope that it will be useful,${MB_NL}\
|
