Author: cazfi
Date: Tue Feb  2 19:10:59 2016
New Revision: 31719

URL: http://svn.gna.org/viewcvs/freeciv?rev=31719&view=rev
Log:
Have a separate license text file for the Windows Installers to display, with
freeciv specific explanatory header added before the upstream (fsf) license 
file.

Based on request of Jacob Nevins <jtn>

See patch #6787

Added:
    branches/S2_6/win32/installer/licenses/
    branches/S2_6/win32/installer/licenses/COPYING.installer
      - copied, changed from r31717, branches/S2_6/COPYING
    branches/S2_6/win32/installer_msys2/licenses/
    branches/S2_6/win32/installer_msys2/licenses/COPYING.installer
      - copied, changed from r31717, branches/S2_6/COPYING
Modified:
    branches/S2_6/win32/Makefile.am
    branches/S2_6/win32/installer/Makefile
    branches/S2_6/win32/installer/create-freeciv-gtk-qt-nsi.sh
    branches/S2_6/win32/installer/create-freeciv-ruledit-nsi.sh
    branches/S2_6/win32/installer/create-freeciv-sdl-nsi.sh
    branches/S2_6/win32/installer_msys2/Makefile
    branches/S2_6/win32/installer_msys2/create-freeciv-gtk-qt-nsi.sh
    branches/S2_6/win32/installer_msys2/create-freeciv-ruledit-nsi.sh
    branches/S2_6/win32/installer_msys2/create-freeciv-sdl-nsi.sh

Modified: branches/S2_6/win32/Makefile.am
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/Makefile.am?rev=31719&r1=31718&r2=31719&view=diff
==============================================================================
--- branches/S2_6/win32/Makefile.am     (original)
+++ branches/S2_6/win32/Makefile.am     Tue Feb  2 19:10:59 2016
@@ -7,6 +7,7 @@
                clienticon.rc   \
                mpicon.rc       \
                servericon.rc   \
+               installer/licenses/COPYING.installer    \
                installer/create-freeciv-gtk-qt-nsi.sh  \
                installer/create-freeciv-gtk2-nsi.sh    \
                installer/create-freeciv-gtk3-nsi.sh    \
@@ -24,6 +25,7 @@
                installer/freeciv-ruledit.cmd           \
                installer/Freeciv.url                   \
                installer/Makefile                      \
+               installer_msys2/licenses/COPYING.installer      \
                installer_msys2/create-freeciv-gtk-qt-nsi.sh    \
                installer_msys2/create-freeciv-gtk2-nsi.sh      \
                installer_msys2/create-freeciv-gtk3-nsi.sh      \

Modified: branches/S2_6/win32/installer/Makefile
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer/Makefile?rev=31719&r1=31718&r2=31719&view=diff
==============================================================================
--- branches/S2_6/win32/installer/Makefile      (original)
+++ branches/S2_6/win32/installer/Makefile      Tue Feb  2 19:10:59 2016
@@ -92,6 +92,8 @@
        mv install-$(GUI)/usr/local/share/doc install-$(GUI)/doc
        mkdir -p install-$(GUI)/debuginfo
        cp build-$(GUI)/gen_headers/fc_config.h install-$(GUI)/debuginfo
+       mkdir -p install-$(GUI)/doc/freeciv/installer
+       cp licenses/COPYING.installer install-$(GUI)/doc/freeciv/installer/
        # delete unneeded files
        rm -r install-$(GUI)/usr
        # strip 'freeciv-manual' and 'freeciv-mp-<gui>' executables
@@ -131,6 +133,8 @@
        mv install-ruledit/usr/local/share/doc install-ruledit/doc
        mkdir -p install-ruledit/debuginfo
        cp build-ruledit/gen_headers/fc_config.h install-ruledit/debuginfo
+       mkdir -p install-ruledit/doc/freeciv/installer
+       cp licenses/COPYING.installer install-ruledit/doc/freeciv/installer/
        # delete unneeded files
        rm -r install-ruledit/usr
        # strip 'freeciv-ruledit' executable

