diff options
| -rw-r--r-- | COPYING.OFL | 98 | ||||
| -rw-r--r-- | Makefile.common | 2 | ||||
| -rwxr-xr-x | backends/platform/maemo/debian/rules | 2 | ||||
| -rw-r--r-- | backends/platform/sdl/macosx/appmenu_osx.mm | 6 | ||||
| -rw-r--r-- | backends/platform/sdl/win32/win32.mk | 1 | ||||
| -rw-r--r-- | devtools/create_project/create_project.cpp | 1 | ||||
| -rw-r--r-- | devtools/create_project/xcode.cpp | 1 | ||||
| -rw-r--r-- | dists/redhat/scummvm.spec | 2 | ||||
| -rw-r--r-- | dists/redhat/scummvm.spec.in | 2 | ||||
| -rw-r--r-- | dists/win32/ScummVM.iss | 2 | ||||
| -rw-r--r-- | ports.mk | 2 |
11 files changed, 115 insertions, 4 deletions
diff --git a/COPYING.OFL b/COPYING.OFL new file mode 100644 index 0000000000..100d00197e --- /dev/null +++ b/COPYING.OFL @@ -0,0 +1,98 @@ +NOTE: This license file only applies to the Source Code Pro font file: +"SourceCodeVariable-Roman.ttf" distributed along with our theme files. + +Copyright 2010, 2012 Adobe Systems Incorporated (http://www.adobe.com/), +with Reserved Font Name 'Source'. All Rights Reserved. Source is a +trademark of Adobe Systems Incorporated in the United States and/or other +countries. + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/Makefile.common b/Makefile.common index c6c47fd075..07dfbd28ae 100644 --- a/Makefile.common +++ b/Makefile.common @@ -273,7 +273,7 @@ dist-src: \ @#DEB-src? # Common files -DIST_FILES_DOCS:=$(addprefix $(srcdir)/,AUTHORS COPYING COPYING.BSD COPYING.LGPL COPYING.FREEFONT COPYRIGHT NEWS.md README.md) +DIST_FILES_DOCS:=$(addprefix $(srcdir)/,AUTHORS COPYING COPYING.BSD COPYING.LGPL COPYING.FREEFONT COPYING.OFL COPYRIGHT NEWS.md README.md) ifdef USE_PANDOC DIST_FILES_DOCS+=README$(PANDOCEXT) NEWS$(PANDOCEXT) endif diff --git a/backends/platform/maemo/debian/rules b/backends/platform/maemo/debian/rules index f40b13f862..2a763c9c42 100755 --- a/backends/platform/maemo/debian/rules +++ b/backends/platform/maemo/debian/rules @@ -64,7 +64,7 @@ install: build install -m0644 dists/engine-data/wintermute.zip debian/scummvm/opt/scummvm/share install -m0644 -d debian/scummvm/usr/share/doc/scummvm - install -m0644 AUTHORS COPYING COPYING.BSD COPYING.FREEFONT COPYING.LGPL COPYRIGHT NEWS README debian/scummvm/usr/share/doc/scummvm + install -m0644 AUTHORS COPYING COPYING.BSD COPYING.FREEFONT COPYING.LGPL COPYING.OFL COPYRIGHT NEWS README debian/scummvm/usr/share/doc/scummvm binary: binary-arch binary-arch: build install diff --git a/backends/platform/sdl/macosx/appmenu_osx.mm b/backends/platform/sdl/macosx/appmenu_osx.mm index 1d5ab12792..38ce8c49a2 100644 --- a/backends/platform/sdl/macosx/appmenu_osx.mm +++ b/backends/platform/sdl/macosx/appmenu_osx.mm @@ -87,6 +87,7 @@ static void openFromBundle(NSString *file) { - (void) openLicenseGPL; - (void) openLicenseLGPL; - (void) openLicenseFreefont; +- (void) openLicenseOFL; - (void) openLicenseBSD; - (void) openNews; - (void) openUserManual; @@ -110,6 +111,10 @@ static void openFromBundle(NSString *file) { openFromBundle(@"COPYING-FREEFONT"); } +- (void)openLicenseOFL { + openFromBundle(@"COPYING-OFL"); +} + - (void)openLicenseBSD { openFromBundle(@"COPYING-BSD"); } @@ -216,6 +221,7 @@ void replaceApplicationMenuItems() { addMenuItem(_("GPL License"), stringEncoding, delegate, @selector(openLicenseGPL), @"", helpMenu); addMenuItem(_("LGPL License"), stringEncoding, delegate, @selector(openLicenseLGPL), @"", helpMenu); addMenuItem(_("Freefont License"), stringEncoding, delegate, @selector(openLicenseFreefont), @"", helpMenu); + addMenuItem(_("OFL License"), stringEncoding, delegate, @selector(openLicenseOFL), @"", helpMenu); addMenuItem(_("BSD License"), stringEncoding, delegate, @selector(openLicenseBSD), @"", helpMenu); diff --git a/backends/platform/sdl/win32/win32.mk b/backends/platform/sdl/win32/win32.mk index 227878eaf0..32f60e10f9 100644 --- a/backends/platform/sdl/win32/win32.mk +++ b/backends/platform/sdl/win32/win32.mk @@ -23,6 +23,7 @@ win32dist: all 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.OFL $(WIN32PATH)/COPYING.OFL.txt cp $(srcdir)/COPYRIGHT $(WIN32PATH)/COPYRIGHT.txt cp $(srcdir)/doc/cz/PrectiMe $(WIN32PATH)/doc/cz/PrectiMe.txt cp $(srcdir)/doc/de/NEUES $(WIN32PATH)/doc/de/NEUES.txt diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp index 3b739f7e15..d2216c7324 100644 --- a/devtools/create_project/create_project.cpp +++ b/devtools/create_project/create_project.cpp @@ -1554,6 +1554,7 @@ void ProjectProvider::createProject(BuildSetup &setup) { in.push_back(setup.srcDir + "/COPYING.LGPL"); in.push_back(setup.srcDir + "/COPYING.BSD"); in.push_back(setup.srcDir + "/COPYING.FREEFONT"); + in.push_back(setup.srcDir + "/COPYING.OFL"); in.push_back(setup.srcDir + "/COPYRIGHT"); in.push_back(setup.srcDir + "/NEWS"); in.push_back(setup.srcDir + "/README"); diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp index 6817b5c3db..abfa3f0c10 100644 --- a/devtools/create_project/xcode.cpp +++ b/devtools/create_project/xcode.cpp @@ -781,6 +781,7 @@ XcodeProvider::ValueList& XcodeProvider::getResourceFiles() const { files.push_back("COPYING.LGPL"); files.push_back("COPYING.BSD"); files.push_back("COPYING.FREEFONT"); + files.push_back("COPYING.OFL"); files.push_back("NEWS"); files.push_back("README"); } diff --git a/dists/redhat/scummvm.spec b/dists/redhat/scummvm.spec index 6222d11326..4bcd23144e 100644 --- a/dists/redhat/scummvm.spec +++ b/dists/redhat/scummvm.spec @@ -86,7 +86,7 @@ fi #------------------------------------------------------------------------------ %files %defattr(0644,root,root,0755) -%doc AUTHORS README NEWS COPYING COPYING.LGPL COPYING.FREEFONT COPYING.BSD COPYRIGHT +%doc AUTHORS README NEWS COPYING COPYING.LGPL COPYING.FREEFONT COPYING.OFL COPYING.BSD COPYRIGHT %attr(0755,root,root)%{_bindir}/scummvm %{_datadir}/applications/* %{_datadir}/pixmaps/scummvm.xpm diff --git a/dists/redhat/scummvm.spec.in b/dists/redhat/scummvm.spec.in index eddf157590..2359f687fc 100644 --- a/dists/redhat/scummvm.spec.in +++ b/dists/redhat/scummvm.spec.in @@ -86,7 +86,7 @@ fi #------------------------------------------------------------------------------ %files %defattr(0644,root,root,0755) -%doc AUTHORS README NEWS COPYING COPYING.LGPL COPYING.FREEFONT COPYING.BSD COPYRIGHT +%doc AUTHORS README NEWS COPYING COPYING.LGPL COPYING.FREEFONT COPYING.OFL COPYING.BSD COPYRIGHT %attr(0755,root,root)%{_bindir}/scummvm %{_datadir}/applications/* %{_datadir}/pixmaps/scummvm.xpm diff --git a/dists/win32/ScummVM.iss b/dists/win32/ScummVM.iss index 3d7ad2fd91..dab125832c 100644 --- a/dists/win32/ScummVM.iss +++ b/dists/win32/ScummVM.iss @@ -214,6 +214,7 @@ Name: {group}\Mitwirkende; Filename: {app}\AUTHORS.txt; WorkingDir: {app}; Comme Name: {group}\Copying; Filename: {app}\COPYING.txt; WorkingDir: {app}; Comment: COPYING; Flags: createonlyiffileexists
Name: {group}\Copying.BSD; Filename: {app}\COPYING.BSD.txt; WorkingDir: {app}; Comment: COPYING.BSD; Flags: createonlyiffileexists
Name: {group}\Copying.FREEFONT; Filename: {app}\COPYING.FREEFONT.txt; WorkingDir: {app}; Comment: COPYING.FREEFONT; Flags: createonlyiffileexists
+Name: {group}\Copying.OFL; Filename: {app}\COPYING.OFL.txt; WorkingDir: {app}; Comment: COPYING.OFL; 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
@@ -256,6 +257,7 @@ Source: AUTHORS.txt; DestDir: {app}; Flags: ignoreversion Source: COPYING.txt; DestDir: {app}; Flags: ignoreversion
Source: COPYING.BSD.txt; DestDir: {app}; Flags: ignoreversion
Source: COPYING.FREEFONT.txt; DestDir: {app}; Flags: ignoreversion
+Source: COPYING.OFL.txt; DestDir: {app}; Flags: ignoreversion
Source: COPYING.LGPL.txt; DestDir: {app}; Flags: ignoreversion
Source: COPYRIGHT.txt; DestDir: {app}; Flags: ignoreversion
@@ -123,6 +123,7 @@ endif rm $(bundle_name)/Contents/Resources/AUTHORS cp $(bundle_name)/Contents/Resources/COPYING.LGPL $(bundle_name)/Contents/Resources/COPYING-LGPL cp $(bundle_name)/Contents/Resources/COPYING.FREEFONT $(bundle_name)/Contents/Resources/COPYING-FREEFONT + cp $(bundle_name)/Contents/Resources/COPYING.OFL $(bundle_name)/Contents/Resources/COPYING-OFL cp $(bundle_name)/Contents/Resources/COPYING.BSD $(bundle_name)/Contents/Resources/COPYING-BSD chmod 644 $(bundle_name)/Contents/Resources/* cp scummvm-static $(bundle_name)/Contents/MacOS/scummvm @@ -402,6 +403,7 @@ osxsnap: bundle mv ./ScummVM-snapshot/COPYING ./ScummVM-snapshot/License\ \(GPL\) mv ./ScummVM-snapshot/COPYING.LGPL ./ScummVM-snapshot/License\ \(LGPL\) mv ./ScummVM-snapshot/COPYING.FREEFONT ./ScummVM-snapshot/License\ \(FREEFONT\) + mv ./ScummVM-snapshot/COPYING.OFL ./ScummVM-snapshot/License\ \(OFL\) mv ./ScummVM-snapshot/COPYING.BSD ./ScummVM-snapshot/License\ \(BSD\) $(XCODETOOLSPATH)/SetFile -t ttro -c ttxt ./ScummVM-snapshot/* mkdir ScummVM-snapshot/doc |