From 6523aca7291d55b7fcb7668610a6fb0c752a3770 Mon Sep 17 00:00:00 2001
From: "kent@mysql.com/kent-amd64.(none)" <>
Date: Sun, 31 Dec 2006 01:02:27 +0100
Subject: my_strtoll10-x86.s:   Corrected spelling in copyright text
 Makefile.am:   Don't update the files from BitKeeper Many files:   Removed
 "MySQL Finland AB & TCX DataKonsult AB" from copyright header   Adjusted
 year(s) in copyright header Many files:   Added GPL copyright text Removed
 files:   Docs/Support/colspec-fix.pl   Docs/Support/docbook-fixup.pl  
 Docs/Support/docbook-prefix.pl   Docs/Support/docbook-split  
 Docs/Support/make-docbook   Docs/Support/make-makefile  
 Docs/Support/test-make-manual   Docs/Support/test-make-manual-de  
 Docs/Support/xwf

---
 zlib/CMakeLists.txt | 15 +++++++++++++++
 zlib/Makefile.am    |  4 +++-
 2 files changed, 18 insertions(+), 1 deletion(-)

(limited to 'zlib')

diff --git a/zlib/CMakeLists.txt b/zlib/CMakeLists.txt
index 53560adf6d1..ac315b0dd85 100755
--- a/zlib/CMakeLists.txt
+++ b/zlib/CMakeLists.txt
@@ -1,3 +1,18 @@
+# Copyright (C) 2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program 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 General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
 SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
 
diff --git a/zlib/Makefile.am b/zlib/Makefile.am
index 074e2b39336..c40c922851e 100644
--- a/zlib/Makefile.am
+++ b/zlib/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2004 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+# Copyright (C) 2004-2006 MySQL AB
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -32,3 +32,5 @@ libz_la_SOURCES= adler32.c compress.c crc32.c deflate.c gzio.c \
 
 EXTRA_DIST= README FAQ INDEX ChangeLog algorithm.txt zlib.3 CMakeLists.txt
 
+# Don't update the files from bitkeeper
+%::SCCS/s.%
-- 
cgit v1.2.1