cmcfixes72: merge with DEV300 m72

7 files changed, 10 insertions, 38 deletions

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 d805761e5b5d..fc9e93baaa6d 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 07a1e1dba452..c89724087dc9 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