[Python-apps-commits] r10651 - in packages/roundup/trunk/debian (copyright)

Sun Mar 9 20:07:30 UTC 2014

Date: Sunday, March 9, 2014 @ 20:07:29
  Author: kaisan-guest
Revision: 10651

copyright cleanup to exactly match the format

Modified:
  packages/roundup/trunk/debian/copyright

Modified: packages/roundup/trunk/debian/copyright
===================================================================

--- packages/roundup/trunk/debian/copyright	2014-03-09 19:43:21 UTC (rev 10650)
+++ packages/roundup/trunk/debian/copyright	2014-03-09 20:07:29 UTC (rev 10651)
@@ -6,20 +6,41 @@
 Copyright: 2003-2009 Richard Jones (richard at mechanicalcat.net)
            2002 eKit.com Inc (http://www.ekit.com/)
            2001 Bizar Software Pty Ltd (http://www.bizarsoftware.com.au/)
+License: Expat
 
- Roundup Licensing
- -----------------
+Files: roundup/cgi/TAL/* roundup/cgi/PageTemplates/* roundup/cgi/ZTUtils/*
+Copyright: Zope Corporation (tm) and contributers. All rights reserved
+License: ZPL 2.0
+Comment: Portions of this code (roundup.cgi.PageTemplates, roundup.cgi.TAL and
+ roundup.cgi.ZTUtils) have been copied from Zope. They have been modified in
+ the following manner:
 
+ - removal of unit tests, Zope-specific code and support files from
+   PageTemplates: PageTemplateFile.py, ZPythonExpr.py, ZRPythonExpr.py,
+   ZopePageTemplate.py, examples, help, tests, CHANGES.txt, HISTORY.txt,
+   version.txt and www. From TAL: DummyEngine.py, HISTORY.txt, CHANGES.txt,
+   benchmark, driver.py, markbench.py, ndiff.py, runtest.py, setpath.py,
+   tests and timer.py. From ZTUtils: SimpleTree.py, Zope.py, CHANGES.txt and
+   HISTORY.txt.
+ - editing to remove dependencies on Zope modules (see files for change notes)
+
+Files: debian/*
+Copyright: 2003-2005 Bastian Kleineidam <calvin at debian.org>
+           2005-2011 Toni Mueller <toni at debian.org>
+           2011-2014 Kai Storbeck <kai at xs4all.nl>
+License: GPL-2+
+
+License: Expat
  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
@@ -28,66 +49,46 @@
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  SOFTWARE.
 
-
- PageTemplates Licensing
- -----------------------
-
- Portions of this code (roundup.cgi.PageTemplates, roundup.cgi.TAL and
- roundup.cgi.ZTUtils) have been copied from Zope. They have been modified in
- the following manner:
-
- - removal of unit tests, Zope-specific code and support files from
-   PageTemplates: PageTemplateFile.py, ZPythonExpr.py, ZRPythonExpr.py,
-   ZopePageTemplate.py, examples, help, tests, CHANGES.txt, HISTORY.txt,
-   version.txt and www. From TAL: DummyEngine.py, HISTORY.txt, CHANGES.txt,
-   benchmark, driver.py, markbench.py, ndiff.py, runtest.py, setpath.py,
-   tests and timer.py. From ZTUtils: SimpleTree.py, Zope.py, CHANGES.txt and
-   HISTORY.txt.
- - editing to remove dependencies on Zope modules (see files for change notes)
-
- The license for this code is the `Zope Public License (ZPL) Version 2.0`_,
- included below.
-
-
+License: ZPL 2.0
  Zope Public License (ZPL) Version 2.0
  -------------------------------------
-
+ .
  This software is Copyright (c) Zope Corporation (tm) and
  Contributors. All rights reserved.
-
+ .
  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:
-
+ .
  1. Redistributions in source code must retain the above
     copyright notice, this list of conditions, and the following
     disclaimer.
-
+ .
  2. 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.
-
+ .
  3. The name Zope Corporation (tm) must not be used to
     endorse or promote products derived from this software
     without prior written permission from Zope Corporation.
-
+ .
  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 Zope Corporation. Use of them is
     covered in a separate agreement (see
     http://www.zope.com/Marks).
-
+ .
  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 ZOPE CORPORATION ``AS IS''
    AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
    NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
@@ -102,17 +103,12 @@
    OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
    DAMAGE.
-
-
+ .
  This software consists of contributions made by Zope
  Corporation and many individuals on behalf of Zope
  Corporation.  Specific attributions are listed in the
  accompanying credits file.
 
-Files: debian/*
-Copyright: 2003-2005 Bastian Kleineidam <calvin at debian.org>
-           2005-2011 Toni Mueller <toni at debian.org>
-           2011-2014 Kai Storbeck <kai at xs4all.nl>
 License: GPL-2+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by


