summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Glazunov <vg@openoffice.org>2010-02-17 10:32:35 +0100
committerVladimir Glazunov <vg@openoffice.org>2010-02-17 10:32:35 +0100
commit4bc7de8f2867c8942e17220e1eb9539594b54475 (patch)
treecb1e11bfc7d8cdbdbe6aecc59b1d53cfdc950f4b
parent8943aa4a4b39653b91d69f89e7e3d6057b768d68 (diff)
parentaac3a82b827c04ce885e07e9fea8226aaf11b5c7 (diff)
CWS-TOOLING: integrate CWS changefileheader2
Notes
split repo tag: libs-extern_ooo/DEV300_m72 split repo tag: libs-extern_ooo/DEV300_m73
-rw-r--r--afms/makefile.mk6
-rwxr-xr-xagg/source/makefile.mk6
-rw-r--r--apple_remote/makefile.mk6
-rw-r--r--beanshell/bsh-2.0b1-src.patch8
-rw-r--r--beanshell/makefile.mk6
-rw-r--r--cppunit/cppunit-1.8.0-r1.patch47
-rw-r--r--cppunit/makefile.mk8
-rw-r--r--epm/makefile.mk6
-rw-r--r--external/glibc-2.1.3.patch15
-rw-r--r--external/glibc/makefile.mk6
-rw-r--r--external/mingwheaders/makefile.mk6
-rw-r--r--fondu/makefile.mk6
-rwxr-xr-xhsqldb/makefile.mk6
-rw-r--r--hyphen/hyphen-2.4.patch8
-rw-r--r--hyphen/makefile.mk6
-rw-r--r--icc/makefile.mk6
-rw-r--r--icc/source/create_sRGB_profile/create_sRGB_profile.cpp5
-rw-r--r--libegg/source/makefile.mk6
-rw-r--r--libtextcat/libtextcat-2.2.patch8
-rw-r--r--libtextcat/makefile.mk6
-rw-r--r--libwpd/makefile.mk6
-rw-r--r--libxmlsec/makefile.mk6
-rw-r--r--lpsolve/makefile.mk6
-rw-r--r--lucene/makefile.mk6
-rw-r--r--lucene/version.mk6
-rw-r--r--np_sdk/mozsrc/makefile.mk6
-rw-r--r--openssl/makefile.mk6
-rw-r--r--openssl/version.mk6
-rw-r--r--redland/raptor/makefile.mk6
-rw-r--r--redland/raptor/raptor-1.4.18.patch.dmake8
-rw-r--r--redland/rasqal/makefile.mk6
-rw-r--r--redland/rasqal/rasqal-0.9.16.patch.dmake8
-rw-r--r--redland/redland/makefile.mk6
-rw-r--r--redland/redland/redland-1.0.8.patch.dmake8
-rw-r--r--redland/redlandversion.mk6
-rwxr-xr-xrhino/makefile.mk6
-rw-r--r--rhino/rhino1_5R5.patch7
-rw-r--r--twain/util/makefile.mk6
-rw-r--r--vigra/makefile.mk6
-rwxr-xr-xxsltml/makefile.mk6
40 files changed, 62 insertions, 242 deletions
diff --git a/afms/makefile.mk b/afms/makefile.mk
index 922b10161f8b..2d61ed2dfa12 100644
--- a/afms/makefile.mk
+++ b/afms/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.6 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/agg/source/makefile.mk b/agg/source/makefile.mk
index 6182f8c2a705..e29f2c3b8891 100755
--- a/agg/source/makefile.mk
+++ b/agg/source/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/apple_remote/makefile.mk b/apple_remote/makefile.mk
index 4abde8bf709b..d261d5192708 100644
--- a/apple_remote/makefile.mk
+++ b/apple_remote/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.2 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/beanshell/bsh-2.0b1-src.patch b/beanshell/bsh-2.0b1-src.patch
index aa880975a12d..99e8b8b9ddc2 100644
--- a/beanshell/bsh-2.0b1-src.patch
+++ b/beanshell/bsh-2.0b1-src.patch
@@ -31,20 +31,16 @@
<property name="legacy-excludes"
--- misc/BeanShell/makefile.mk Fri Mar 28 15:56:40 2008
+++ misc/build/BeanShell/makefile.mk Fri Mar 28 15:56:06 2008
-@@ -1 +1,39 @@
+@@ -1 +1,35 @@
-dummy
+#*************************************************************************
+#
+# 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: bsh-2.0b1-src.patch,v $
-+#
-+# $Revision: 1.7 $
-+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/beanshell/makefile.mk b/beanshell/makefile.mk
index 215c59891d0b..6b2d09b00355 100644
--- a/beanshell/makefile.mk
+++ b/beanshell/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.6 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/cppunit/cppunit-1.8.0-r1.patch b/cppunit/cppunit-1.8.0-r1.patch
index b632c03596a8..9785fee093a6 100644
--- a/cppunit/cppunit-1.8.0-r1.patch
+++ b/cppunit/cppunit-1.8.0-r1.patch
@@ -758,19 +758,16 @@
#endif // CPPUNIT_TESTSUITE_H
--- misc/cppunit-1.8.0/include/cppunit/callbackfunc_fktptr.h 2009-09-14 08:43:30.656250000 +0200
+++ misc/build/cppunit-1.8.0/include/cppunit/callbackfunc_fktptr.h 2009-09-12 15:11:06.859375000 +0200
-@@ -1 +1,50 @@
+@@ -1 +1,47 @@
-dummy
+/*************************************************************************
+ *
+ * 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$
-+ * $Revision$
-+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -1121,19 +1118,16 @@
private:
--- misc/cppunit-1.8.0/include/cppunit/externcallbackfunc.hxx 2009-09-14 08:43:30.703125000 +0200
+++ misc/build/cppunit-1.8.0/include/cppunit/externcallbackfunc.hxx 2009-09-12 15:12:02.703125000 +0200
-@@ -1 +1,39 @@
+@@ -1 +1,36 @@
-dummy
+/*************************************************************************
+ *
+ * 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$
-+ * $Revision$
-+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -1164,19 +1158,16 @@
+#endif
--- misc/cppunit-1.8.0/include/cppunit/tagvalues.hxx 2009-09-14 08:43:30.609375000 +0200
+++ misc/build/cppunit-1.8.0/include/cppunit/tagvalues.hxx 2009-09-12 15:14:27.812500000 +0200
-@@ -1 +1,94 @@
+@@ -1 +1,91 @@
-dummy
+/*************************************************************************
+ *
+ * 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$
-+ * $Revision$
-+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -1262,20 +1253,16 @@
+#endif
--- misc/cppunit-1.8.0/makefile.mk 2009-09-12 15:20:48.343750000 +0200
+++ misc/build/cppunit-1.8.0/makefile.mk 2009-09-12 14:15:35.328125000 +0200
-@@ -1 +1,33 @@
+@@ -1 +1,29 @@
-dummy
+#*************************************************************************
+#
+# 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$
-+#
-+# $Revision$
-+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
@@ -2305,19 +2292,15 @@
+// End:
--- misc/cppunit-1.8.0/src/cppunit/makefile.mk 2009-09-12 15:20:48.515625000 +0200
+++ misc/build/cppunit-1.8.0/src/cppunit/makefile.mk 2009-09-12 14:15:35.468750000 +0200
-@@ -1 +1,90 @@
+@@ -1 +1,86 @@
-dummy
+#*************************************************************************
+#
+# 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$
-+#
-+# $Revision$
++# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
@@ -2399,20 +2382,16 @@
+
--- misc/cppunit-1.8.0/src/makefile.mk 2009-09-12 15:20:48.421875000 +0200
+++ misc/build/cppunit-1.8.0/src/makefile.mk 2009-09-12 14:15:35.484375000 +0200
-@@ -1 +1,33 @@
+@@ -1 +1,29 @@
-dummy
+#*************************************************************************
+#
+# 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$
-+#
-+# $Revision$
-+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index 3836e6905e9a..7fb183f1ebc2 100644
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -1,15 +1,11 @@
#*************************************************************************
#
# 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.1.2.3 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/epm/makefile.mk b/epm/makefile.mk
index 5f4f93db31b1..9cf767911ab5 100644
--- a/epm/makefile.mk
+++ b/epm/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.7 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/external/glibc-2.1.3.patch b/external/glibc-2.1.3.patch
index 4faa30ab19e2..57aae6a9c0fd 100644
--- a/external/glibc-2.1.3.patch
+++ b/external/glibc-2.1.3.patch
@@ -1,18 +1,15 @@
--- misc/glibc-2.1.3/posix/config.h Mon Mar 31 09:43:50 2008
+++ misc/build/glibc-2.1.3/posix/config.h Mon Mar 31 09:43:26 2008
-@@ -1 +1,45 @@
+@@ -1 +1,42 @@
-dummy
+/*************************************************************************
+ *
+ * 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: glibc-2.1.3.patch,v $
-+ * $Revision: 1.5 $
-+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -79,20 +76,16 @@
extern int getopt ();
--- misc/glibc-2.1.3/posix/makefile.mk Mon Mar 31 09:43:50 2008
+++ misc/build/glibc-2.1.3/posix/makefile.mk Mon Mar 31 09:43:38 2008
-@@ -1 +1,67 @@
+@@ -1 +1,63 @@
-dummy
+#*************************************************************************
+#
+# 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: glibc-2.1.3.patch,v $
-+#
-+# $Revision: 1.5 $
-+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/external/glibc/makefile.mk b/external/glibc/makefile.mk
index 8940a0cd2f84..067a4844df90 100644
--- a/external/glibc/makefile.mk
+++ b/external/glibc/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.10 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/external/mingwheaders/makefile.mk b/external/mingwheaders/makefile.mk
index 2834a54faa52..fb7183669fa3 100644
--- a/external/mingwheaders/makefile.mk
+++ b/external/mingwheaders/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.10.1 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/fondu/makefile.mk b/fondu/makefile.mk
index a543eaaa808a..b684461e0e34 100644
--- a/fondu/makefile.mk
+++ b/fondu/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.5 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/hsqldb/makefile.mk b/hsqldb/makefile.mk
index b38dea0d201d..0aea6c3e2b79 100755
--- a/hsqldb/makefile.mk
+++ b/hsqldb/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.22 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/hyphen/hyphen-2.4.patch b/hyphen/hyphen-2.4.patch
index 5aef3422d22a..33947f550a88 100644
--- a/hyphen/hyphen-2.4.patch
+++ b/hyphen/hyphen-2.4.patch
@@ -110,20 +110,16 @@ diff -u misc/hyphen-2.4/Makefile.in misc/build/hyphen-2.4/Makefile.in
diff -u misc/hyphen-2.4/makefile.mk misc/build/hyphen-2.4/makefile.mk
--- misc/hyphen-2.4/makefile.mk 2008-06-04 10:43:21.000000000 +0200
+++ misc/build/hyphen-2.4/makefile.mk 2008-06-04 12:40:46.000000000 +0200
-@@ -1 +1,58 @@
+@@ -1 +1,54 @@
-dummy
+#*************************************************************************
+#
+# 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: hyphen-2.4.patch,v $
-+#
-+# $Revision: 1.1.4.2 $
-+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk
index ab1c4d7dfffa..dea814e50447 100644
--- a/hyphen/makefile.mk
+++ b/hyphen/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.2.3 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/icc/makefile.mk b/icc/makefile.mk
index 2f353bc4a793..bdf9f1326085 100644
--- a/icc/makefile.mk
+++ b/icc/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.6 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/icc/source/create_sRGB_profile/create_sRGB_profile.cpp b/icc/source/create_sRGB_profile/create_sRGB_profile.cpp
index 9e95aab8d058..f99c1b1edf43 100644
--- a/icc/source/create_sRGB_profile/create_sRGB_profile.cpp
+++ b/icc/source/create_sRGB_profile/create_sRGB_profile.cpp
@@ -2,11 +2,6 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: create_sRGB_profile.cpp,v $
- *
- * $Revision: 1.6 $
- *
- * last change: $Author: rt $ $Date: 2008-04-11 07:31:14 $
Derived by beppec56@openoffice.org from various examples
in SampleICC library, the original copyright retained.
diff --git a/libegg/source/makefile.mk b/libegg/source/makefile.mk
index ee9a59dacc1c..030140513af5 100644
--- a/libegg/source/makefile.mk
+++ b/libegg/source/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.5 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/libtextcat/libtextcat-2.2.patch b/libtextcat/libtextcat-2.2.patch
index b9124f3df377..499ff3d4d442 100644
--- a/libtextcat/libtextcat-2.2.patch
+++ b/libtextcat/libtextcat-2.2.patch
@@ -932,20 +932,16 @@
+}
--- misc/libtextcat-2.2/src/makefile.mk Mon Mar 31 11:30:06 2008
+++ misc/build/libtextcat-2.2/src/makefile.mk Mon Mar 31 11:29:42 2008
-@@ -1 +1,91 @@
+@@ -1 +1,87 @@
-dummy
+#*************************************************************************
+#
+# 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: libtextcat-2.2.patch,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/libtextcat/makefile.mk b/libtextcat/makefile.mk
index c7d66e58cb62..5ac18a9402c2 100644
--- a/libtextcat/makefile.mk
+++ b/libtextcat/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/libwpd/makefile.mk b/libwpd/makefile.mk
index 0d66765ba4d8..a4f6b689e450 100644
--- a/libwpd/makefile.mk
+++ b/libwpd/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.16 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk
index d0b1b218afc2..f9c0310ad18b 100644
--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/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.19 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/lpsolve/makefile.mk b/lpsolve/makefile.mk
index d8663f7c905f..63738c127e79 100644
--- a/lpsolve/makefile.mk
+++ b/lpsolve/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.5 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/lucene/makefile.mk b/lucene/makefile.mk
index 2d87f23bd312..23111eaee861 100644
--- a/lucene/makefile.mk
+++ b/lucene/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.3.2.2 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/lucene/version.mk b/lucene/version.mk
index dd81ce14490a..fe9f60bcb669 100644
--- a/lucene/version.mk
+++ b/lucene/version.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: version.mk,v $
-#
-# $Revision: 1.2 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/np_sdk/mozsrc/makefile.mk b/np_sdk/mozsrc/makefile.mk
index 3e7f2ef28164..905146af5b35 100644
--- a/np_sdk/mozsrc/makefile.mk
+++ b/np_sdk/mozsrc/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.7 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/openssl/makefile.mk b/openssl/makefile.mk
index d8446f94f708..66bfa31a145e 100644
--- a/openssl/makefile.mk
+++ b/openssl/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.26 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/openssl/version.mk b/openssl/version.mk
index cd3b96709509..6eb8862cd883 100644
--- a/openssl/version.mk
+++ b/openssl/version.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: version.mk,v $
-#
-# $Revision: 1.4 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index 2dd5dfe69905..4980063203ad 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/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.6.4.4 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/redland/raptor/raptor-1.4.18.patch.dmake b/redland/raptor/raptor-1.4.18.patch.dmake
index a112796e693f..b0172754d8f1 100644
--- a/redland/raptor/raptor-1.4.18.patch.dmake
+++ b/redland/raptor/raptor-1.4.18.patch.dmake
@@ -1,19 +1,15 @@
--- misc/raptor-1.4.18/src/makefile.mk Thu Nov 6 15:25:51 2008
+++ misc/build/raptor-1.4.18/src/makefile.mk Thu Nov 6 15:33:14 2008
-@@ -1,1 +1,123 @@
+@@ -1,1 +1,119 @@
-dummy
+#*************************************************************************
+#
+# 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: raptor-1.4.18.patch,v $
-+#
-+# $Revision: 1.1.2.1 $
-+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index c7ae0ed07df4..af0f34ab9431 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/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.2.2 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/redland/rasqal/rasqal-0.9.16.patch.dmake b/redland/rasqal/rasqal-0.9.16.patch.dmake
index f79e38f33c2d..6795eb95c43d 100644
--- a/redland/rasqal/rasqal-0.9.16.patch.dmake
+++ b/redland/rasqal/rasqal-0.9.16.patch.dmake
@@ -1,19 +1,15 @@
--- misc/rasqal-0.9.16/src/makefile.mk Thu Nov 6 15:56:45 2008
+++ misc/build/rasqal-0.9.16/src/makefile.mk Thu Nov 6 15:55:09 2008
-@@ -1,1 +1,98 @@
+@@ -1,1 +1,94 @@
-dummy
+#*************************************************************************
+#
+# 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: rasqal-0.9.16.patch,v $
-+#
-+# $Revision: 1.1.2.1 $
-+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index 927f9868b10d..2808686420ce 100644
--- a/redland/redland/makefile.mk
+++ b/redland/redland/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.2.2 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/redland/redland/redland-1.0.8.patch.dmake b/redland/redland/redland-1.0.8.patch.dmake
index 39931b7b1b4b..34ba51d1c29a 100644
--- a/redland/redland/redland-1.0.8.patch.dmake
+++ b/redland/redland/redland-1.0.8.patch.dmake
@@ -1,19 +1,15 @@
--- misc/redland-1.0.8/librdf/makefile.mk Mon Jun 16 19:32:46 2008
+++ misc/build/redland-1.0.8/librdf/makefile.mk Mon Jun 16 19:26:20 2008
-@@ -1,1 +1,115 @@
+@@ -1,1 +1,111 @@
-dummy
+#*************************************************************************
+#
+# 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: redland-1.0.8.patch,v $
-+#
-+# $Revision: 1.1.2.1 $
-+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/redland/redlandversion.mk b/redland/redlandversion.mk
index e81022d1f274..e5389da3b419 100644
--- a/redland/redlandversion.mk
+++ b/redland/redlandversion.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: redlandversion.mk,v $
-#
-# $Revision: 1.1 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/rhino/makefile.mk b/rhino/makefile.mk
index 0809007ea7b4..2facbe2dea00 100755
--- a/rhino/makefile.mk
+++ b/rhino/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.10 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/rhino/rhino1_5R5.patch b/rhino/rhino1_5R5.patch
index 1c8fb2385705..21b4a484be8e 100644
--- a/rhino/rhino1_5R5.patch
+++ b/rhino/rhino1_5R5.patch
@@ -1043,19 +1043,16 @@
--- misc/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/debugger/OfficeScriptInfo.java Fri Mar 28 17:25:34 2008
+++ misc/build/rhino1_5R5/toolsrc/org/mozilla/javascript/tools/debugger/OfficeScriptInfo.java Fri Mar 28 17:24:59 2008
-@@ -1 +1,133 @@
+@@ -1 +1,130 @@
-dummy
+/*************************************************************************
+ *
+ * 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: rhino1_5R5.patch,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/twain/util/makefile.mk b/twain/util/makefile.mk
index de99d746d726..043de88badb2 100644
--- a/twain/util/makefile.mk
+++ b/twain/util/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.4 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vigra/makefile.mk b/vigra/makefile.mk
index 97f6b0e29bf6..b598de27152a 100644
--- a/vigra/makefile.mk
+++ b/vigra/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.3 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/xsltml/makefile.mk b/xsltml/makefile.mk
index 7192cd5c8839..7d86ca9da92f 100755
--- a/xsltml/makefile.mk
+++ b/xsltml/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.6 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify