Skip to content

Commit

Permalink
COMMON: added missing BSD license since mpeg video code use it
Browse files Browse the repository at this point in the history
  • Loading branch information
aquadran committed Mar 12, 2012
1 parent 82087c5 commit 9a9ca18
Show file tree
Hide file tree
Showing 5 changed files with 73 additions and 2 deletions.
65 changes: 65 additions & 0 deletions COPYING.BSD
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
NOTE: Only certain parts of the ResidualVM project are under the BSD license.
The majority of the files are under the GNU GPL. See the headers of the
individual files to find out the exact license.

The term "BSD license" refers to any BSD-like license, as they are sometimes
hard to tell apart. No slight against other licenses is intended.

Parts of the MPEG decoder use the following license:

Copyright (c) 1995 The Regents of the University of California.
All rights reserved.

Permission to use, copy, modify, and distribute this software and its
documentation for any purpose, without fee, and without written agreement is
hereby granted, provided that the above copyright notice and the following
two paragraphs appear in all copies of this software.

IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF
CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS 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 UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.

Copyright (c) 1995 Erik Corry
All rights reserved.

Permission to use, copy, modify, and distribute this software and its
documentation for any purpose, without fee, and without written agreement is
hereby granted, provided that the above copyright notice and the following
two paragraphs appear in all copies of this software.

IN NO EVENT SHALL ERIK CORRY BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF
THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF ERIK CORRY HAS BEEN ADVISED
OF THE POSSIBILITY OF SUCH DAMAGE.

ERIK CORRY SPECIFICALLY DISCLAIMS 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 ERIK CORRY HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT,
UPDATES, ENHANCEMENTS, OR MODIFICATIONS.

Portions of this software Copyright (c) 1995 Brown University.
All rights reserved.

Permission to use, copy, modify, and distribute this software and its
documentation for any purpose, without fee, and without written agreement
is hereby granted, provided that the above copyright notice and the
following two paragraphs appear in all copies of this software.

IN NO EVENT SHALL BROWN UNIVERSITY BE LIABLE TO ANY PARTY FOR
DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT
OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF BROWN
UNIVERSITY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

BROWN UNIVERSITY SPECIFICALLY DISCLAIMS 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 BROWN UNIVERSITY HAS NO OBLIGATION TO PROVIDE MAINTENANCE,
SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
2 changes: 1 addition & 1 deletion Makefile.common
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ dist-src: \
@#DEB-src?

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

# Themes files
DIST_FILES_THEMES=modern.zip
Expand Down
2 changes: 1 addition & 1 deletion dists/debian/copyright
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ 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.
License v2 and BSD licenses. See COPYING.BSD and COPYING.LGPL and COPYING.FREEFONT.
The Debian packaging is licensed under the GPL.

ResidualVM includes Lua licensed code:
Expand Down
2 changes: 2 additions & 0 deletions dists/win32/ResidualVM.iss
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ Name: {group}\ResidualVM (noconsole); Filename: {app}\residualvm.exe; Parameters
Name: {group}\Authors; Filename: {app}\AUTHORS.txt; WorkingDir: {app}; Comment: AUTHORS; Flags: createonlyiffileexists
Name: {group}\Copying; Filename: {app}\COPYING.txt; WorkingDir: {app}; Comment: COPYING; Flags: createonlyiffileexists
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}\Copyright; Filename: {app}\COPYRIGHT.txt; WorkingDir: {app}; Comment: COPYRIGHT; Flags: createonlyiffileexists
;NEWS
Expand All @@ -54,6 +55,7 @@ Name: "{userappdata}\ResidualVM\Saved Games"; MinVersion: 0, 1
Source: AUTHORS.txt; DestDir: {app}; Flags: ignoreversion
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: COPYRIGHT.txt; DestDir: {app}; Flags: ignoreversion
;NEWS
Expand Down
4 changes: 4 additions & 0 deletions ports.mk
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,9 @@ osxsnap: bundle
$(srcdir)/devtools/credits.pl --text > $(srcdir)/AUTHORS
cp $(srcdir)/AUTHORS ./ResidualVM-snapshot/Authors
cp $(srcdir)/COPYING ./ResidualVM-snapshot/License\ \(GPL\)
cp $(srcdir)/COPYING.BSD ./ResidualVM-snapshot/License\ \(BSD\)
cp $(srcdir)/COPYING.LGPL ./ResidualVM-snapshot/License\ \(LGPL\)
cp $(srcdir)/COPYING.FREEFONT ./ResidualVM-snapshot/License\ \(FREEFONT\)
cp $(srcdir)/COPYRIGHT ./ResidualVM-snapshot/Copyright\ Holders
cp $(srcdir)/NEWS ./ResidualVM-snapshot/News
cp $(srcdir)/README ./ResidualVM-snapshot/Residual\ ReadMe
Expand Down Expand Up @@ -196,6 +198,7 @@ ifdef DIST_FILES_ENGINEDATA
endif
cp $(srcdir)/AUTHORS $(WIN32PATH)/AUTHORS.txt
cp $(srcdir)/COPYING $(WIN32PATH)/COPYING.txt
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)/COPYRIGHT $(WIN32PATH)/COPYRIGHT.txt
Expand Down Expand Up @@ -258,6 +261,7 @@ ifdef DIST_FILES_ENGINEDATA
endif
cp $(srcdir)/AUTHORS ResidualVMWin32/AUTHORS.txt
cp $(srcdir)/COPYING ResidualVMWin32/COPYING.txt
cp $(srcdir)/COPYING.BSD ResidualVMWin32/COPYING.BSD.txt
cp $(srcdir)/COPYING.LGPL ResidualVMWin32/COPYING.LGPL.txt
cp $(srcdir)/COPYING.FREEFONT ResidualVMWin32/COPYING.FREEFONT.txt
cp $(srcdir)/COPYRIGHT ResidualVMWin32/COPYRIGHT.txt
Expand Down

0 comments on commit 9a9ca18

Please sign in to comment.