diff --git a/src/linux/binaries_64bit/LICENSE.txt b/src/linux/binaries_64bit/LICENSE.txt deleted file mode 100644 index ba1b96ff..00000000 --- a/src/linux/binaries_64bit/LICENSE.txt +++ /dev/null @@ -1,39 +0,0 @@ -Copyright (c) 2012-2014 The CEF Python authors. All rights -reserved. Website: http://code.google.com/p/cefpython/ - -This product includes the following third party libraries: -* Chromium Embedded Framework licensed under the BSD 3-clause - license. Website: http://code.google.com/p/chromiumembedded/ - -Redistribution and use in source and binary forms, with -or without modification, are permitted provided that the -following conditions are met: - -* Redistributions of source code must retain the above - copyright notice, this list of conditions and the - following disclaimer. - -* 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. - -* Neither the name of Google Inc. nor the name Chromium - Embedded Framework nor the name of CEF Python nor the - names of its contributors may be used to endorse or - promote products derived from this software without - specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND -CONTRIBUTORS "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 COPYRIGHT OWNER OR -CONTRIBUTORS 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/src/linux/installer/make-deb.py b/src/linux/installer/make-deb.py index 3fd7b830..77bf7f12 100644 --- a/src/linux/installer/make-deb.py +++ b/src/linux/installer/make-deb.py @@ -153,7 +153,7 @@ def create_copyright_file(): copyright = re.sub("[\r\n]", "\n", copyright) copyright += "\n" copyright += "License: BSD 3-clause\n" - with open(INSTALLER+"/../../../LICENSE.txt", "r") as f: + with open(INSTALLER+"/../../../License", "r") as f: license = f.readlines() for line in license: if not len(re.sub("\s+", "", line)): diff --git a/src/linux/installer/make-setup.py b/src/linux/installer/make-setup.py index 15396310..9b4ad07b 100644 --- a/src/linux/installer/make-setup.py +++ b/src/linux/installer/make-setup.py @@ -82,6 +82,10 @@ def main(): print("Creating package dir") os.mkdir(package_dir) + print("Copying License file") + shutil.copy("../../../License", package_dir) + + print("Creating README.txt from template") with open(setup_dir+"/README.txt", "w") as f: f.write(README_CONTENT) @@ -116,10 +120,6 @@ def main(): shutil.move(package_dir+"/kivy-select-boxes", package_dir+"/examples/kivy-select-boxes") - #kivy_select_boxes_dir = package_dir+"/examples/kivy-select-boxes/" - #ret = os.system("cp -rf "+kivy_select_boxes_dir+"/* "+package_dir+"/wx/") - #assert ret == 0 - print("Creating wx dir in package dir") os.mkdir(package_dir+"/wx/") diff --git a/src/linux/installer/setup.py.template b/src/linux/installer/setup.py.template index f4342682..d405aff2 100644 --- a/src/linux/installer/setup.py.template +++ b/src/linux/installer/setup.py.template @@ -87,6 +87,7 @@ setup( 'wx/*.txt', 'wx/images/*.png', '*.txt', + 'License', 'cefclient', 'subprocess', '*.so',