Modified: branches/S2_6/win32/installer/create-freeciv-gtk-qt-nsi.sh
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer/create-freeciv-gtk-qt-nsi.sh?rev=31719&r1=31718&r2=31719&view=diff
==============================================================================
--- branches/S2_6/win32/installer/create-freeciv-gtk-qt-nsi.sh  (original)
+++ branches/S2_6/win32/installer/create-freeciv-gtk-qt-nsi.sh  Tue Feb  2 
19:10:59 2016
@@ -41,7 +41,7 @@
 ; Pages
 
 !insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_LICENSE "$1\doc\freeciv\COPYING"
+!insertmacro MUI_PAGE_LICENSE "$1\doc\freeciv\installer\COPYING.installer"
 !insertmacro MUI_PAGE_COMPONENTS
 Page custom DefaultLanguage DefaultLanguageLeave
 !insertmacro MULTIUSER_PAGE_INSTALLMODE

Modified: branches/S2_6/win32/installer/create-freeciv-ruledit-nsi.sh
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer/create-freeciv-ruledit-nsi.sh?rev=31719&r1=31718&r2=31719&view=diff
==============================================================================
--- branches/S2_6/win32/installer/create-freeciv-ruledit-nsi.sh (original)
+++ branches/S2_6/win32/installer/create-freeciv-ruledit-nsi.sh Tue Feb  2 
19:10:59 2016
@@ -39,7 +39,7 @@
 ; Pages
 
 !insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_LICENSE "$1\doc\freeciv\COPYING"
+!insertmacro MUI_PAGE_LICENSE "$1\doc\freeciv\installer\COPYING.installer"
 !insertmacro MUI_PAGE_COMPONENTS
 Page custom DefaultLanguage DefaultLanguageLeave
 !insertmacro MULTIUSER_PAGE_INSTALLMODE

Modified: branches/S2_6/win32/installer/create-freeciv-sdl-nsi.sh
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer/create-freeciv-sdl-nsi.sh?rev=31719&r1=31718&r2=31719&view=diff
==============================================================================
--- branches/S2_6/win32/installer/create-freeciv-sdl-nsi.sh     (original)
+++ branches/S2_6/win32/installer/create-freeciv-sdl-nsi.sh     Tue Feb  2 
19:10:59 2016
@@ -41,7 +41,7 @@
 ; Pages
 
 !insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_LICENSE "$1\doc\freeciv\COPYING"
+!insertmacro MUI_PAGE_LICENSE "$1\doc\freeciv\installer\COPYING.installer"
 !insertmacro MUI_PAGE_COMPONENTS
 Page custom DefaultLanguage DefaultLanguageLeave
 !insertmacro MULTIUSER_PAGE_INSTALLMODE

Copied: branches/S2_6/win32/installer/licenses/COPYING.installer (from r31717, 
branches/S2_6/COPYING)
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer/licenses/COPYING.installer?p2=branches/S2_6/win32/installer/licenses/COPYING.installer&p1=branches/S2_6/COPYING&r1=31717&r2=31719&rev=31719&view=diff
==============================================================================
--- branches/S2_6/COPYING       (original)
+++ branches/S2_6/win32/installer/licenses/COPYING.installer    Tue Feb  2 
19:10:59 2016
@@ -1,3 +1,10 @@
+Freeciv is released under the GNU General Public License (version 2
+or, at your option, any later version).  In short, you may copy this
+program (including source) freely, but see the the full license text
+below for full details.
+
+-----------------------------------------------------------------------------
+
                     GNU GENERAL PUBLIC LICENSE
                        Version 2, June 1991
 

Modified: branches/S2_6/win32/installer_msys2/Makefile
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer_msys2/Makefile?rev=31719&r1=31718&r2=31719&view=diff
==============================================================================
--- branches/S2_6/win32/installer_msys2/Makefile        (original)
+++ branches/S2_6/win32/installer_msys2/Makefile        Tue Feb  2 19:10:59 2016
@@ -80,6 +80,8 @@
        mv install-$(GUI)/usr/local/share/doc install-$(GUI)/doc
        mkdir -p install-$(GUI)/debuginfo
        cp build-$(GUI)/gen_headers/fc_config.h install-$(GUI)/debuginfo
+       mkdir -p install-ruledit/doc/freeciv/installer
+       cp licenses/COPYING.installer install-ruledit/doc/freeciv/installer/
        # delete unneeded files
        rm -r install-$(GUI)/usr
        # strip 'freeciv-manual' and 'freeciv-mp-<gui>' executables
