Skip to content

Commit

Permalink
JANITORIAL: cleanup licences
Browse files Browse the repository at this point in the history
  • Loading branch information
aquadran committed Feb 16, 2014
1 parent 728dc1f commit 9f54d1a
Show file tree
Hide file tree
Showing 15 changed files with 102 additions and 7 deletions.
38 changes: 38 additions & 0 deletions COPYING.LUA
@@ -0,0 +1,38 @@
NOTE: ResidualVM uses code from Lua, which is covered by the following license.
This implementation of Lua contains additional code and modifications added
only for ResidualVM project.
Look into the source code file "engines/grim/lua/Changelog" for more info.

/******************************************************************************
* Copyright (c) 1994-1998 TeCGraf, PUC-Rio. All rights reserved.
*
* Permission is hereby granted, without written agreement and without license
* or royalty fees, to use, copy, modify, and distribute this software and its
* documentation for any purpose, including commercial applications, subject to
* the following conditions:
*
* - The above copyright notice and this permission notice shall appear in all
* copies or substantial portions of this software.
*
* - The origin of this software must not be misrepresented; you must not
* claim that you wrote the original software. If you use this software in a
* product, an acknowledgment in the product documentation would be greatly
* appreciated (but it is not required).
*
* - Altered source versions must be plainly marked as such, and must not be
* misrepresented as being the original software.
*
* The authors specifically disclaim any warranties, including, but not limited
* to, the implied warranties of merchantability and fitness for a particular
* purpose. The software provided hereunder is on an "as is" basis, and the
* authors have no obligation to provide maintenance, support, updates,
* enhancements, or modifications. In no event shall TeCGraf, PUC-Rio, or the
* authors be held liable to any party for direct, indirect, special,
* incidental, or consequential damages arising out of the use of this software
* and its documentation.
*
* The Lua language and this implementation have been entirely designed and
* written by Waldemar Celes Filho, Roberto Ierusalimschy and
* Luiz Henrique de Figueiredo at TeCGraf, PUC-Rio.
*
******************************************************************************/
28 changes: 28 additions & 0 deletions COPYING.TINYGL
@@ -0,0 +1,28 @@
NOTE: ResidualVM uses code from TinyGL, which is covered by the following license.
This implementation of TinyGL contains additional code and modifications
added only for ResidualVM project.
Look into the source code file "graphics/tinygl/Changelog" for more info.


Copyright notice:

(C) 1997-1998 Fabrice Bellard

This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.

Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:

1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product and its documentation
*is* required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.

If you redistribute modified sources, I would appreciate that you
include in the files history information documenting your changes.
2 changes: 1 addition & 1 deletion Makefile.common
Expand Up @@ -233,7 +233,7 @@ dist-src: \
@#DEB-src?

# Common files
DIST_FILES_DOCS:=$(addprefix $(srcdir)/,AUTHORS COPYING COPYING.BSD COPYING.LGPL COPYING.FREEFONT COPYRIGHT KNOWN_BUGS NEWS README)
DIST_FILES_DOCS:=$(addprefix $(srcdir)/,AUTHORS COPYING COPYING.BSD COPYING.LGPL COPYING.FREEFONT COPYING.ISC COPYING.LUA COPYING.TINYGL COPYRIGHT KNOWN_BUGS NEWS README)

