Skip to content

Commit ebbfd82

Browse files
aquadranaquadran
committed
ALL: Upgrade tools licence to GPLv3+
1 parent b3e43f6 commit ebbfd82

File tree

279 files changed

+3074
-3250
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

279 files changed

+3074
-3250
lines changed

‎COPYING

Lines changed: 623 additions & 289 deletions
Large diffs are not rendered by default.

‎COPYING.LGPL

Lines changed: 0 additions & 508 deletions
This file was deleted.

‎COPYRIGHT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ScummVM Tools
2-
Copyright (C) 2001-2020 by the following:
2+
Copyright (C) 2001-2022 by the following:
33

44
If you have contributed to this project then you deserve to be on this
55
list. Contact us and we'll add you.

‎Makefile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@ endif
134134
$(STRIP) scummvm-tools-cli$(EXEEXT) -o $(WIN32PATH)/tools/scummvm-tools-cli$(EXEEXT)
135135
cp $(srcdir)/*.bat $(WIN32PATH)/tools
136136
cp $(srcdir)/COPYING $(WIN32PATH)/tools/COPYING.txt
137-
cp $(srcdir)/COPYING.LGPL $(WIN32PATH)/tools/COPYING_LGPL.txt
138137
cp $(srcdir)/COPYING.LUA $(WIN32PATH)/tools/COPYING_LUA.txt
139138
cp $(srcdir)/README $(WIN32PATH)/tools/README.txt
140139
cp $(srcdir)/NEWS $(WIN32PATH)/tools/NEWS.txt
@@ -148,7 +147,6 @@ WIN32BUILD=build
148147
win32setup: all
149148
mkdir -p $(srcdir)/$(WIN32BUILD)
150149
cp $(srcdir)/COPYING $(srcdir)/$(WIN32BUILD)
151-
cp $(srcdir)/COPYING.LGPL $(srcdir)/$(WIN32BUILD)
152150
cp $(srcdir)/COPYING.LUA $(srcdir)/$(WIN32BUILD)
153151
cp $(srcdir)/NEWS $(srcdir)/$(WIN32BUILD)
154152
cp $(srcdir)/README $(srcdir)/$(WIN32BUILD)
@@ -249,7 +247,6 @@ bundle: scummvm-tools-static
249247
osxsnap: bundle scummvm-tools-cli-static
250248
mkdir ScummVM-Tools-snapshot
251249
cp $(srcdir)/COPYING ./ScummVM-Tools-snapshot/License\ \(GPL\)
252-
cp $(srcdir)/COPYING.LGPL ./ScummVM-Tools-snapshot/License\ \(LGPL\)
253250
cp $(srcdir)/COPYING.LUA ./ScummVM-Tools-snapshot/License\ \(LUA\)
254251
cp $(srcdir)/NEWS ./ScummVM-Tools-snapshot/News
255252
cp $(srcdir)/README ./ScummVM-Tools-snapshot/ScummVM\ ReadMe
@@ -331,7 +328,6 @@ riscosdist: all riscosboot $(addprefix !ScummTool/bin/,$(addsuffix $(,)ff8,$(PRO
331328
cp ${srcdir}/dists/riscos/!Sprites11,ff9 !ScummTool/!Sprites11,ff9
332329
cp $(srcdir)/README !ScummTool/!Help,fff
333330
cp $(srcdir)/COPYING !ScummTool/COPYING,fff
334-
cp $(srcdir)/COPYING.LGPL !ScummTool/COPYING.LGPL,fff
335331
cp $(srcdir)/COPYING.LUA !ScummTool/COPYING.LUA,fff
336332
cp $(srcdir)/NEWS !ScummTool/NEWS,fff
337333
ifeq "$(USE_WXWIDGETS)" "1"

‎NEWS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ For a more comprehensive changelog of the latest experimental code, see:
22
https://github.com/scummvm/scummvm-tools/commits/
33

44
2.6.0 (XXXX-XX-XX)
5+
- The project license has been upgraded to GPLv3+.
56
- Added a tool to extract Sanitarium resource packs.
67
- Removed support for compressing BUN files.
78
- Added Grim engine tools.

‎common/algorithm.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
/* ScummVM Tools
22
*
3-
* ScummVM Tools is the legal property of its developers, whose
4-
* names are too numerous to list here. Please refer to the
5-
* COPYRIGHT file distributed with this source distribution.
3+
* ScummVM Tools is the legal property of its developers, whose names
4+
* are too numerous to list here. Please refer to the COPYRIGHT
5+
* file distributed with this source distribution.
66
*
77
* Additionally this file is based on the ScummVM source code.
88
* Copyright information for the ScummVM source code is
99
* available in the COPYRIGHT file of the ScummVM source
1010
* distribution.
1111
*
12-
* This program is free software; you can redistribute it and/or
13-
* modify it under the terms of the GNU General Public License
14-
* as published by the Free Software Foundation; either version 2
15-
* of the License, or (at your option) any later version.
12+
* This program is free software: you can redistribute it and/or modify
13+
* it under the terms of the GNU General Public License as published by
14+
* the Free Software Foundation, either version 3 of the License, or
15+
* (at your option) any later version.
1616
*
1717
* This program is distributed in the hope that it will be useful,
1818
* but WITHOUT ANY WARRANTY; without even the implied warranty of
1919
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2020
* GNU General Public License for more details.
2121
*
2222
* You should have received a copy of the GNU General Public License
23-
* along with this program; if not, write to the Free Software
24-
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
23+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
24+
*
2525
*/
2626

