Do we have a precedent for bundling LGPL? I didn't realize we'd
actually be bundling the code. I thought we'd rely on the library to
be on the system. Subtle difference I know but it can be viewed as
being part of the PHP package which in some RMS views might end up being viral.
Omar, can you get the contributors (any beside you?) to change the
license of the whole thing to PHP license?
Andi
At 05:14 PM 1/20/2006, Omar Kilani wrote:
omar Sat Jan 21 01:14:14 2006 UTC
Modified files:
/pecl/json json.c package.xml php_json.h
Log:
Change license from LGPL to PHP.
http://cvs.php.net/viewcvs.cgi/pecl/json/json.c?r1=1.4&r2=1.5&diff_format=u
Index: pecl/json/json.c
diff -u pecl/json/json.c:1.4 pecl/json/json.c:1.5
--- pecl/json/json.c:1.4 Thu Jan 12 03:50:22 2006
+++ pecl/json/json.c Sat Jan 21 01:14:14 2006
@@ -1,19 +1,22 @@
/*
- * Copyright (c) 2005 Omar Kilani <[EMAIL PROTECTED]>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public (LGPL)
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details: http://www.gnu.org/
- *
- */
+ +----------------------------------------------------------------------+
+ | PHP Version 5 |
+ +----------------------------------------------------------------------+
+ | Copyright (c) 1997-2006 The PHP Group |
+ +----------------------------------------------------------------------+
+ | This source file is subject to version 3.01 of the PHP license, |
+ | that is bundled with this package in the file LICENSE, and is |
+ | available through the world-wide-web at the following url: |
+ | http://www.php.net/license/3_01.txt |
+ | If you did not receive a copy of the PHP license and are unable to |
+ | obtain it through the world-wide-web, please send a note to |
+ | [EMAIL PROTECTED] so we can mail you a copy immediately. |
+ +----------------------------------------------------------------------+
+ | Author: Omar Kilani <[EMAIL PROTECTED]> |
+ +----------------------------------------------------------------------+
+*/
-/* $Id: json.c,v 1.4 2006/01/12 03:50:22 omar Exp $ */
+/* $Id: json.c,v 1.5 2006/01/21 01:14:14 omar Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
http://cvs.php.net/viewcvs.cgi/pecl/json/package.xml?r1=1.1&r2=1.2&diff_format=u
Index: pecl/json/package.xml
diff -u pecl/json/package.xml:1.1 pecl/json/package.xml:1.2
--- pecl/json/package.xml:1.1 Sun Dec 11 05:13:35 2005
+++ pecl/json/package.xml Sat Jan 21 01:14:14 2006
@@ -19,7 +19,7 @@
<release>
<state>stable</state>
<version>1.1.1</version>
- <date>2005-12-11</date>
+ <date>2006-01-12</date>
<notes>
Cleanup and TSRM performance fixes by rasmus.
</notes>
http://cvs.php.net/viewcvs.cgi/pecl/json/php_json.h?r1=1.2&r2=1.3&diff_format=u
Index: pecl/json/php_json.h
diff -u pecl/json/php_json.h:1.2 pecl/json/php_json.h:1.3
--- pecl/json/php_json.h:1.2 Wed Dec 7 09:12:38 2005
+++ pecl/json/php_json.h Sat Jan 21 01:14:14 2006
@@ -1,24 +1,27 @@
/*
- * Copyright (c) 2005 Omar Kilani <[EMAIL PROTECTED]>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public (LGPL)
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details: http://www.gnu.org/
- *
- */
+ +----------------------------------------------------------------------+
+ | PHP Version 5 |
+ +----------------------------------------------------------------------+
+ | Copyright (c) 1997-2006 The PHP Group |
+ +----------------------------------------------------------------------+
+ | This source file is subject to version 3.01 of the PHP license, |
+ | that is bundled with this package in the file LICENSE, and is |
+ | available through the world-wide-web at the following url: |
+ | http://www.php.net/license/3_01.txt |
+ | If you did not receive a copy of the PHP license and are unable to |
+ | obtain it through the world-wide-web, please send a note to |
+ | [EMAIL PROTECTED] so we can mail you a copy immediately. |
+ +----------------------------------------------------------------------+
+ | Author: Omar Kilani <[EMAIL PROTECTED]> |
+ +----------------------------------------------------------------------+
+*/
-/* $Id: php_json.h,v 1.2 2005/12/07 09:12:38 rasmus Exp $ */
+/* $Id: php_json.h,v 1.3 2006/01/21 01:14:14 omar Exp $ */
#ifndef PHP_JSON_H
#define PHP_JSON_H
-#define PHP_JSON_VERSION "1.1.0"
+#define PHP_JSON_VERSION "1.1.1"
extern zend_module_entry json_module_entry;
#define phpext_json_ptr &json_module_entry
--
PECL CVS Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php
--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php
