Skip to content

Commit

Permalink
Fixed licensing issues
Browse files Browse the repository at this point in the history
  • Loading branch information
derickr committed Nov 28, 2015
1 parent cc1b5aa commit f7952bc
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 31 deletions.
2 changes: 1 addition & 1 deletion package.xml
Expand Up @@ -30,7 +30,7 @@ punctuation and spacing.
<release>beta</release>
<api>beta</api>
</stability>
<license uri="http://www.php.net/license">PHP</license>
<license uri="http://www.opensource.org/licenses/bsd-license.php">BSD style</license>
<notes>
PHP 7 support
</notes>
Expand Down
24 changes: 9 additions & 15 deletions php_translit.h
@@ -1,19 +1,13 @@
/*
+----------------------------------------------------------------------+
| PHP Version 5 |
+----------------------------------------------------------------------+
| Copyright (c) 1997-2010 The PHP Group |
+----------------------------------------------------------------------+
| This source file is subject to version 3.0 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_0.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 |
| license@php.net so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
| Author: Derick Rethans <derick@php.net> |
+----------------------------------------------------------------------+
+----------------------------------------------------------------------+
| Copyright (c) 1997-2015 Derick Rethans |
+----------------------------------------------------------------------+
| This source file is subject to the 2-Clause BSD license which is |
| available through the LICENSE file, or online at |
| http://opensource.org/licenses/bsd-license.php |
+----------------------------------------------------------------------+
| Authors: Derick Rethans <derick@derickrethans.nl> |
+----------------------------------------------------------------------+
*/

/* $Id$ */
Expand Down
24 changes: 9 additions & 15 deletions translit.c
@@ -1,19 +1,13 @@
/*
+----------------------------------------------------------------------+
| PHP Version 5 |
+----------------------------------------------------------------------+
| Copyright (c) 1997-2010 The PHP Group |
+----------------------------------------------------------------------+
| This source file is subject to version 3.0 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_0.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 |
| license@php.net so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
| Author: Derick Rethans <derick@php.net> |
+----------------------------------------------------------------------+
+----------------------------------------------------------------------+
| Copyright (c) 1997-2015 Derick Rethans |
+----------------------------------------------------------------------+
| This source file is subject to the 2-Clause BSD license which is |
| available through the LICENSE file, or online at |
| http://opensource.org/licenses/bsd-license.php |
+----------------------------------------------------------------------+
| Authors: Derick Rethans <derick@derickrethans.nl> |
+----------------------------------------------------------------------+
*/

/* $Id$ */
Expand Down

2 comments on commit f7952bc

@glensc
Copy link
Contributor

@glensc glensc commented on f7952bc Dec 27, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please include this license change issue in changelog for 0.6.3 as well:

@derickr
Copy link
Owner Author

@derickr derickr commented on f7952bc Jan 5, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't retroactively change these changelogs, but it was fixed it in the package.xml file, and the PECL site has it right: https://pecl.php.net/package/translit

Please sign in to comment.