2727
#ifndef COMMON_ALGORITHM_H

‎common/array.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
/* ScummVM Tools
22
*
3-
* ScummVM Tools is the legal property of its developers, whose
4-
* names are too numerous to list here. Please refer to the
5-
* COPYRIGHT file distributed with this source distribution.
3+
* ScummVM Tools is the legal property of its developers, whose names
4+
* are too numerous to list here. Please refer to the COPYRIGHT
5+
* file distributed with this source distribution.
66
*
77
* Additionally this file is based on the ScummVM source code.
88
* Copyright information for the ScummVM source code is
99
* available in the COPYRIGHT file of the ScummVM source
1010
* distribution.
1111
*
12-
* This program is free software; you can redistribute it and/or
13-
* modify it under the terms of the GNU General Public License
14-
* as published by the Free Software Foundation; either version 2
15-
* of the License, or (at your option) any later version.
12+
* This program is free software: you can redistribute it and/or modify
13+
* it under the terms of the GNU General Public License as published by
14+
* the Free Software Foundation, either version 3 of the License, or
15+
* (at your option) any later version.
1616
*
1717
* This program is distributed in the hope that it will be useful,
1818
* but WITHOUT ANY WARRANTY; without even the implied warranty of
1919
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2020
* GNU General Public License for more details.
2121
*
2222
* You should have received a copy of the GNU General Public License
23-
* along with this program; if not, write to the Free Software
24-
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
23+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
24+
*
2525
*/
2626

2727
#ifndef COMMON_ARRAY_H

‎common/endian.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
/* ScummVM Tools
22
*
3-
* ScummVM Tools is the legal property of its developers, whose
4-
* names are too numerous to list here. Please refer to the
5-
* COPYRIGHT file distributed with this source distribution.
3+
* ScummVM Tools is the legal property of its developers, whose names
4+
* are too numerous to list here. Please refer to the COPYRIGHT
5+
* file distributed with this source distribution.
66
*
77
* Additionally this file is based on the ScummVM source code.
88
* Copyright information for the ScummVM source code is
99
* available in the COPYRIGHT file of the ScummVM source
1010
* distribution.
1111
*
12-
* This program is free software; you can redistribute it and/or
13-
* modify it under the terms of the GNU General Public License
14-
* as published by the Free Software Foundation; either version 2
15-
* of the License, or (at your option) any later version.
12+
* This program is free software: you can redistribute it and/or modify
13+
* it under the terms of the GNU General Public License as published by
14+
* the Free Software Foundation, either version 3 of the License, or
15+
* (at your option) any later version.
1616
*
1717
* This program is distributed in the hope that it will be useful,
1818
* but WITHOUT ANY WARRANTY; without even the implied warranty of
1919
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2020
* GNU General Public License for more details.
2121
*
2222
* You should have received a copy of the GNU General Public License
23-
* along with this program; if not, write to the Free Software
24-
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
23+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
24+
*
2525
*/
2626

2727
#ifndef COMMON_ENDIAN_H

