Thread: [popfile-commit] engine bayes.pl,1.39,1.40 coverage.pl,1.11,1.12 insert.pl,1.39,1.40 make_packing_li

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/popfile/engine
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14989

Modified Files:
	bayes.pl coverage.pl insert.pl make_packing_list.pl pipe.pl 
	popfile-check-setup.pl popfile-service.pl popfile-tray.pl 
	popfile-windows.pl popfile.pl 
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: popfile-tray.pl
===================================================================
RCS file: /cvsroot/popfile/engine/popfile-tray.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** popfile-tray.pl	27 Dec 2004 16:51:24 -0000	1.10
--- popfile-tray.pl	19 Dec 2005 11:41:52 -0000	1.11
***************
*** 14,21 ****
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify
! #   it under the terms of the GNU General Public License as published by
! #   the Free Software Foundation; either version 2 of the License, or
! #   (at your option) any later version.
  #
  #   POPFile is distributed in the hope that it will be useful,
--- 14,20 ----
  #   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.
  #
  #   POPFile is distributed in the hope that it will be useful,

Index: coverage.pl
===================================================================
RCS file: /cvsroot/popfile/engine/coverage.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** coverage.pl	29 Nov 2004 16:43:39 -0000	1.11
--- coverage.pl	19 Dec 2005 11:41:52 -0000	1.12
***************
*** 10,15 ****
  use strict;

! # This hash will store a count of the number of times each line is executed # in each file,
! # it is in fact a hash of hashes used as
  # $count{filename}{linenumber}

--- 10,15 ----
  use strict;

! # This hash will store a count of the number of times each line is
! # executed # in each file, it is in fact a hash of hashes used as
  # $count{filename}{linenumber}

***************
*** 17,20 ****
--- 17,21 ----

  # This hash will map file names of POPFile modules to coverage
+ 
  my %files;