# Themes files
DIST_FILES_THEMES=modern.zip
Expand Down
4 changes: 4 additions & 0 deletions devtools/create_project/create_project.cpp
Expand Up @@ -1320,7 +1320,11 @@ void ProjectProvider::createProject(BuildSetup &setup) {
in.push_back(setup.srcDir + "/COPYING.FREEFONT");
in.push_back(setup.srcDir + "/COPYRIGHT");
//ResidualVM specific:
in.push_back(setup.srcDir + "/COPYING.ISC");
in.push_back(setup.srcDir + "/COPYING.LUA");
in.push_back(setup.srcDir + "/COPYING.TINYGL");
in.push_back(setup.srcDir + "/KNOWN_BUGS");

in.push_back(setup.srcDir + "/NEWS");
in.push_back(setup.srcDir + "/README");
in.push_back(setup.srcDir + "/TODO");
Expand Down
3 changes: 2 additions & 1 deletion dists/debian/copyright
Expand Up @@ -7,7 +7,8 @@ Copyright:
Most of the files are released under the GNU General Public License v2.
Some other source files are released under GNU Lesser General Public
License v2 and BSD licenses.
See COPYING.BSD, COPYING.LGPL and COPYING.FREEFONT.
See COPYING.BSD, COPYING.LGPL, COPYING.FREEFONT, COPYING.ISC, COPYING.LUA
and COPYING.TINYGL.
The Debian packaging is licensed under the GPL.

ResidualVM is Copyright © 2003-2014 The ResidualVM Team
Expand Down
3 changes: 3 additions & 0 deletions dists/irix/residualvm.idb
Expand Up @@ -2,6 +2,9 @@ f 0644 root sys usr/ResidualVM/COPYING COPYING residualvm.man.readme
f 0644 root sys usr/ResidualVM/COPYING.LGPL COPYING.LGPL residualvm.man.readme
f 0644 root sys usr/ResidualVM/COPYING.BSD COPYING.BSD residualvm.man.readme
f 0644 root sys usr/ResidualVM/COPYING.FREEFONT COPYING.FREEFONT residualvm.man.readme
f 0644 root sys usr/ResidualVM/COPYING.ISC COPYING.ISC residualvm.man.readme
f 0644 root sys usr/ResidualVM/COPYING.LUA COPYING.LUA residualvm.man.readme
f 0644 root sys usr/ResidualVM/COPYING.TINYGL COPYING.TINYGL residualvm.man.readme
f 0644 root sys usr/ResidualVM/COPYRIGHT COPYRIGHT residualvm.man.readme
f 0644 root sys usr/ResidualVM/KNOWN_BUGS KNOWN_BUGS residualvm.man.readme
f 0644 root sys usr/ResidualVM/NEWS NEWS residualvm.man.readme
Expand Down
2 changes: 1 addition & 1 deletion dists/redhat/residualvm.spec
Expand Up @@ -76,7 +76,7 @@ fi
#------------------------------------------------------------------------------
%files
%defattr(0644,root,root,0755)
%doc AUTHORS README KNOWN_BUGS NEWS COPYING COPYING.LGPL COPYING.BSD COPYING.FREEFONT COPYRIGHT
%doc AUTHORS README KNOWN_BUGS NEWS COPYING COPYING.LGPL COPYING.BSD COPYING.FREEFONT COPYING.ISC COPYING.LUA COPYING.TINYGL COPYRIGHT
%attr(0755,root,root)%{_bindir}/residualvm
%{_datadir}/applications/*
%{_datadir}/pixmaps/residualvm.xpm
Expand Down
2 changes: 1 addition & 1 deletion dists/redhat/residualvm.spec.in
Expand Up @@ -76,7 +76,7 @@ fi
#------------------------------------------------------------------------------
%files
%defattr(0644,root,root,0755)
%doc AUTHORS README KNOWN_BUGS NEWS COPYING COPYING.LGPL COPYING.BSD COPYING.FREEFONT COPYRIGHT
%doc AUTHORS README KNOWN_BUGS NEWS COPYING COPYING.LGPL COPYING.BSD COPYING.FREEFONT COPYING.ISC COPYING.LUA COPYING.TINYGL COPYRIGHT
%attr(0755,root,root)%{_bindir}/residualvm
%{_datadir}/applications/*
%{_datadir}/pixmaps/residualvm.xpm
Expand Down
6 changes: 6 additions & 0 deletions dists/win32/ResidualVM.iss
Expand Up @@ -31,6 +31,9 @@ Name: {group}\Copying; Filename: {app}\COPYING.txt; WorkingDir: {app}; Comment:
Name: {group}\Copying.FREEFONT; Filename: {app}\COPYING.FREEFONT.txt; WorkingDir: {app}; Comment: COPYING.FREEFONT; Flags: createonlyiffileexists
Name: {group}\Copying.BSD; Filename: {app}\COPYING.BSD.txt; WorkingDir: {app}; Comment: COPYING.BSD; Flags: createonlyiffileexists
Name: {group}\Copying.LGPL; Filename: {app}\COPYING.LGPL.txt; WorkingDir: {app}; Comment: COPYING.LGPL; Flags: createonlyiffileexists
Name: {group}\Copying.ISC; Filename: {app}\COPYING.LGPL.txt; WorkingDir: {app}; Comment: COPYING.ISC; Flags: createonlyiffileexists
Name: {group}\Copying.LUA; Filename: {app}\COPYING.LGPL.txt; WorkingDir: {app}; Comment: COPYING.LUA; Flags: createonlyiffileexists
Name: {group}\Copying.TINYGL; Filename: {app}\COPYING.LGPL.txt; WorkingDir: {app}; Comment: COPYING.TINYGL; Flags: createonlyiffileexists
Name: {group}\Copyright; Filename: {app}\COPYRIGHT.txt; WorkingDir: {app}; Comment: COPYRIGHT; Flags: createonlyiffileexists
Name: {group}\KnownBugs; Filename: {app}\KNOWN_BUGS.txt; WorkingDir: {app}; Comment: KNOWN_BUGS; Flags: createonlyiffileexists
;NEWS
Expand Down Expand Up @@ -58,6 +61,9 @@ Source: COPYING.txt; DestDir: {app}; Flags: ignoreversion
Source: COPYING.FREEFONT.txt; DestDir: {app}; Flags: ignoreversion
Source: COPYING.BSD.txt; DestDir: {app}; Flags: ignoreversion
Source: COPYING.LGPL.txt; DestDir: {app}; Flags: ignoreversion
Source: COPYING.ISC.txt; DestDir: {app}; Flags: ignoreversion
Source: COPYING.LUA.txt; DestDir: {app}; Flags: ignoreversion
Source: COPYING.TINYGL.txt; DestDir: {app}; Flags: ignoreversion
Source: COPYRIGHT.txt; DestDir: {app}; Flags: ignoreversion
Source: KNOWN_BUGS.txt; DestDir: {app}; Flags: ignoreversion
;NEWS
Expand Down
File renamed without changes.
6 changes: 4 additions & 2 deletions engines/grim/lua/lua.h
Expand Up @@ -209,8 +209,10 @@ lua_Object lua_setfallback(const char *event, lua_CFunction fallback);
* The Lua language and this implementation have been entirely designed and
* written by Waldemar Celes Filho, Roberto Ierusalimschy and
* Luiz Henrique de Figueiredo at TeCGraf, PUC-Rio.
* This implementation contains third-party code but added only for
* ResidualVM project. Look into the README.residualvm file for more info.
*
* NOTE: This implementation of Lua contains additional code and
* modifications added only for ResidualVM project.
* Look into the source code file "Changelog" for more info.
******************************************************************************/

} // end of namespace Grim
Expand Down
File renamed without changes.
4 changes: 4 additions & 0 deletions graphics/tinygl/LICENCE
@@ -1,3 +1,7 @@
NOTE: This implementation of TinyGL contains additional code and
modifications added only for ResidualVM project.
Look into the source code file "Changelog" for more info.