@@ -119,6 +121,8 @@
        mv install-ruledit/usr/local/share/doc install-ruledit/doc
        mkdir -p install-ruledit/debuginfo
        cp build-ruledit/gen_headers/fc_config.h install-ruledit/debuginfo
+       mkdir -p install-ruledit/doc/freeciv/installer
+       cp licenses/COPYING.installer install-ruledit/doc/freeciv/installer/
        # delete unneeded files
        rm -r install-ruledit/usr
        # strip 'freeciv-ruledit' executable

Modified: branches/S2_6/win32/installer_msys2/create-freeciv-gtk-qt-nsi.sh
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer_msys2/create-freeciv-gtk-qt-nsi.sh?rev=31719&r1=31718&r2=31719&view=diff
==============================================================================
--- branches/S2_6/win32/installer_msys2/create-freeciv-gtk-qt-nsi.sh    
(original)
+++ branches/S2_6/win32/installer_msys2/create-freeciv-gtk-qt-nsi.sh    Tue Feb 
 2 19:10:59 2016
@@ -42,7 +42,7 @@
 ; Pages
 
 !insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_LICENSE "$1\doc\freeciv\COPYING"
+!insertmacro MUI_PAGE_LICENSE "$1\doc\freeciv\installer\COPYING.installer"
 !insertmacro MUI_PAGE_COMPONENTS
 Page custom DefaultLanguage DefaultLanguageLeave
 !insertmacro MULTIUSER_PAGE_INSTALLMODE

Modified: branches/S2_6/win32/installer_msys2/create-freeciv-ruledit-nsi.sh
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer_msys2/create-freeciv-ruledit-nsi.sh?rev=31719&r1=31718&r2=31719&view=diff
==============================================================================
--- branches/S2_6/win32/installer_msys2/create-freeciv-ruledit-nsi.sh   
(original)
+++ branches/S2_6/win32/installer_msys2/create-freeciv-ruledit-nsi.sh   Tue Feb 
 2 19:10:59 2016
@@ -40,7 +40,7 @@
 ; Pages
 
 !insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_LICENSE "$1\doc\freeciv\COPYING"
+!insertmacro MUI_PAGE_LICENSE "$1\doc\freeciv\installer\COPYING.installer"
 !insertmacro MUI_PAGE_COMPONENTS
 Page custom DefaultLanguage DefaultLanguageLeave
 !insertmacro MULTIUSER_PAGE_INSTALLMODE

Modified: branches/S2_6/win32/installer_msys2/create-freeciv-sdl-nsi.sh
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer_msys2/create-freeciv-sdl-nsi.sh?rev=31719&r1=31718&r2=31719&view=diff
==============================================================================
--- branches/S2_6/win32/installer_msys2/create-freeciv-sdl-nsi.sh       
(original)
+++ branches/S2_6/win32/installer_msys2/create-freeciv-sdl-nsi.sh       Tue Feb 
 2 19:10:59 2016
@@ -42,7 +42,7 @@
 ; Pages
 
 !insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_LICENSE "$1\doc\freeciv\COPYING"
+!insertmacro MUI_PAGE_LICENSE "$1\doc\freeciv\installer\COPYING.installer"
 !insertmacro MUI_PAGE_COMPONENTS
 Page custom DefaultLanguage DefaultLanguageLeave
 !insertmacro MULTIUSER_PAGE_INSTALLMODE

Copied: branches/S2_6/win32/installer_msys2/licenses/COPYING.installer (from 
r31717, branches/S2_6/COPYING)
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer_msys2/licenses/COPYING.installer?p2=branches/S2_6/win32/installer_msys2/licenses/COPYING.installer&p1=branches/S2_6/COPYING&r1=31717&r2=31719&rev=31719&view=diff
==============================================================================
--- branches/S2_6/COPYING       (original)
+++ branches/S2_6/win32/installer_msys2/licenses/COPYING.installer      Tue Feb 
 2 19:10:59 2016
@@ -1,3 +1,10 @@
+Freeciv is released under the GNU General Public License (version 2
+or, at your option, any later version).  In short, you may copy this
+program (including source) freely, but see the the full license text
+below for full details.
+
+-----------------------------------------------------------------------------
+
                     GNU GENERAL PUBLIC LICENSE
                        Version 2, June 1991
 


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to