[Pkg-php-commits] r1250 - pear/php-net-socket/trunk/debian
Thijs Kinkhorst
thijs at alioth.debian.org
Mon Mar 9 19:09:06 UTC 2009
tags 332616 pending
thanks
Author: thijs
Date: 2009-03-09 19:09:05 +0000 (Mon, 09 Mar 2009)
New Revision: 1250
Modified:
pear/php-net-socket/trunk/debian/changelog
pear/php-net-socket/trunk/debian/copyright
Log:
Update licence information (Closes: #332616).
Modified: pear/php-net-socket/trunk/debian/changelog
===================================================================
--- pear/php-net-socket/trunk/debian/changelog 2009-03-01 14:53:49 UTC (rev 1249)
+++ pear/php-net-socket/trunk/debian/changelog 2009-03-09 19:09:05 UTC (rev 1250)
@@ -1,9 +1,10 @@
-php-net-socket (1.0.9-2) UNRELEASED; urgency=low
+php-net-socket (1.0.9-2) unstable; urgency=high
* Add Build-Depends-Indep: php-pear, thanks James Westby
(Closes: #507214).
+ * Update licence information (Closes: #332616).
- -- Thijs Kinkhorst <thijs at debian.org> Sat, 29 Nov 2008 11:34:58 +0100
+ -- Thijs Kinkhorst <thijs at debian.org> Mon, 09 Mar 2009 20:06:43 +0100
php-net-socket (1.0.9-1) unstable; urgency=low
Modified: pear/php-net-socket/trunk/debian/copyright
===================================================================
--- pear/php-net-socket/trunk/debian/copyright 2009-03-01 14:53:49 UTC (rev 1249)
+++ pear/php-net-socket/trunk/debian/copyright 2009-03-09 19:09:05 UTC (rev 1250)
@@ -4,11 +4,13 @@
It was downloaded from http://pear.php.net/package/Net_Socket
The upstream copyright is held by The PHP Group, and the source is under
-the PHP License, version 2.02, the complete text of which follows:
+the PHP License. The source code mentions version 2.02, but the upstream
+website refers to 3.01. I'm assuming that the most recent information,
+being the website, is the intended licence. The text of the licence follows.
--------------------------------------------------------------------
- The PHP License, version 2.02
-Copyright (c) 1999 - 2002 The PHP Group. All rights reserved.
+ The PHP License, version 3.01
+Copyright (c) 1999 - 2009 The PHP Group. All rights reserved.
--------------------------------------------------------------------
Redistribution and use in source and binary forms, with or without
@@ -16,49 +18,39 @@
are met:
1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
+ 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.
+ 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 "PHP" must not be used to endorse or promote products
- derived from this software without prior permission from the
- PHP Group. This does not apply to add-on libraries or tools
- that work in conjunction with PHP. In such a case the PHP
- name may be used to indicate that the product supports PHP.
+ 3. The name "PHP" must not be used to endorse or promote products
+ derived from this software without prior written permission. For
+ written permission, please contact group at php.net.
+
+ 4. Products derived from this software may not be called "PHP", nor
+ may "PHP" appear in their name, without prior written permission
+ from group at php.net. You may indicate that your software works in
+ conjunction with PHP by saying "Foo for PHP" instead of calling
+ it "PHP Foo" or "phpfoo"
- 4. The PHP Group may publish revised and/or new versions of the
+ 5. The PHP Group may publish revised and/or new versions of the
license from time to time. Each version will be given a
distinguishing version number.
Once covered code has been published under a particular version
- of the license, you may always continue to use it under the
- terms of that version. You may also choose to use such covered
- code under the terms of any subsequent version of the license
+ of the license, you may always continue to use it under the terms
+ of that version. You may also choose to use such covered code
+ under the terms of any subsequent version of the license
published by the PHP Group. No one other than the PHP Group has
the right to modify the terms applicable to covered code created
under this License.
- 5. Redistributions of any form whatsoever must retain the following
+ 6. Redistributions of any form whatsoever must retain the following
acknowledgment:
- "This product includes PHP, freely available from
- http://www.php.net/".
+ "This product includes PHP software, freely available from
+ <http://www.php.net/software/>".
- 6. The software incorporates the Zend Engine, a product of Zend
- Technologies, Ltd. ("Zend"). The Zend Engine is licensed to the
- PHP Association (pursuant to a grant from Zend that can be
- found at http://www.php.net/license/ZendGrant/) for
- distribution to you under this license agreement, only as a
- part of PHP. In the event that you separate the Zend Engine
- (or any portion thereof) from the rest of the software, or
- modify the Zend Engine, or any portion thereof, your use of the
- separated or modified Zend Engine software shall not be governed
- by this license, and instead shall be governed by the license
- set forth at http://www.zend.com/license/ZendLicense/.
-
-
-
THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND
ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
@@ -74,10 +66,3 @@
--------------------------------------------------------------------
-This software consists of voluntary contributions made by many
-individuals on behalf of the PHP Group.
-
-The PHP Group can be contacted via Email at group at php.net.
-
-For more information on the PHP Group and the PHP project,
-please see <http://www.php.net>.
More information about the Pkg-php-commits
mailing list