[Repoze-dev] Plope CVS: Packages/supervisor2 - CHANGES.txt:1.74 COPYRIGHT.txt:1.7 LICENSES.txt:1.4 TODO.txt:1.107 setup.py:1.35 test.txt:NONE
chrism
cvs at plope.com
Sat Sep 22 23:53:50 UTC 2007
Update of /home/chrism/cvs/Packages/supervisor2
In directory cabana.palladion.com:/tmp/cvs-serv19565
Modified Files:
CHANGES.txt COPYRIGHT.txt LICENSES.txt TODO.txt setup.py
Removed Files:
test.txt
Log Message:
Use the repoze license for supervisor2. It's largely the same as the ZPL, except it removes the servicemark clause.
=== Packages/supervisor2/CHANGES.txt 1.73 => 1.74 ===
--- Packages/supervisor2/CHANGES.txt:1.73 Sat Sep 22 18:07:11 2007
+++ Packages/supervisor2/CHANGES.txt Sat Sep 22 19:53:19 2007
@@ -231,6 +231,10 @@
- Some child processes may not have been shut down properly at
supervisor shutdown time.
+ - Move to ZPL-derived (but not ZPL) license availble from
+ http://www.repoze.org/LICENSE.txt; it's slightly less restrictive
+ than the ZPL (no servicemark clause).
+
3.0a2
- Fixed the README.txt example for defining the supervisor RPC
=== Packages/supervisor2/COPYRIGHT.txt 1.6 => 1.7 ===
--- Packages/supervisor2/COPYRIGHT.txt:1.6 Mon Sep 3 19:46:05 2007
+++ Packages/supervisor2/COPYRIGHT.txt Sat Sep 22 19:53:20 2007
@@ -1,12 +1,13 @@
Supervisor is Copyright (c) 2007 Agendaless Consulting and Contributors.
(http://www.agendaless.com), All Rights Reserved
- This software is subject to the provisions of the Zope Public License,
- Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
- THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
- WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
- FOR A PARTICULAR PURPOSE.
+ This software is subject to the provisions of the license at
+ http://www.repoze.org/LICENSE.txt . A copy of this license should
+ accompany this distribution. THIS SOFTWARE IS PROVIDED "AS IS" AND
+ ANY AND ALL EXPRESS OR IMPLIED WARRANTIES ARE DISCLAIMED, INCLUDING,
+ BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF TITLE,
+ MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS FOR A PARTICULAR
+ PURPOSE.
TrackRefs code Copyright (c) 2007 Zope Corporation and Contributors
=== Packages/supervisor2/LICENSES.txt 1.3 => 1.4 ===
--- Packages/supervisor2/LICENSES.txt:1.3 Wed Aug 15 02:25:13 2007
+++ Packages/supervisor2/LICENSES.txt Sat Sep 22 19:53:20 2007
@@ -1,11 +1,8 @@
-Supervisor is licensed under the Zope Public License (ZPL) 2.1 :
+Supervisor is licensed under the following license:
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).
-
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
@@ -23,12 +20,7 @@
promote products derived from this software without prior
written permission from the copyright holders.
- 5. 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.
-
- 6. If any files are modified, you must cause the modified files to
+ 4. 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.
@@ -83,3 +75,60 @@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Some software in this distribution is released under the Zope Public
+License (as marked in its file header):
+
+ Zope Public License (ZPL) Version 2.1
+ -------------------------------------
+
+ 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).
+
+ 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.
+
+ 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.
+
+ 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.
+
+ 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.
=== Packages/supervisor2/TODO.txt 1.106 => 1.107 ===
--- Packages/supervisor2/TODO.txt:1.106 Sat Sep 22 19:02:55 2007
+++ Packages/supervisor2/TODO.txt Sat Sep 22 19:53:20 2007
@@ -8,9 +8,6 @@
- Allow sockchown group only: http://www.plope.com/software/collector/214
-- Change license to http://dist.repoze.org/LICENSE.txt (same license,
- just no "Zope" anywhere).
-
- Implement event max_retry counter that means "after X retries of a
rejected event, go into FATAL state".
=== Packages/supervisor2/setup.py 1.34 => 1.35 ===
--- Packages/supervisor2/setup.py:1.34 Fri Sep 7 20:17:57 2007
+++ Packages/supervisor2/setup.py Sat Sep 22 19:53:20 2007
@@ -3,12 +3,12 @@
# Copyright (c) 2007 Agendaless Consulting and Contributors.
# All Rights Reserved.
#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE
+# This software is subject to the provisions of the BSD-like license at
+# http://www.repoze.org/LICENSE.txt. A copy of the license should accompany
+# this distribution. THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL
+# EXPRESS OR IMPLIED WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND
+# FITNESS FOR A PARTICULAR PURPOSE
#
##############################################################################
@@ -47,7 +47,6 @@
'Development Status :: 5 - Production/Stable',
'Environment :: No Input/Output (Daemon)',
'Intended Audience :: System Administrators',
- 'License :: OSI Approved :: Zope Public License',
'Natural Language :: English',
'Operating System :: POSIX',
'Topic :: System :: Boot',
@@ -61,7 +60,7 @@
dist = setup(
name = 'supervisor',
version = supervisor_version,
- license = 'ZPL 2.1/others (see LICENSES.txt)',
+ license = 'BSD-derived (http://www.repoze.org/LICENSE.txt)',
url = 'http://www.plope.com/software/supervisor2/',
description = "A system for controlling process state under UNIX",
long_description= DESC,
=== Removed File Packages/supervisor2/test.txt ===
_______________________________________________
Repoze-dev mailing list
Repoze-dev at lists.repoze.org
http://lists.repoze.org/mailman/listinfo/repoze-dev
More information about the Repoze-dev
mailing list