‎common/file.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
/* ScummVM Tools
22
*
3-
* ScummVM Tools is the legal property of its developers, whose
4-
* names are too numerous to list here. Please refer to the
5-
* COPYRIGHT file distributed with this source distribution.
3+
* ScummVM Tools is the legal property of its developers, whose names
4+
* are too numerous to list here. Please refer to the COPYRIGHT
5+
* file distributed with this source distribution.
66
*
77
* Additionally this file is based on the ScummVM source code.
88
* Copyright information for the ScummVM source code is
99
* available in the COPYRIGHT file of the ScummVM source
1010
* distribution.
1111
*
12-
* This program is free software; you can redistribute it and/or
13-
* modify it under the terms of the GNU General Public License
14-
* as published by the Free Software Foundation; either version 2
15-
* of the License, or (at your option) any later version.
12+
* This program is free software: you can redistribute it and/or modify
13+
* it under the terms of the GNU General Public License as published by
14+
* the Free Software Foundation, either version 3 of the License, or
15+
* (at your option) any later version.
1616
*
1717
* This program is distributed in the hope that it will be useful,
1818
* but WITHOUT ANY WARRANTY; without even the implied warranty of
1919
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2020
* GNU General Public License for more details.
2121
*
2222
* You should have received a copy of the GNU General Public License
23-
* along with this program; if not, write to the Free Software
24-
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
23+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
24+
*
2525
*/
2626

2727
#include "file.h"

‎common/file.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
/* ScummVM Tools
22
*
3-
* ScummVM Tools is the legal property of its developers, whose
4-
* names are too numerous to list here. Please refer to the
5-
* COPYRIGHT file distributed with this source distribution.
3+
* ScummVM Tools is the legal property of its developers, whose names
4+
* are too numerous to list here. Please refer to the COPYRIGHT
5+
* file distributed with this source distribution.
66
*
77
* Additionally this file is based on the ScummVM source code.
88
* Copyright information for the ScummVM source code is
99
* available in the COPYRIGHT file of the ScummVM source
1010
* distribution.
1111
*
12-
* This program is free software; you can redistribute it and/or
13-
* modify it under the terms of the GNU General Public License
14-
* as published by the Free Software Foundation; either version 2
15-
* of the License, or (at your option) any later version.
12+
* This program is free software: you can redistribute it and/or modify
13+
* it under the terms of the GNU General Public License as published by
14+
* the Free Software Foundation, either version 3 of the License, or
15+
* (at your option) any later version.
1616
*
1717
* This program is distributed in the hope that it will be useful,
1818
* but WITHOUT ANY WARRANTY; without even the implied warranty of
1919
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2020
* GNU General Public License for more details.
2121
*
2222
* You should have received a copy of the GNU General Public License
23-
* along with this program; if not, write to the Free Software
24-
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
23+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
24+
*
2525
*/
2626

2727
#ifndef COMMON_FILE_H

‎common/func.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
/* ScummVM Tools
22
*
3-
* ScummVM Tools is the legal property of its developers, whose
4-
* names are too numerous to list here. Please refer to the
5-
* COPYRIGHT file distributed with this source distribution.
3+
* ScummVM Tools is the legal property of its developers, whose names
4+
* are too numerous to list here. Please refer to the COPYRIGHT
5+
* file distributed with this source distribution.
66
*
77
* Additionally this file is based on the ScummVM source code.
88
* Copyright information for the ScummVM source code is
99
* available in the COPYRIGHT file of the ScummVM source
1010
* distribution.
1111
*
12-
* This program is free software; you can redistribute it and/or
13-
* modify it under the terms of the GNU General Public License
14-
* as published by the Free Software Foundation; either version 2
15-
* of the License, or (at your option) any later version.
12+
* This program is free software: you can redistribute it and/or modify
13+
* it under the terms of the GNU General Public License as published by
14+
* the Free Software Foundation, either version 3 of the License, or
15+
* (at your option) any later version.
1616
*
1717
* This program is distributed in the hope that it will be useful,
1818
* but WITHOUT ANY WARRANTY; without even the implied warranty of
1919
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2020
* GNU General Public License for more details.
2121
*
2222
* You should have received a copy of the GNU General Public License
23-
* along with this program; if not, write to the Free Software
24-
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
23+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
24+
*
2525
*/
2626

2727
#ifndef COMMON_FUNC_H

