commit c9290dbff3d400ed080c9ecde64d138cf67e78d6 Author: David Fifield <david@bamsoftware.com> Date: Fri Apr 5 15:38:15 2013 -0700 Change LICENSE PyInstaller → py2exe. Thsi was missed in the switch to py2exe. --- LICENSE | 60 ++++++++++++++++++++++++------------------------------------ 1 files changed, 24 insertions(+), 36 deletions(-) diff --git a/LICENSE b/LICENSE index a8f7c40..0257b47 100644 --- a/LICENSE +++ b/LICENSE @@ -201,39 +201,27 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. =============================================================================== -PyInstaller - -Binary packages are built using PyInstaller. The part of PyInstaller -that is included in the packages (its bootloader) is licensed under the -GPL version 2, with a blanket linking exception. A copy of the GPL is -included as doc/LICENSE.GPL. - -(From pyinstaller-2.0/source/common/main.c.) - -/* - * Bootloader for a packed executable. - * Copyright (C) 2005-2011, Giovanni Bajo - * Based on previous work under copyright (c) 2002 McMillan Enterprises, Inc. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * In addition to the permissions in the GNU General Public License, the - * authors give you unlimited permission to link or embed the compiled - * version of this file into combinations with other programs, and to - * distribute those combinations without any restriction coming from the - * use of this file. (The General Public License restrictions do apply in - * other respects; for example, they cover modification of the file, and - * distribution when not linked into a combine executable.) - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - */ +py2exe + +Windows binary packages are built using py2exe. + +Copyright (c) 2000-2008 Thomas Heller, Mark Hammond, Jimmy Retzlaff + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.