summaryrefslogtreecommitdiff
path: root/zlib
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2010-02-12 15:01:35 +0100
committerJens-Heiner Rechtien <hr@openoffice.org>2010-02-12 15:01:35 +0100
commit72e939d8ed5c57400a439d406586666faf6b7b2b (patch)
treebaba24818a4578b9766dd27cd3e96a3a35ae1929 /zlib
parent270a926584edf395c0839eb68e2722e9e52d48c9 (diff)
changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision)
Diffstat (limited to 'zlib')
-rwxr-xr-xzlib/make_patched_header.pl6
-rw-r--r--zlib/makefile.mk6
-rw-r--r--zlib/zlib-1.1.4.patch8
3 files changed, 3 insertions, 17 deletions
diff --git a/zlib/make_patched_header.pl b/zlib/make_patched_header.pl
index f0ff00f4baad..41dbdc5fbb96 100755
--- a/zlib/make_patched_header.pl
+++ b/zlib/make_patched_header.pl
@@ -5,14 +5,10 @@ eval 'exec perl -S $0 ${1+"$@"}'
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: make_patched_header.pl,v $
-#
-# $Revision: 1.3 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/zlib/makefile.mk b/zlib/makefile.mk
index c7e1ae8a7b50..e9c9a8c5c83e 100644
--- a/zlib/makefile.mk
+++ b/zlib/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/zlib/zlib-1.1.4.patch b/zlib/zlib-1.1.4.patch
index 6b76c9114e6e..b12ee8442174 100644
--- a/zlib/zlib-1.1.4.patch
+++ b/zlib/zlib-1.1.4.patch
@@ -1,15 +1,9 @@
--- misc/zlib-1.1.4/makefile.mk Fri Mar 14 10:17:06 2008
+++ misc/build/zlib-1.1.4/makefile.mk Fri Mar 14 10:16:56 2008
-@@ -1 +1,79 @@
+@@ -1 +1,73 @@
-dummy
+#*************************************************************************
+#
-+# $RCSfile: makefile.mk,v $
-+#
-+# $Revision: 1.8 $
-+#
-+# last change: $Author: mtg $ $Date: 2000/11/09 10:19:32 $
-+#
+# Copyright according the GNU Public License.
+#
+#*************************************************************************