[Scummvm-git-logs] scummvm-tools master -> 6fe51a1bfe9bc76efbd7a25808c8c257d7b906c0
aquadran
noreply at scummvm.org
Sat Jul 16 22:02:50 UTC 2022
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm-tools' repo located at https://github.com/scummvm/scummvm-tools .
Summary:
6fe51a1bfe ALL: Add missing license file
Commit: 6fe51a1bfe9bc76efbd7a25808c8c257d7b906c0
https://github.com/scummvm/scummvm-tools/commit/6fe51a1bfe9bc76efbd7a25808c8c257d7b906c0
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2022-07-17T00:02:46+02:00
Commit Message:
ALL: Add missing license file
Changed paths:
A COPYING.BSD2
Makefile
dists/win32/ScummVM Tools.iss
dists/win32/scummvm-tools.nsi
dists/win32/scummvm-tools.nsi.in
diff --git a/COPYING.BSD2 b/COPYING.BSD2
new file mode 100644
index 00000000..cc207e97
--- /dev/null
+++ b/COPYING.BSD2
@@ -0,0 +1,23 @@
+ Copyright 2003-2005 Colin Percival
+ All rights reserved
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted providing that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
diff --git a/Makefile b/Makefile
index cfdaf022..78c4fb66 100644
--- a/Makefile
+++ b/Makefile
@@ -134,6 +134,7 @@ endif
$(STRIP) scummvm-tools-cli$(EXEEXT) -o $(WIN32PATH)/tools/scummvm-tools-cli$(EXEEXT)
cp $(srcdir)/*.bat $(WIN32PATH)/tools
cp $(srcdir)/COPYING $(WIN32PATH)/tools/COPYING.txt
+ cp $(srcdir)/COPYING.BSD2 $(WIN32PATH)/tools/COPYING_BSD2.txt
cp $(srcdir)/COPYING.LUA $(WIN32PATH)/tools/COPYING_LUA.txt
cp $(srcdir)/README $(WIN32PATH)/tools/README.txt
cp $(srcdir)/NEWS $(WIN32PATH)/tools/NEWS.txt
@@ -147,6 +148,7 @@ WIN32BUILD=build
win32setup: all
mkdir -p $(srcdir)/$(WIN32BUILD)
cp $(srcdir)/COPYING $(srcdir)/$(WIN32BUILD)
+ cp $(srcdir)/COPYING.BSD2 $(srcdir)/$(WIN32BUILD)
cp $(srcdir)/COPYING.LUA $(srcdir)/$(WIN32BUILD)
cp $(srcdir)/NEWS $(srcdir)/$(WIN32BUILD)
cp $(srcdir)/README $(srcdir)/$(WIN32BUILD)
@@ -247,6 +249,7 @@ bundle: scummvm-tools-static
osxsnap: bundle scummvm-tools-cli-static
mkdir ScummVM-Tools-snapshot
cp $(srcdir)/COPYING ./ScummVM-Tools-snapshot/License\ \(GPL\)
+ cp $(srcdir)/COPYING.BSD2 ./ScummVM-Tools-snapshot/License\ \(BSD2\)
cp $(srcdir)/COPYING.LUA ./ScummVM-Tools-snapshot/License\ \(LUA\)
cp $(srcdir)/NEWS ./ScummVM-Tools-snapshot/News
cp $(srcdir)/README ./ScummVM-Tools-snapshot/ScummVM\ ReadMe
@@ -272,6 +275,8 @@ amigaosdist: all
mkdir -p $(AMIGAOSPATH)/media
# Install documents
cp $(srcdir)/COPYING $(AMIGAOSPATH)/doc/
+ cp $(srcdir)/COPYING.BSD2 $(AMIGAOSPATH)/doc/
+ cp $(srcdir)/COPYING.LUA $(AMIGAOSPATH)/doc/
cp $(srcdir)/COPYRIGHT $(AMIGAOSPATH)/doc/
cp $(srcdir)/NEWS $(AMIGAOSPATH)/doc/
cp $(srcdir)/README $(AMIGAOSPATH)/doc/
@@ -328,6 +333,7 @@ riscosdist: all riscosboot $(addprefix !ScummTool/bin/,$(addsuffix $(,)ff8,$(PRO
cp ${srcdir}/dists/riscos/!Sprites11,ff9 !ScummTool/!Sprites11,ff9
cp $(srcdir)/README !ScummTool/!Help,fff
cp $(srcdir)/COPYING !ScummTool/COPYING,fff
+ cp $(srcdir)/COPYING.BSD2 !ScummTool/COPYING.BSD2,fff
cp $(srcdir)/COPYING.LUA !ScummTool/COPYING.LUA,fff
cp $(srcdir)/NEWS !ScummTool/NEWS,fff
ifeq "$(USE_WXWIDGETS)" "1"
diff --git a/dists/win32/ScummVM Tools.iss b/dists/win32/ScummVM Tools.iss
index 42391273..a0ed6e7c 100755
--- a/dists/win32/ScummVM Tools.iss
+++ b/dists/win32/ScummVM Tools.iss
@@ -25,7 +25,7 @@ WizardImageFile=graphics\left.bmp
Source: "tools\construct_mohawk.exe"; DestDir: "{app}"; Flags: ignoreversion
Source: "tools\convert_dxa.bat"; DestDir: "{app}"; Flags: ignoreversion
Source: "tools\COPYING.txt"; DestDir: "{app}"; Flags: ignoreversion
-Source: "tools\COPYING_LGPL.txt"; DestDir: "{app}"; Flags: ignoreversion
+Source: "tools\COPYING_BSD2.txt"; DestDir: "{app}"; Flags: ignoreversion
Source: "tools\COPYING_LUA.txt"; DestDir: "{app}"; Flags: ignoreversion
Source: "tools\create_sjisfnt.exe"; DestDir: "{app}"; Flags: ignoreversion
Source: "tools\decine.exe"; DestDir: "{app}"; Flags: ignoreversion
diff --git a/dists/win32/scummvm-tools.nsi b/dists/win32/scummvm-tools.nsi
index 3d6c01ca..92f3170a 100644
--- a/dists/win32/scummvm-tools.nsi
+++ b/dists/win32/scummvm-tools.nsi
@@ -222,6 +222,7 @@ Section "ScummVM" SecMain
# Text files
File /oname=COPYING.txt "${text_dir}\COPYING"
+ File /oname=COPYING_BSD2.txt "${text_dir}\COPYING.BSD2"
File /oname=COPYING_LUA.txt "${text_dir}\COPYING.LUA"
File /oname=NEWS.txt "${text_dir}\NEWS"
File /oname=README.txt "${text_dir}\README"
@@ -300,7 +301,7 @@ FunctionEnd
#########################################################################################
Section -un.Main SecUninstall
Delete /REBOOTOK $INSTDIR\COPYING.txt
- Delete /REBOOTOK $INSTDIR\COPYING_LGPL.txt
+ Delete /REBOOTOK $INSTDIR\COPYING_BSD2.txt
Delete /REBOOTOK $INSTDIR\COPYING_LUA.txt
Delete /REBOOTOK $INSTDIR\NEWS.txt
Delete /REBOOTOK $INSTDIR\README.txt
diff --git a/dists/win32/scummvm-tools.nsi.in b/dists/win32/scummvm-tools.nsi.in
index 55c0669d..d9b2919b 100644
--- a/dists/win32/scummvm-tools.nsi.in
+++ b/dists/win32/scummvm-tools.nsi.in
@@ -222,6 +222,7 @@ Section "ScummVM" SecMain
# Text files
File /oname=COPYING.txt "${text_dir}\COPYING"
+ File /oname=COPYING_BSD2.txt "${text_dir}\COPYING.BSD2"
File /oname=COPYING_LUA.txt "${text_dir}\COPYING.LUA"
File /oname=NEWS.txt "${text_dir}\NEWS"
File /oname=README.txt "${text_dir}\README"
@@ -300,7 +301,7 @@ FunctionEnd
#########################################################################################
Section -un.Main SecUninstall
Delete /REBOOTOK $INSTDIR\COPYING.txt
- Delete /REBOOTOK $INSTDIR\COPYING_LGPL.txt
+ Delete /REBOOTOK $INSTDIR\COPYING_BSD2.txt
Delete /REBOOTOK $INSTDIR\COPYING_LUA.txt
Delete /REBOOTOK $INSTDIR\NEWS.txt
Delete /REBOOTOK $INSTDIR\README.txt
More information about the Scummvm-git-logs
mailing list