From a787cea4c7193ff951cb7ad6fb68be15c366b859 Mon Sep 17 00:00:00 2001 From: Uli Fouquet Date: Tue, 6 Apr 2010 11:59:08 +0000 Subject: [PATCH] Comply with foundation repos policy. --- CHANGES.txt | 2 +- COPYRIGHT.txt | 1 + LICENSE.txt | 74 ++++++++++------------ setup.py | 2 +- src/grokui/admin/__init__.py | 2 +- src/grokui/admin/docgrok.py | 2 +- src/grokui/admin/messages.py | 2 +- src/grokui/admin/objectinfo.py | 2 +- src/grokui/admin/tests/__init__.py | 2 +- src/grokui/admin/tests/apackage/module1.py | 2 +- src/grokui/admin/tests/apps.py | 2 +- src/grokui/admin/tests/brokenobjs.py | 2 +- src/grokui/admin/tests/docgrok.py | 2 +- src/grokui/admin/tests/macros.py | 2 +- src/grokui/admin/tests/objectbrowser.py | 2 +- src/grokui/admin/tests/packdatabase.py | 2 +- src/grokui/admin/tests/server.py | 2 +- src/grokui/admin/tests/test_grokadmin.py | 2 +- src/grokui/admin/utilities.py | 2 +- src/grokui/admin/view.py | 2 +- 20 files changed, 51 insertions(+), 60 deletions(-) create mode 100644 COPYRIGHT.txt diff --git a/CHANGES.txt b/CHANGES.txt index 42bbeed..b5c0e8c 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -4,7 +4,7 @@ grokui.admin changes 0.3.4 (unreleased) ================== -* ... +* Modified package to comply with Zope Foundation repository policy. 0.3.3 (2010-02-14) ================== diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt new file mode 100644 index 0000000..79859e0 --- /dev/null +++ b/COPYRIGHT.txt @@ -0,0 +1 @@ +Zope Foundation and Contributors \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE.txt index 0f06d96..e1f9ad7 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,54 +1,44 @@ Zope Public License (ZPL) Version 2.1 -------------------------------------- -A copyright notice accompanies this license document that -identifies the copyright holders. +A copyright notice accompanies this license document that identifies the +copyright holders. -This license has been certified as open source. It has also -been designated as GPL compatible by the Free Software -Foundation (FSF). +This license has been certified as open source. It has also been designated as +GPL compatible by the Free Software Foundation (FSF). -Redistribution and use in source and binary forms, with or -without modification, are permitted provided that the -following conditions are met: +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: -1. Redistributions in source code must retain the - accompanying copyright notice, this list of conditions, - and the following disclaimer. +1. Redistributions in source code must retain the accompanying copyright +notice, this list of conditions, and the following disclaimer. -2. Redistributions in binary form must reproduce the accompanying - copyright notice, this list of conditions, and the - following disclaimer in the documentation and/or other - materials provided with the distribution. +2. Redistributions in binary form must reproduce the accompanying copyright +notice, this list of conditions, and the following disclaimer in the +documentation and/or other materials provided with the distribution. -3. Names of the copyright holders must not be used to - endorse or promote products derived from this software - without prior written permission from the copyright - holders. +3. Names of the copyright holders must not be used to endorse or promote +products derived from this software without prior written permission from the +copyright holders. -4. The right to distribute this software or to use it for - any purpose does not give you the right to use - Servicemarks (sm) or Trademarks (tm) of the copyright - holders. Use of them is covered by separate agreement - with the copyright holders. +4. The right to distribute this software or to use it for any purpose does not +give you the right to use Servicemarks (sm) or Trademarks (tm) of the +copyright +holders. Use of them is covered by separate agreement with the copyright +holders. -5. If any files are modified, you must cause the modified - files to carry prominent notices stating that you changed - the files and the date of any change. +5. If any files are modified, you must cause the modified files to carry +prominent notices stating that you changed the files and the date of any +change. Disclaimer - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' - AND ANY EXPRESSED 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 HOLDERS 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. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY EXPRESSED +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 HOLDERS 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/setup.py b/setup.py index 9816355..b194743 100644 --- a/setup.py +++ b/setup.py @@ -28,7 +28,7 @@ def read(*rnames): 'Topic :: Internet :: WWW/HTTP', 'Framework :: Zope3'], keywords="zope3 grok grokadmin", - author="Uli Fouquet and lots of contributors from grok community", + author="Zope Foundation and Contributors", author_email="grok-dev@zope.org", url="http://svn.zope.org/grokui.admin", license="ZPL 2.1", diff --git a/src/grokui/admin/__init__.py b/src/grokui/admin/__init__.py index 913346b..b73bbf9 100644 --- a/src/grokui/admin/__init__.py +++ b/src/grokui/admin/__init__.py @@ -1,6 +1,6 @@ ############################################################################## # -# Copyright (c) 2008 Zope Corporation and Contributors. +# Copyright (c) 2008 Zope Foundation and Contributors. # All Rights Reserved. # # This software is subject to the provisions of the Zope Public License, diff --git a/src/grokui/admin/docgrok.py b/src/grokui/admin/docgrok.py index d20a692..c2e694c 100644 --- a/src/grokui/admin/docgrok.py +++ b/src/grokui/admin/docgrok.py @@ -1,6 +1,6 @@ ############################################################################## # -# Copyright (c) 2007 Zope Corporation and Contributors. +# Copyright (c) 2007 Zope Foundation and Contributors. # All Rights Reserved. # # This software is subject to the provisions of the Zope Public License, diff --git a/src/grokui/admin/messages.py b/src/grokui/admin/messages.py index c318457..6006a35 100644 --- a/src/grokui/admin/messages.py +++ b/src/grokui/admin/messages.py @@ -1,5 +1,5 @@ # -*- coding: latin-1 -*- -# Copyright (c) 2007 gocept gmbh & co. kg +# Copyright (c) 2007 Zope Foundation and Contributors # See also LICENSE.txt # $Id$ """Support for flash-messages in the grok admin UI.""" diff --git a/src/grokui/admin/objectinfo.py b/src/grokui/admin/objectinfo.py index fc57ff6..4888a5f 100644 --- a/src/grokui/admin/objectinfo.py +++ b/src/grokui/admin/objectinfo.py @@ -1,6 +1,6 @@ ############################################################################## # -# Copyright (c) 2007 Zope Corporation and Contributors. +# Copyright (c) 2007 Zope Foundation and Contributors. # All Rights Reserved. # # This software is subject to the provisions of the Zope Public License, diff --git a/src/grokui/admin/tests/__init__.py b/src/grokui/admin/tests/__init__.py index 056f482..a6674ff 100644 --- a/src/grokui/admin/tests/__init__.py +++ b/src/grokui/admin/tests/__init__.py @@ -1,6 +1,6 @@ ############################################################################## # -# Copyright (c) 2007 Zope Corporation and Contributors. +# Copyright (c) 2007 Zope Foundation and Contributors. # All Rights Reserved. # # This software is subject to the provisions of the Zope Public License, diff --git a/src/grokui/admin/tests/apackage/module1.py b/src/grokui/admin/tests/apackage/module1.py index 6c5bd5d..882e682 100644 --- a/src/grokui/admin/tests/apackage/module1.py +++ b/src/grokui/admin/tests/apackage/module1.py @@ -1,6 +1,6 @@ ############################################################################## # -# Copyright (c) 2007 Zope Corporation and Contributors. +# Copyright (c) 2007 Zope Foundation and Contributors. # All Rights Reserved. # # This software is subject to the provisions of the Zope Public License, diff --git a/src/grokui/admin/tests/apps.py b/src/grokui/admin/tests/apps.py index ae6819d..079aec5 100644 --- a/src/grokui/admin/tests/apps.py +++ b/src/grokui/admin/tests/apps.py @@ -1,6 +1,6 @@ ############################################################################## # -# Copyright (c) 2007 Zope Corporation and Contributors. +# Copyright (c) 2007 Zope Foundation and Contributors. # All Rights Reserved. # # This software is subject to the provisions of the Zope Public License, diff --git a/src/grokui/admin/tests/brokenobjs.py b/src/grokui/admin/tests/brokenobjs.py index 018e869..e5e29ef 100644 --- a/src/grokui/admin/tests/brokenobjs.py +++ b/src/grokui/admin/tests/brokenobjs.py @@ -1,6 +1,6 @@ ############################################################################## # -# Copyright (c) 2007 Zope Corporation and Contributors. +# Copyright (c) 2007 Zope Foundation and Contributors. # All Rights Reserved. # # This software is subject to the provisions of the Zope Public License, diff --git a/src/grokui/admin/tests/docgrok.py b/src/grokui/admin/tests/docgrok.py index 62f4958..f3034bf 100644 --- a/src/grokui/admin/tests/docgrok.py +++ b/src/grokui/admin/tests/docgrok.py @@ -1,6 +1,6 @@ ############################################################################## # -# Copyright (c) 2007 Zope Corporation and Contributors. +# Copyright (c) 2007 Zope Foundation and Contributors. # All Rights Reserved. # # This software is subject to the provisions of the Zope Public License, diff --git a/src/grokui/admin/tests/macros.py b/src/grokui/admin/tests/macros.py index f895328..296f362 100644 --- a/src/grokui/admin/tests/macros.py +++ b/src/grokui/admin/tests/macros.py @@ -1,6 +1,6 @@ ############################################################################## # -# Copyright (c) 2007 Zope Corporation and Contributors. +# Copyright (c) 2007 Zope Foundation and Contributors. # All Rights Reserved. # # This software is subject to the provisions of the Zope Public License, diff --git a/src/grokui/admin/tests/objectbrowser.py b/src/grokui/admin/tests/objectbrowser.py index 8cd7ff0..177d5c7 100644 --- a/src/grokui/admin/tests/objectbrowser.py +++ b/src/grokui/admin/tests/objectbrowser.py @@ -1,6 +1,6 @@ ############################################################################## # -# Copyright (c) 2007 Zope Corporation and Contributors. +# Copyright (c) 2007 Zope Foundation and Contributors. # All Rights Reserved. # # This software is subject to the provisions of the Zope Public License, diff --git a/src/grokui/admin/tests/packdatabase.py b/src/grokui/admin/tests/packdatabase.py index da0e9b2..12d0cf2 100644 --- a/src/grokui/admin/tests/packdatabase.py +++ b/src/grokui/admin/tests/packdatabase.py @@ -1,6 +1,6 @@ ############################################################################## # -# Copyright (c) 2007 Zope Corporation and Contributors. +# Copyright (c) 2007 Zope Foundation and Contributors. # All Rights Reserved. # # This software is subject to the provisions of the Zope Public License, diff --git a/src/grokui/admin/tests/server.py b/src/grokui/admin/tests/server.py index 8d83f7e..8f21061 100644 --- a/src/grokui/admin/tests/server.py +++ b/src/grokui/admin/tests/server.py @@ -1,6 +1,6 @@ ############################################################################## # -# Copyright (c) 2008 Zope Corporation and Contributors. +# Copyright (c) 2008 Zope Foundation and Contributors. # All Rights Reserved. # # This software is subject to the provisions of the Zope Public License, diff --git a/src/grokui/admin/tests/test_grokadmin.py b/src/grokui/admin/tests/test_grokadmin.py index 58e6605..1262573 100644 --- a/src/grokui/admin/tests/test_grokadmin.py +++ b/src/grokui/admin/tests/test_grokadmin.py @@ -1,6 +1,6 @@ ############################################################################## # -# Copyright (c) 2007 Zope Corporation and Contributors. +# Copyright (c) 2007 Zope Foundation and Contributors. # All Rights Reserved. # # This software is subject to the provisions of the Zope Public License, diff --git a/src/grokui/admin/utilities.py b/src/grokui/admin/utilities.py index aa5c732..8d4419c 100644 --- a/src/grokui/admin/utilities.py +++ b/src/grokui/admin/utilities.py @@ -1,6 +1,6 @@ ############################################################################## # -# Copyright (c) 2007 Zope Corporation and Contributors. +# Copyright (c) 2007 Zope Foundation and Contributors. # All Rights Reserved. # # This software is subject to the provisions of the Zope Public License, diff --git a/src/grokui/admin/view.py b/src/grokui/admin/view.py index e7d8b7f..5504133 100644 --- a/src/grokui/admin/view.py +++ b/src/grokui/admin/view.py @@ -1,6 +1,6 @@ ############################################################################## # -# Copyright (c) 2007 Zope Corporation and Contributors. +# Copyright (c) 2007 Zope Foundation and Contributors. # All Rights Reserved. # # This software is subject to the provisions of the Zope Public License,