| timbo@cvs.perl.org 2005-06-03, 8:27 pm |
| Author: timbo
Date: Sun May 22 04:51:39 2005
New Revision: 1060
Modified:
dbd-oracle/trunk/Changes
dbd-oracle/trunk/Oracle.h
dbd-oracle/trunk/Oracle.pm
dbd-oracle/trunk/Oraperl.pm
dbd-oracle/trunk/README
dbd-oracle/trunk/dbdimp.c
dbd-oracle/trunk/dbdimp.h
dbd-oracle/trunk/oci8.c
Log:
Simplify (normalize) copyright terms to just match Perl 5.
Modified: dbd-oracle/trunk/Changes
====================
====================
====================
==================
--- dbd-oracle/trunk/Changes (original)
+++ dbd-oracle/trunk/Changes Sun May 22 04:51:39 2005
@@ -16,6 +16,10 @@
Updated README.aix thanks to Stephen de Vries.
Updated README.macosx thanks to Stephen de Vries.
+ The Copyright terms for DBD::Oracle have been simplified and now read:
+ The DBD::Oracle module is free software; you can redistribute it
+ and/or modify it under the same terms as Perl 5.
+
=head1 Changes in DBD-Oracle 1.16 (svn rev 515) 22nd October 2004
NOTE:
Modified: dbd-oracle/trunk/Oracle.h
====================
====================
====================
==================
--- dbd-oracle/trunk/Oracle.h (original)
+++ dbd-oracle/trunk/Oracle.h Sun May 22 04:51:39 2005
@@ -1,12 +1,7 @@
/*
- $Id: Oracle.h,v 1.19 2003/09/29 21:13:03 timbo Exp $
+ Copyright (c) 1994-2005 Tim Bunce
- Copyright (c) 1994,1995 Tim Bunce
-
- You may distribute under the terms of either the GNU General Public
- License or the Artistic License, as specified in the Perl README file,
- with the exception that it cannot be placed on a CD-ROM or similar media
- for commercial distribution without the prior approval of the author.
+ See the COPYRIGHT section in the Oracle.pm file for terms.
*/
Modified: dbd-oracle/trunk/Oracle.pm
====================
====================
====================
==================
--- dbd-oracle/trunk/Oracle.pm (original)
+++ dbd-oracle/trunk/Oracle.pm Sun May 22 04:51:39 2005
@@ -1,7 +1,6 @@
-
-# Oracle.pm,v 1.1 2002/07/05 06:34:47 richter Exp
+# Oracle.pm
#
-# Copyright (c) 1994-2004 Tim Bunce, Ireland
+# Copyright (c) 1994-2005 Tim Bunce, Ireland
#
# See COPYRIGHT section in the documentation below
@@ -2766,14 +2765,10 @@ DBD::Oracle by Tim Bunce. DBI by Tim Bun
=head1 COPYRIGHT
-The DBD::Oracle module is Copyright (c) 1994-2004 Tim Bunce. Ireland.
+The DBD::Oracle module is Copyright (c) 1994-2005 Tim Bunce. Ireland.
The DBD::Oracle module is free software; you can redistribute it and/or
-modify it under the same terms as Perl itself with the exception that it
-cannot be placed on a CD-ROM or similar media for commercial distribution
-without the prior approval of the author unless the CD-ROM contains only
-Open Source software (http://www.opensource.org/licenses/index.php)
-or is primarily a copy of the majority of the CPAN archive.
+modify it under the same terms as Perl 5.
=head1 ACKNOWLEDGEMENTS
Modified: dbd-oracle/trunk/Oraperl.pm
====================
====================
====================
==================
--- dbd-oracle/trunk/Oraperl.pm (original)
+++ dbd-oracle/trunk/Oraperl.pm Sun May 22 04:51:39 2005
@@ -1,13 +1,10 @@
# Oraperl Emulation Interface for Perl 5 DBD::Oracle DBI
#
-# $Id: Oraperl.pm,v 1.44 2003/09/23 07:22:10 timbo Exp $
+# Oraperl.pm
#
# Copyright (c) 1994,1995 Tim Bunce
#
-# You may distribute under the terms of either the GNU General Public
-# License or the Artistic License, as specified in the Perl README file,
-# with the exception that it cannot be placed on a CD-ROM or similar media
-# for commercial distribution without the prior approval of the author.
+# See the COPYRIGHT section in the Oracle.pm file for terms.
#
# To use this interface use one of the following invocations:
#
Modified: dbd-oracle/trunk/README
====================
====================
====================
==================
--- dbd-oracle/trunk/README (original)
+++ dbd-oracle/trunk/README Sun May 22 04:51:39 2005
@@ -1,9 +1,9 @@
DBD::Oracle -- an Oracle interface for Perl 5.
- Copyright (c) 1994-2004 Tim Bunce, Ireland.
+ Copyright (c) 1994-2005 Tim Bunce, Ireland.
- See the COPYRIGHT section in the Oracle.pm file.
+ See the COPYRIGHT section in the Oracle.pm file for terms.
PLEASE READ THE ENTIRE README FILE CAREFULLY !
Modified: dbd-oracle/trunk/dbdimp.c
====================
====================
====================
==================
--- dbd-oracle/trunk/dbdimp.c (original)
+++ dbd-oracle/trunk/dbdimp.c Sun May 22 04:51:39 2005
@@ -1,13 +1,10 @@
/*
vim: sw=4:ts=8
- $Id: dbdimp.c,v 1.83 2004/02/26 01:32:01 timbo Exp $
+ dbdimp.c
Copyright (c) 1994-2004 Tim Bunce Ireland
- You may distribute under the terms of either the GNU General Public
- License or the Artistic License, as specified in the Perl README file,
- with the exception that it cannot be placed on a CD-ROM or similar media
- for commercial distribution without the prior approval of the author.
+ See the COPYRIGHT section in the Oracle.pm file for terms.
*/
Modified: dbd-oracle/trunk/dbdimp.h
====================
====================
====================
==================
--- dbd-oracle/trunk/dbdimp.h (original)
+++ dbd-oracle/trunk/dbdimp.h Sun May 22 04:51:39 2005
@@ -1,12 +1,9 @@
/*
$Id: dbdimp.h,v 1.48 2004/02/02 08:10:17 timbo Exp $
- Copyright (c) 1994,1995,1996,1997,
1998,1999 Tim Bunce
+ Copyright (c) 1994-2005 Tim Bunce
- You may distribute under the terms of either the GNU General Public
- License or the Artistic License, as specified in the Perl README file,
- with the exception that it cannot be placed on a CD-ROM or similar media
- for commercial distribution without the prior approval of the author.
+ See the COPYRIGHT section in the Oracle.pm file for terms.
*/
Modified: dbd-oracle/trunk/oci8.c
====================
====================
====================
==================
--- dbd-oracle/trunk/oci8.c (original)
+++ dbd-oracle/trunk/oci8.c Sun May 22 04:51:39 2005
@@ -1,13 +1,10 @@
/*
vim:sw=4:ts=8
- $Id: oci8.c,v 1.44 2004/02/26 01:32:01 timbo Exp $
+ oci8.c
- Copyright (c) 1998-2004 Tim Bunce Ireland
+ Copyright (c) 1998-2005 Tim Bunce Ireland
- You may distribute under the terms of either the GNU General Public
- License or the Artistic License, as specified in the Perl README file,
- with the exception that it cannot be placed on a CD-ROM or similar media
- for commercial distribution without the prior approval of the author.
+ See the COPYRIGHT section in the Oracle.pm file for terms.
*/
|