Copyright notice:

(C) 1997-1998 Fabrice Bellard
Expand Down
2 changes: 1 addition & 1 deletion gui/themes/fonts/README
@@ -1,4 +1,4 @@
These are fonts used in ScummVM. Most of them come from Xorg.
These are fonts used in ResidualVM. Most of them come from Xorg.

The GNU FreeFont files are distributed under the license in COPYING.FREEFONT.

Expand Down
9 changes: 9 additions & 0 deletions ports.mk
Expand Up @@ -217,6 +217,8 @@ osxsnap: bundle
cp $(srcdir)/COPYING.LGPL ./ResidualVM-snapshot/License\ \(LGPL\)
cp $(srcdir)/COPYING.FREEFONT ./ResidualVM-snapshot/License\ \(FREEFONT\)
cp $(srcdir)/COPYING.ISC ./ResidualVM-snapshot/License\ \(ISC\)
cp $(srcdir)/COPYING.LUA ./ResidualVM-snapshot/License\ \(Lua\)
cp $(srcdir)/COPYING.TINYGL ./ResidualVM-snapshot/License\ \(TinyGL\)
cp $(srcdir)/COPYRIGHT ./ResidualVM-snapshot/Copyright\ Holders
cp $(srcdir)/KNOWN_BUGS ./ResidualVM-snapshot/Known\ Bugs
cp $(srcdir)/NEWS ./ResidualVM-snapshot/News
Expand Down Expand Up @@ -257,6 +259,9 @@ endif
cp $(srcdir)/COPYING.BSD $(WIN32PATH)/COPYING.BSD.txt
cp $(srcdir)/COPYING.LGPL $(WIN32PATH)/COPYING.LGPL.txt
cp $(srcdir)/COPYING.FREEFONT $(WIN32PATH)/COPYING.FREEFONT.txt
cp $(srcdir)/COPYING.ISC $(WIN32PATH)/COPYING.ISC.txt
cp $(srcdir)/COPYING.LUA $(WIN32PATH)/COPYING.LUA.txt
cp $(srcdir)/COPYING.TINYGL $(WIN32PATH)/COPYING.TINYGL.txt
cp $(srcdir)/COPYRIGHT $(WIN32PATH)/COPYRIGHT.txt
cp $(srcdir)/KNOWN_BUGS $(WIN32PATH)/KNOWN_BUGS.txt
cp $(srcdir)/NEWS $(WIN32PATH)/NEWS.txt
Expand Down Expand Up @@ -324,6 +329,8 @@ endif
cp $(srcdir)/COPYING.LGPL ResidualVMWin32/COPYING.LGPL.txt
cp $(srcdir)/COPYING.FREEFONT ResidualVMWin32/COPYING.FREEFONT.txt
cp $(srcdir)/COPYING.ISC ResidualVMWin32/COPYING.ISC.txt
cp $(srcdir)/COPYING.LUA ResidualVMWin32/COPYING.LUA.txt
cp $(srcdir)/COPYING.TINYGL ResidualVMWin32/COPYING.TINYGL.txt
cp $(srcdir)/COPYRIGHT ResidualVMWin32/COPYRIGHT.txt
cp $(srcdir)/KNOWN_BUGS ResidualVMWin32/KNOWN_BUGS.txt
cp $(srcdir)/NEWS ResidualVMWin32/NEWS.txt
Expand Down Expand Up @@ -369,6 +376,8 @@ endif
cp $(srcdir)/COPYING.LGPL ResidualVM/COPYING.LGPL.txt
cp $(srcdir)/COPYING.FREEFONT ResidualVM/COPYING.FREEFONT.txt
cp $(srcdir)/COPYING.ISC ResidualVM/COPYING.ISC.txt
cp $(srcdir)/COPYING.LUA ResidualVM/COPYING.LUA.txt
cp $(srcdir)/COPYING.TINYGL ResidualVM/COPYING.TINYGL.txt
cp $(srcdir)/COPYRIGHT ResidualVM/COPYRIGHT.txt
cp $(srcdir)/KNOWN_BUGS ResidualVM/KNOWN_BUGS.txt
cp $(srcdir)/NEWS ResidualVM/NEWS.txt
Expand Down

0 comments on commit 9f54d1a

Please sign in to comment.