diff options
| author | Jakub Hrozek <jhrozek@redhat.com> | 2010-12-09 13:59:11 +0100 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2010-12-20 17:19:53 -0500 |
| commit | 7493d781dfcaa7995f7864a09ad39ba6a89f1a9c (patch) | |
| tree | 4e7ff4188d2f8105679369e58d6a2734b4872998 /ipapython/py_default_encoding | |
| parent | ffd467bd7e12faad3f1574fe3c1e505820bdf459 (diff) | |
| download | freeipa-7493d781dfcaa7995f7864a09ad39ba6a89f1a9c.tar.gz freeipa-7493d781dfcaa7995f7864a09ad39ba6a89f1a9c.tar.xz freeipa-7493d781dfcaa7995f7864a09ad39ba6a89f1a9c.zip | |
Change FreeIPA license to GPLv3+
The changes include:
* Change license blobs in source files to mention GPLv3+ not GPLv2 only
* Add GPLv3+ license text
* Package COPYING not LICENSE as the license blobs (even the old ones)
mention COPYING specifically, it is also more common, I think
https://fedorahosted.org/freeipa/ticket/239
Diffstat (limited to 'ipapython/py_default_encoding')
| -rw-r--r-- | ipapython/py_default_encoding/default_encoding_utf8.c | 10 | ||||
| -rw-r--r-- | ipapython/py_default_encoding/setup.py | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/ipapython/py_default_encoding/default_encoding_utf8.c b/ipapython/py_default_encoding/default_encoding_utf8.c index c3cdd4eca..79101d993 100644 --- a/ipapython/py_default_encoding/default_encoding_utf8.c +++ b/ipapython/py_default_encoding/default_encoding_utf8.c @@ -5,9 +5,10 @@ * Copyright (C) 2009 Red Hat * see file 'COPYING' for use and warranty information * - * 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. + * 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 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -15,8 +16,7 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include <Python.h> diff --git a/ipapython/py_default_encoding/setup.py b/ipapython/py_default_encoding/setup.py index 6ea520f13..87f7504e4 100644 --- a/ipapython/py_default_encoding/setup.py +++ b/ipapython/py_default_encoding/setup.py @@ -4,9 +4,10 @@ # Copyright (C) 2009 Red Hat # see file 'COPYING' for use and warranty information # -# 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. +# 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 3 of the License, or +# (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -14,8 +15,7 @@ # 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# along with this program. If not, see <http://www.gnu.org/licenses/>. from distutils.core import setup, Extension |