From 7b61477461fd8606d5f64b32cc9c24465419e056 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 5 Aug 2004 11:59:17 +0200 Subject: - Fixed libmysql license texts: added reference to the FLOSS EXCEPTIONS file and amended the GPL text as requested by Zak libmysql/Makefile.am: - Fixed license text, added reference to the EXCEPTIONS file libmysql/Makefile.shared: - Fixed license text, added reference to the EXCEPTIONS file libmysql/conf_to_src.c: - Fixed license text, added reference to the EXCEPTIONS file libmysql/dll.c: - Fixed license text, added reference to the EXCEPTIONS file libmysql/errmsg.c: - Fixed license text, added reference to the EXCEPTIONS file libmysql/get_password.c: - Fixed license text, added reference to the EXCEPTIONS file libmysql/libmysql.c: - Fixed license text, added reference to the EXCEPTIONS file libmysql/manager.c: - Fixed license text, added reference to the EXCEPTIONS file libmysql_r/Makefile.am: - Fixed license text, added reference to the EXCEPTIONS file --- libmysql_r/Makefile.am | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'libmysql_r/Makefile.am') diff --git a/libmysql_r/Makefile.am b/libmysql_r/Makefile.am index 04b6f3b6c6c..55ae906ee96 100644 --- a/libmysql_r/Makefile.am +++ b/libmysql_r/Makefile.am @@ -1,9 +1,12 @@ -# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB +# Copyright (C) 2000-2004 MySQL AB # -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Library General Public -# License as published by the Free Software Foundation; either -# version 2 of the License, or (at your option) any later version. +# This program is free software; you can redistribute it and/or modify +# it under the terms of version 2 GNU General Public License as +# published by the Free Software Foundation. +# +# There are special exceptions to the terms and conditions of the GPL as it +# is applied to this software. View the full text of the exception in file +# EXCEPTIONS in the directory of this software distribution. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -14,8 +17,8 @@ # License along with this library; if not, write to the Free # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA - - +# +# This file is public domain and comes with NO WARRANTY of any kind target = libmysqlclient_r.la target_defs = -DDONT_USE_RAID -DMYSQL_CLIENT @LIB_EXTRA_CCFLAGS@ -- cgit v1.2.1 From 06cd2efc2e231d0526091e3e9e4dc47985a8081c Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 5 Aug 2004 17:05:11 +0200 Subject: - rename: EXCEPTIONS->EXCEPTIONS-CLIENT --- libmysql_r/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libmysql_r/Makefile.am') diff --git a/libmysql_r/Makefile.am b/libmysql_r/Makefile.am index 55ae906ee96..8ed4a64d309 100644 --- a/libmysql_r/Makefile.am +++ b/libmysql_r/Makefile.am @@ -6,7 +6,7 @@ # # There are special exceptions to the terms and conditions of the GPL as it # is applied to this software. View the full text of the exception in file -# EXCEPTIONS in the directory of this software distribution. +# EXCEPTIONS-CLIENT in the directory of this software distribution. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -- cgit v1.2.1