***************
*** 25,30 ****
  foreach my $file (sort @line_files) {

!     # Each LNE has a file name of ModuleName.PID.lne and the ModuleName has had
!     # / or :: converted to #

      $file =~ /^(.+)\.pm\.(-?\d+)\.lne$/;
--- 26,31 ----
  foreach my $file (sort @line_files) {

!     # Each LNE has a file name of ModuleName.PID.lne and the
!     # ModuleName has had / or :: converted to #

      $file =~ /^(.+)\.pm\.(-?\d+)\.lne$/;

Index: insert.pl
===================================================================
RCS file: /cvsroot/popfile/engine/insert.pl,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** insert.pl	27 Dec 2004 18:14:09 -0000	1.39
--- insert.pl	19 Dec 2005 11:41:52 -0000	1.40
***************
*** 8,15 ****
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify
! #   it under the terms of the GNU General Public License as published by
! #   the Free Software Foundation; either version 2 of the License, or
! #   (at your option) any later version.
  #
  #   POPFile is distributed in the hope that it will be useful,
--- 8,14 ----
  #   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.
  #
  #   POPFile is distributed in the hope that it will be useful,

Index: popfile-windows.pl
===================================================================
RCS file: /cvsroot/popfile/engine/popfile-windows.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** popfile-windows.pl	29 Nov 2004 16:43:39 -0000	1.6
--- popfile-windows.pl	19 Dec 2005 11:41:52 -0000	1.7
***************
*** 15,22 ****
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify
! #   it under the terms of the GNU General Public License as published by
! #   the Free Software Foundation; either version 2 of the License, or
! #   (at your option) any later version.
  #
  #   POPFile is distributed in the hope that it will be useful,
--- 15,21 ----
  #   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.
  #
  #   POPFile is distributed in the hope that it will be useful,

Index: popfile-service.pl
===================================================================
RCS file: /cvsroot/popfile/engine/popfile-service.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** popfile-service.pl	27 Dec 2004 16:51:24 -0000	1.5
--- popfile-service.pl	19 Dec 2005 11:41:52 -0000	1.6
***************
*** 2,10 ****
  # ----------------------------------------------------------------------------
  #
! # popfile-service.pl --- Message analyzer and sorter (Windows loader used with PerlSvc)
  #
! # Acts as a server and client designed to sit between a real mail/news client and a real mail/
! # news server using POP3.  Inserts an extra header X-Text-Classification: into the header to
! # tell the client which category the message belongs in and much more...
  #
  # Copyright (c) 2003-2004 John Graham-Cumming
--- 2,12 ----
  # ----------------------------------------------------------------------------
  #
! # popfile-service.pl --- Message analyzer and sorter (Windows loader
! # used with PerlSvc)
  #
! # Acts as a server and client designed to sit between a real mail/news
! # client and a real mail/ news server using POP3.  Inserts an extra
! # header X-Text-Classification: into the header to tell the client
! # which category the message belongs in and much more...
  #
  # Copyright (c) 2003-2004 John Graham-Cumming
***************
*** 12,19 ****
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify
! #   it under the terms of the GNU General Public License as published by
! #   the Free Software Foundation; either version 2 of the License, or
! #   (at your option) any later version.
  #
  #   POPFile is distributed in the hope that it will be useful,
--- 14,20 ----
  #   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.
  #
  #   POPFile is distributed in the hope that it will be useful,

Index: pipe.pl
===================================================================
RCS file: /cvsroot/popfile/engine/pipe.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** pipe.pl	27 Dec 2004 18:14:09 -0000	1.15
--- pipe.pl	19 Dec 2005 11:41:52 -0000	1.16
***************
*** 2,6 ****
  # ----------------------------------------------------------------------------
  #
! # pipe.pl --- Read a message in on STDIN and write out the modified version on STDOUT
  #
  # Copyright (c) 2001-2004 John Graham-Cumming
--- 2,7 ----
  # ----------------------------------------------------------------------------
  #
! # pipe.pl --- Read a message in on STDIN and write out the modified
! # version on STDOUT
  #
  # Copyright (c) 2001-2004 John Graham-Cumming
***************
*** 8,15 ****
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify
! #   it under the terms of the GNU General Public License as published by
! #   the Free Software Foundation; either version 2 of the License, or
! #   (at your option) any later version.
  #
  #   POPFile is distributed in the hope that it will be useful,
--- 9,15 ----
  #   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.
  #
  #   POPFile is distributed in the hope that it will be useful,

Index: popfile-check-setup.pl
===================================================================
RCS file: /cvsroot/popfile/engine/popfile-check-setup.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** popfile-check-setup.pl	28 Feb 2005 17:00:30 -0000	1.1
--- popfile-check-setup.pl	19 Dec 2005 11:41:52 -0000	1.2
***************
*** 11,18 ****
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify
! #   it under the terms of the GNU General Public License as published by
! #   the Free Software Foundation; either version 2 of the License, or
! #   (at your option) any later version.
  #
  #   POPFile is distributed in the hope that it will be useful,
--- 11,17 ----
  #   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.
  #
  #   POPFile is distributed in the hope that it will be useful,

Index: popfile.pl
===================================================================
RCS file: /cvsroot/popfile/engine/popfile.pl,v
retrieving revision 1.230
retrieving revision 1.231
diff -C2 -d -r1.230 -r1.231
*** popfile.pl	28 Feb 2005 17:00:27 -0000	1.230
--- popfile.pl	19 Dec 2005 11:41:52 -0000	1.231
***************
*** 13,20 ****
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify
! #   it under the terms of the GNU General Public License as published by
! #   the Free Software Foundation; either version 2 of the License, or
! #   (at your option) any later version.
  #
  #   POPFile is distributed in the hope that it will be useful,
--- 13,19 ----
  #   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.
  #
  #   POPFile is distributed in the hope that it will be useful,

Index: bayes.pl
===================================================================
RCS file: /cvsroot/popfile/engine/bayes.pl,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** bayes.pl	27 Dec 2004 18:14:09 -0000	1.39
--- bayes.pl	19 Dec 2005 11:41:52 -0000	1.40
***************
*** 8,15 ****
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify
! #   it under the terms of the GNU General Public License as published by
! #   the Free Software Foundation; either version 2 of the License, or
! #   (at your option) any later version.
  #
  #   POPFile is distributed in the hope that it will be useful,
--- 8,14 ----
  #   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.
  #
  #   POPFile is distributed in the hope that it will be useful,

Index: make_packing_list.pl
===================================================================
RCS file: /cvsroot/popfile/engine/make_packing_list.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** make_packing_list.pl	1 Dec 2004 03:06:30 -0000	1.3
--- make_packing_list.pl	19 Dec 2005 11:41:52 -0000	1.4
***************
*** 10,17 ****
  #   This file is part of POPFile
  #
! #   POPFile is free software; you can redistribute it and/or modify
! #   it under the terms of the GNU General Public License as published by
! #   the Free Software Foundation; either version 2 of the License, or
! #   (at your option) any later version.
  #
  #   POPFile is distributed in the hope that it will be useful,
--- 10,16 ----
  #   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.
  #
  #   POPFile is distributed in the hope that it will be useful,