[popfile-commit] windows/add-ons addssl.nsi,1.3.4.1,1.3.4.2

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/popfile/windows/add-ons
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13118

Modified Files:
      Tag: b0_22_2
	addssl.nsi 
Log Message:
Update the link to the NSIS wiki for the UnTGZ plugin.

Disambiguate the comment about the applicability of the built-in SSL files.

Mention the new multi-language support, the additional compiler
warnings about PFI_LANG_NSISDL_PLURAL and how to interpret them.

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: addssl.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/add-ons/addssl.nsi,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -C2 -d -r1.3.4.1 -r1.3.4.2
*** addssl.nsi	2 Oct 2005 14:58:45 -0000	1.3.4.1
--- addssl.nsi	6 Feb 2006 14:46:36 -0000	1.3.4.2
***************
*** 24,35 ****
  #                installer download and install the same SSL support files.
  #
! # 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 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,
--- 24,34 ----
  #                installer download and install the same SSL support files.
  #
! # 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.
  #
  #   POPFile is distributed in the hope that it will be useful,
***************
*** 71,75 ****
    ;
    ; The 'NSIS Wiki' page for the 'untgz' plugin (description, example and download links):
!   ; http://nsis.sourceforge.net/wiki/UnTGZ
    ;
    ; Alternative download links can be found at the 'untgz' author's site:
--- 70,74 ----
    ;
    ; The 'NSIS Wiki' page for the 'untgz' plugin (description, example and download links):
!   ; http://nsis.sourceforge.net/UnTGZ_plug-in
    ;
    ; Alternative download links can be found at the 'untgz' author's site:
***************
*** 100,104 ****
    ; Winnipeg.
    ;
!   ; The following local SSL files are compatible with POPFile 0.22.x:
    ;
    ;   (1) ssl-0.22.x\IO-Socket-SSL.tar.gz             (dated 01-Aug-2003)
--- 99,103 ----
    ; Winnipeg.
    ;
!   ; The following local SSL files are compatible with POPFile 0.22.0, 0.22.1 and 0.22.2:
    ;
    ;   (1) ssl-0.22.x\IO-Socket-SSL.tar.gz             (dated 01-Aug-2003)
***************
*** 121,124 ****
--- 120,139 ----

  #--------------------------------------------------------------------------
+ # Language Support NSIS Compiler Warnings
+ #--------------------------------------------------------------------------
+ #
+ # Expect 3 compiler warnings, all related to standard NSIS language files which are
+ # out-of-date (if the default multi-language 'SSL Setup' wizard is compiled).
+ #
+ # There may be further warnings which mention "PFI_LANG_NSISDL_PLURAL" is not set in one or
+ # more language tables. The '..\pfi-languages.nsh' file lists all of the language table codes
+ # used by the POPFile installer and other NSIS-based utilities.
+ #
+ # NOTE: The language selection menu order used in this script assumes that the NSIS MUI
+ # 'Japanese.nsh' language file has been patched to use 'Nihongo' instead of 'Japanese'
+ # [see 'SMALL NSIS PATCH REQUIRED' in the '..\pfi-languages.nsh' file]
+ #--------------------------------------------------------------------------
+ 
+ #--------------------------------------------------------------------------
  # Compile-time command-line switches (used by 'makensis.exe')
  #--------------------------------------------------------------------------
***************
*** 166,170 ****
    Name                   "POPFile SSL Setup"

!   !define C_PFI_VERSION  "0.1.1"

    ; Mention the wizard's version number in the window title
--- 181,185 ----
    Name                   "POPFile SSL Setup"

!   !define C_PFI_VERSION  "0.1.5"

    ; Mention the wizard's version number in the window title
***************
*** 233,237 ****
    VIAddVersionKey "Comments"                "POPFile Homepage: http://getpopfile.org/"
    VIAddVersionKey "CompanyName"             "The POPFile Project"
!   VIAddVersionKey "LegalCopyright"          "Copyright (c) 2005  John Graham-Cumming"
    VIAddVersionKey "FileDescription"         "Installs SSL support for POPFile 0.22 or later"
    VIAddVersionKey "FileVersion"             "${C_PFI_VERSION}"
--- 248,252 ----
    VIAddVersionKey "Comments"                "POPFile Homepage: http://getpopfile.org/"
    VIAddVersionKey "CompanyName"             "The POPFile Project"
!   VIAddVersionKey "LegalCopyright"          "Copyright (c) 2006  John Graham-Cumming"
    VIAddVersionKey "FileDescription"         "Installs SSL support for POPFile 0.22 or later"
    VIAddVersionKey "FileVersion"             "${C_PFI_VERSION}"