‎common/hash-str.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
/* ScummVM Tools
22
*
3-
* ScummVM Tools is the legal property of its developers, whose
4-
* names are too numerous to list here. Please refer to the
5-
* COPYRIGHT file distributed with this source distribution.
3+
* ScummVM Tools is the legal property of its developers, whose names
4+
* are too numerous to list here. Please refer to the COPYRIGHT
5+
* file distributed with this source distribution.
66
*
77
* Additionally this file is based on the ScummVM source code.
88
* Copyright information for the ScummVM source code is
99
* available in the COPYRIGHT file of the ScummVM source
1010
* distribution.
1111
*
12-
* This program is free software; you can redistribute it and/or
13-
* modify it under the terms of the GNU General Public License
14-
* as published by the Free Software Foundation; either version 2
15-
* of the License, or (at your option) any later version.
12+
* This program is free software: you can redistribute it and/or modify
13+
* it under the terms of the GNU General Public License as published by
14+
* the Free Software Foundation, either version 3 of the License, or
15+
* (at your option) any later version.
1616
*
1717
* This program is distributed in the hope that it will be useful,
1818
* but WITHOUT ANY WARRANTY; without even the implied warranty of
1919
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2020
* GNU General Public License for more details.
2121
*
2222
* You should have received a copy of the GNU General Public License
23-
* along with this program; if not, write to the Free Software
24-
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
23+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
24+
*
2525
*/
2626

2727
#ifndef COMMON_HASH_STR_H

‎common/hashmap.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
/* ScummVM Tools
22
*
3-
* ScummVM Tools is the legal property of its developers, whose
4-
* names are too numerous to list here. Please refer to the
5-
* COPYRIGHT file distributed with this source distribution.
3+
* ScummVM Tools is the legal property of its developers, whose names
4+
* are too numerous to list here. Please refer to the COPYRIGHT
5+
* file distributed with this source distribution.
66
*
77
* Additionally this file is based on the ScummVM source code.
88
* Copyright information for the ScummVM source code is
99
* available in the COPYRIGHT file of the ScummVM source
1010
* distribution.
1111
*
12-
* This program is free software; you can redistribute it and/or
13-
* modify it under the terms of the GNU General Public License
14-
* as published by the Free Software Foundation; either version 2
15-
* of the License, or (at your option) any later version.
12+
* This program is free software: you can redistribute it and/or modify
13+
* it under the terms of the GNU General Public License as published by
14+
* the Free Software Foundation, either version 3 of the License, or
15+
* (at your option) any later version.
1616
*
1717
* This program is distributed in the hope that it will be useful,
1818
* but WITHOUT ANY WARRANTY; without even the implied warranty of
1919
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2020
* GNU General Public License for more details.
2121
*
2222
* You should have received a copy of the GNU General Public License
23-
* along with this program; if not, write to the Free Software
24-
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
23+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
24+
*
2525
*/
2626

2727
// The hash map (associative array) implementation in this file is

‎common/hashmap.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
/* ScummVM Tools
22
*
3-
* ScummVM Tools is the legal property of its developers, whose
4-
* names are too numerous to list here. Please refer to the
5-
* COPYRIGHT file distributed with this source distribution.
3+
* ScummVM Tools is the legal property of its developers, whose names
4+
* are too numerous to list here. Please refer to the COPYRIGHT
5+
* file distributed with this source distribution.
66
*
77
* Additionally this file is based on the ScummVM source code.
88
* Copyright information for the ScummVM source code is
99
* available in the COPYRIGHT file of the ScummVM source
1010
* distribution.
1111
*
12-
* This program is free software; you can redistribute it and/or
13-
* modify it under the terms of the GNU General Public License
14-
* as published by the Free Software Foundation; either version 2
15-
* of the License, or (at your option) any later version.
12+
* This program is free software: you can redistribute it and/or modify
13+
* it under the terms of the GNU General Public License as published by
14+
* the Free Software Foundation, either version 3 of the License, or
15+
* (at your option) any later version.
1616
*
1717
* This program is distributed in the hope that it will be useful,
1818
* but WITHOUT ANY WARRANTY; without even the implied warranty of
1919
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2020
* GNU General Public License for more details.
2121
*
2222
* You should have received a copy of the GNU General Public License
23-
* along with this program; if not, write to the Free Software
24-
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
23+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
24+
*
2525
*/
2626

2727
// The hash map (associative array) implementation in this file is

0 commit comments

Comments
 (0)