Mon Apr 19 07:36:24 PDT 2010

afms/makefile.mk                                       |    8 
 agg/source/makefile.mk                                 |    8 
 apple_remote/AppleRemote.m                             |   29 +
 apple_remote/makefile.mk                               |    8 
 beanshell/bsh-2.0b1-src.patch                          |    8 
 beanshell/makefile.mk                                  |    8 
 cppunit/makefile.mk                                    |    8 
 epm/makefile.mk                                        |    8 
 external/glibc-2.1.3.patch                             |   15 
 external/glibc/makefile.mk                             |    8 
 external/mingwheaders/makefile.mk                      |    8 
 fondu/makefile.mk                                      |    8 
 hsqldb/makefile.mk                                     |    8 
 hyphen/makefile.mk                                     |    8 
 icc/makefile.mk                                        |    8 
 icc/source/create_sRGB_profile/create_sRGB_profile.cpp |    5 
 libegg/source/makefile.mk                              |    8 
 libtextcat/makefile.mk                                 |    8 
 libwpd/makefile.mk                                     |    8 
 libxmlsec/makefile.mk                                  |    8 
 lpsolve/makefile.mk                                    |    8 
 lucene/makefile.mk                                     |    8 
 lucene/version.mk                                      |    8 
 mysqlcppconn/cppconn_config.pmk                        |   33 +
 mysqlcppconn/download/mysql-connector-cpp.zip          |binary
 mysqlcppconn/makefile.mk                               |   88 ++++
 mysqlcppconn/mysql-connector-cpp.patch                 |  351 +++++++++++++++++
 mysqlcppconn/mysql_config.pmk                          |   49 ++
 mysqlcppconn/prj/build.lst                             |    3 
 mysqlcppconn/prj/d.lst                                 |   15 
 np_sdk/mozsrc/makefile.mk                              |    8 
 openssl/makefile.mk                                    |    8 
 openssl/version.mk                                     |    8 
 redland/raptor/makefile.mk                             |    8 
 redland/rasqal/makefile.mk                             |    8 
 redland/redland/makefile.mk                            |    8 
 redland/redlandversion.mk                              |    8 
 rhino/makefile.mk                                      |    8 
 rhino/rhino1_5R5.patch                                 |    7 
 twain/util/makefile.mk                                 |    8 
 vigra/makefile.mk                                      |    8 
 xsltml/makefile.mk                                     |    8 
 42 files changed, 635 insertions(+), 208 deletions(-)

New commits:
commit 37a364e004820d365506a250fbb423a58c2c1783
Author: Kurt Zenker <kz at openoffice.org>
Date:   Mon Mar 29 20:51:14 2010 +0200

    masterfix: #i110460# patch for buildfixes from mysqlc applied

diff --git a/mysqlcppconn/mysql_config.pmk b/mysqlcppconn/mysql_config.pmk
index e18697c..a8d48fe 100644
--- a/mysqlcppconn/mysql_config.pmk
+++ b/mysqlcppconn/mysql_config.pmk
@@ -35,13 +35,7 @@
   .ENDIF
 .ENDIF
 
-.IF "$(GUI)"!="WNT"
-
-.IF "$(SYSTEM_MYSQL)" == "YES"
-    MYSQL_LIB+=-lmysqlcppconn
-.ENDIF
-
-.ELSE   # "$(GUI)"!="WNT"
+.IF "$(GUI)"=="WNT"
 
 CFLAGS+=-DCPPDBC_WIN32 -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS
 
commit ffc7090b836ef5719760fe9a23998de6dcfb7837
Merge: eab441d... 3c21be2...
Author: obo <obo at openoffice.org>
Date:   Wed Mar 24 17:40:00 2010 +0100

    CWS-TOOLING: integrate CWS changefileheader3

commit eab441dd350543e92312b01319989dfec733eaa7
Merge: 9bcec85... bec2ace...
Author: obo <obo at openoffice.org>
Date:   Wed Mar 24 14:07:18 2010 +0100

    CWS-TOOLING: integrate CWS ooo321gsl01

commit 9bcec853e259084f559ada88b80824e210dbdfca
Merge: 417d284... 9ddf365...
Author: obo <obo at openoffice.org>
Date:   Tue Mar 23 12:56:01 2010 +0100

    CWS-TOOLING: integrate CWS native0

commit 3c21be29a151e2b1b6cdf2224f80c40dee1b2542
Author: Jens-Heiner Rechtien <hr at openoffice.org>
Date:   Fri Mar 19 17:41:38 2010 +0100

    changefileheader3: #i110248#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision)

diff --git a/afms/makefile.mk b/afms/makefile.mk
index 922b101..f5b176f 100644
--- a/afms/makefile.mk
+++ b/afms/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/agg/inc/agg_alpha_mask_u8.h b/agg/inc/agg_alpha_mask_u8.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_arc.h b/agg/inc/agg_arc.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_array.h b/agg/inc/agg_array.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_arrowhead.h b/agg/inc/agg_arrowhead.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_basics.h b/agg/inc/agg_basics.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_bezier_arc.h b/agg/inc/agg_bezier_arc.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_bitset_iterator.h b/agg/inc/agg_bitset_iterator.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_bounding_rect.h b/agg/inc/agg_bounding_rect.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_bspline.h b/agg/inc/agg_bspline.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_clip_liang_barsky.h b/agg/inc/agg_clip_liang_barsky.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_color_gray.h b/agg/inc/agg_color_gray.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_color_rgba.h b/agg/inc/agg_color_rgba.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_config.h b/agg/inc/agg_config.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_conv_adaptor_vcgen.h b/agg/inc/agg_conv_adaptor_vcgen.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_conv_adaptor_vpgen.h b/agg/inc/agg_conv_adaptor_vpgen.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_conv_bspline.h b/agg/inc/agg_conv_bspline.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_conv_clip_polygon.h b/agg/inc/agg_conv_clip_polygon.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_conv_clip_polyline.h b/agg/inc/agg_conv_clip_polyline.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_conv_close_polygon.h b/agg/inc/agg_conv_close_polygon.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_conv_concat.h b/agg/inc/agg_conv_concat.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_conv_contour.h b/agg/inc/agg_conv_contour.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_conv_curve.h b/agg/inc/agg_conv_curve.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_conv_dash.h b/agg/inc/agg_conv_dash.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_conv_gpc.h b/agg/inc/agg_conv_gpc.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_conv_marker.h b/agg/inc/agg_conv_marker.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_conv_marker_adaptor.h b/agg/inc/agg_conv_marker_adaptor.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_conv_segmentator.h b/agg/inc/agg_conv_segmentator.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_conv_shorten_path.h b/agg/inc/agg_conv_shorten_path.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_conv_smooth_poly1.h b/agg/inc/agg_conv_smooth_poly1.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_conv_stroke.h b/agg/inc/agg_conv_stroke.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_conv_transform.h b/agg/inc/agg_conv_transform.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_conv_unclose_polygon.h b/agg/inc/agg_conv_unclose_polygon.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_curves.h b/agg/inc/agg_curves.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_dda_line.h b/agg/inc/agg_dda_line.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_ellipse.h b/agg/inc/agg_ellipse.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_ellipse_bresenham.h b/agg/inc/agg_ellipse_bresenham.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_embedded_raster_fonts.h b/agg/inc/agg_embedded_raster_fonts.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_font_cache_manager.h b/agg/inc/agg_font_cache_manager.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_gamma_functions.h b/agg/inc/agg_gamma_functions.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_gamma_lut.h b/agg/inc/agg_gamma_lut.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_glyph_raster_bin.h b/agg/inc/agg_glyph_raster_bin.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_gsv_text.h b/agg/inc/agg_gsv_text.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_image_filters.h b/agg/inc/agg_image_filters.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_line_aa_basics.h b/agg/inc/agg_line_aa_basics.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_math.h b/agg/inc/agg_math.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_math_stroke.h b/agg/inc/agg_math_stroke.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_path_storage.h b/agg/inc/agg_path_storage.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_path_storage_integer.h b/agg/inc/agg_path_storage_integer.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_pattern_filters_rgba.h b/agg/inc/agg_pattern_filters_rgba.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_pixfmt_amask_adaptor.h b/agg/inc/agg_pixfmt_amask_adaptor.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_pixfmt_gray.h b/agg/inc/agg_pixfmt_gray.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_pixfmt_rgb.h b/agg/inc/agg_pixfmt_rgb.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_pixfmt_rgb_packed.h b/agg/inc/agg_pixfmt_rgb_packed.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_pixfmt_rgba.h b/agg/inc/agg_pixfmt_rgba.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_rasterizer_outline.h b/agg/inc/agg_rasterizer_outline.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_rasterizer_outline_aa.h b/agg/inc/agg_rasterizer_outline_aa.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_rasterizer_scanline_aa.h b/agg/inc/agg_rasterizer_scanline_aa.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_render_scanlines.h b/agg/inc/agg_render_scanlines.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_renderer_base.h b/agg/inc/agg_renderer_base.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_renderer_markers.h b/agg/inc/agg_renderer_markers.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_renderer_mclip.h b/agg/inc/agg_renderer_mclip.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_renderer_outline_aa.h b/agg/inc/agg_renderer_outline_aa.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_renderer_outline_image.h b/agg/inc/agg_renderer_outline_image.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_renderer_primitives.h b/agg/inc/agg_renderer_primitives.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_renderer_raster_text.h b/agg/inc/agg_renderer_raster_text.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_renderer_scanline.h b/agg/inc/agg_renderer_scanline.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_rendering_buffer.h b/agg/inc/agg_rendering_buffer.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_rendering_buffer_dynarow.h b/agg/inc/agg_rendering_buffer_dynarow.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_rounded_rect.h b/agg/inc/agg_rounded_rect.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_scanline_bin.h b/agg/inc/agg_scanline_bin.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_scanline_boolean_algebra.h b/agg/inc/agg_scanline_boolean_algebra.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_scanline_p.h b/agg/inc/agg_scanline_p.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_scanline_storage_aa.h b/agg/inc/agg_scanline_storage_aa.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_scanline_storage_bin.h b/agg/inc/agg_scanline_storage_bin.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_scanline_u.h b/agg/inc/agg_scanline_u.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_shorten_path.h b/agg/inc/agg_shorten_path.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_simul_eq.h b/agg/inc/agg_simul_eq.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_span_allocator.h b/agg/inc/agg_span_allocator.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_span_converter.h b/agg/inc/agg_span_converter.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_span_generator.h b/agg/inc/agg_span_generator.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_span_gouraud.h b/agg/inc/agg_span_gouraud.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_span_gouraud_gray.h b/agg/inc/agg_span_gouraud_gray.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_span_gouraud_rgba.h b/agg/inc/agg_span_gouraud_rgba.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_span_gradient.h b/agg/inc/agg_span_gradient.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_span_gradient_alpha.h b/agg/inc/agg_span_gradient_alpha.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_span_image_filter.h b/agg/inc/agg_span_image_filter.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_span_image_filter_gray.h b/agg/inc/agg_span_image_filter_gray.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_span_image_filter_rgb.h b/agg/inc/agg_span_image_filter_rgb.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_span_image_filter_rgba.h b/agg/inc/agg_span_image_filter_rgba.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_span_image_resample.h b/agg/inc/agg_span_image_resample.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_span_image_resample_gray.h b/agg/inc/agg_span_image_resample_gray.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_span_image_resample_rgb.h b/agg/inc/agg_span_image_resample_rgb.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_span_image_resample_rgba.h b/agg/inc/agg_span_image_resample_rgba.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_span_interpolator_adaptor.h b/agg/inc/agg_span_interpolator_adaptor.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_span_interpolator_linear.h b/agg/inc/agg_span_interpolator_linear.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_span_interpolator_persp.h b/agg/inc/agg_span_interpolator_persp.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_span_interpolator_trans.h b/agg/inc/agg_span_interpolator_trans.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_span_pattern.h b/agg/inc/agg_span_pattern.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_span_pattern_filter_gray.h b/agg/inc/agg_span_pattern_filter_gray.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_span_pattern_filter_rgb.h b/agg/inc/agg_span_pattern_filter_rgb.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_span_pattern_filter_rgba.h b/agg/inc/agg_span_pattern_filter_rgba.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_span_pattern_resample_gray.h b/agg/inc/agg_span_pattern_resample_gray.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_span_pattern_resample_rgb.h b/agg/inc/agg_span_pattern_resample_rgb.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_span_pattern_resample_rgba.h b/agg/inc/agg_span_pattern_resample_rgba.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_span_pattern_rgb.h b/agg/inc/agg_span_pattern_rgb.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_span_pattern_rgba.h b/agg/inc/agg_span_pattern_rgba.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_span_solid.h b/agg/inc/agg_span_solid.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_span_subdiv_adaptor.h b/agg/inc/agg_span_subdiv_adaptor.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_trans_affine.h b/agg/inc/agg_trans_affine.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_trans_bilinear.h b/agg/inc/agg_trans_bilinear.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_trans_double_path.h b/agg/inc/agg_trans_double_path.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_trans_lens.h b/agg/inc/agg_trans_lens.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_trans_perspective.h b/agg/inc/agg_trans_perspective.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_trans_single_path.h b/agg/inc/agg_trans_single_path.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_trans_viewport.h b/agg/inc/agg_trans_viewport.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_trans_warp_magnifier.h b/agg/inc/agg_trans_warp_magnifier.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_vcgen_bspline.h b/agg/inc/agg_vcgen_bspline.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_vcgen_contour.h b/agg/inc/agg_vcgen_contour.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_vcgen_dash.h b/agg/inc/agg_vcgen_dash.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_vcgen_markers_term.h b/agg/inc/agg_vcgen_markers_term.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_vcgen_smooth_poly1.h b/agg/inc/agg_vcgen_smooth_poly1.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_vcgen_stroke.h b/agg/inc/agg_vcgen_stroke.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_vcgen_vertex_sequence.h b/agg/inc/agg_vcgen_vertex_sequence.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_vertex_iterator.h b/agg/inc/agg_vertex_iterator.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_vertex_sequence.h b/agg/inc/agg_vertex_sequence.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_vpgen_clip_polygon.h b/agg/inc/agg_vpgen_clip_polygon.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_vpgen_clip_polyline.h b/agg/inc/agg_vpgen_clip_polyline.h
old mode 100755
new mode 100644
diff --git a/agg/inc/agg_vpgen_segmentator.h b/agg/inc/agg_vpgen_segmentator.h
old mode 100755
new mode 100644
diff --git a/agg/source/agg_arc.cpp b/agg/source/agg_arc.cpp
old mode 100755
new mode 100644
diff --git a/agg/source/agg_arrowhead.cpp b/agg/source/agg_arrowhead.cpp
old mode 100755
new mode 100644
diff --git a/agg/source/agg_bezier_arc.cpp b/agg/source/agg_bezier_arc.cpp
old mode 100755
new mode 100644
diff --git a/agg/source/agg_bspline.cpp b/agg/source/agg_bspline.cpp
old mode 100755
new mode 100644
diff --git a/agg/source/agg_curves.cpp b/agg/source/agg_curves.cpp
old mode 100755
new mode 100644
diff --git a/agg/source/agg_embedded_raster_fonts.cpp b/agg/source/agg_embedded_raster_fonts.cpp
old mode 100755
new mode 100644
diff --git a/agg/source/agg_gsv_text.cpp b/agg/source/agg_gsv_text.cpp
old mode 100755
new mode 100644
diff --git a/agg/source/agg_image_filters.cpp b/agg/source/agg_image_filters.cpp
old mode 100755
new mode 100644
diff --git a/agg/source/agg_line_aa_basics.cpp b/agg/source/agg_line_aa_basics.cpp
old mode 100755
new mode 100644
diff --git a/agg/source/agg_line_profile_aa.cpp b/agg/source/agg_line_profile_aa.cpp
old mode 100755
new mode 100644
diff --git a/agg/source/agg_path_storage.cpp b/agg/source/agg_path_storage.cpp
old mode 100755
new mode 100644
diff --git a/agg/source/agg_rasterizer_scanline_aa.cpp b/agg/source/agg_rasterizer_scanline_aa.cpp
old mode 100755
new mode 100644
diff --git a/agg/source/agg_rounded_rect.cpp b/agg/source/agg_rounded_rect.cpp
old mode 100755
new mode 100644
diff --git a/agg/source/agg_sqrt_tables.cpp b/agg/source/agg_sqrt_tables.cpp
old mode 100755
new mode 100644
diff --git a/agg/source/agg_trans_affine.cpp b/agg/source/agg_trans_affine.cpp
old mode 100755
new mode 100644
diff --git a/agg/source/agg_trans_double_path.cpp b/agg/source/agg_trans_double_path.cpp
old mode 100755
new mode 100644
diff --git a/agg/source/agg_trans_single_path.cpp b/agg/source/agg_trans_single_path.cpp
old mode 100755
new mode 100644
diff --git a/agg/source/agg_trans_warp_magnifier.cpp b/agg/source/agg_trans_warp_magnifier.cpp
old mode 100755
new mode 100644
diff --git a/agg/source/agg_vcgen_bspline.cpp b/agg/source/agg_vcgen_bspline.cpp
old mode 100755
new mode 100644
diff --git a/agg/source/agg_vcgen_contour.cpp b/agg/source/agg_vcgen_contour.cpp
old mode 100755
new mode 100644
diff --git a/agg/source/agg_vcgen_dash.cpp b/agg/source/agg_vcgen_dash.cpp
old mode 100755
new mode 100644
diff --git a/agg/source/agg_vcgen_markers_term.cpp b/agg/source/agg_vcgen_markers_term.cpp
old mode 100755
new mode 100644
diff --git a/agg/source/agg_vcgen_smooth_poly1.cpp b/agg/source/agg_vcgen_smooth_poly1.cpp
old mode 100755
new mode 100644
diff --git a/agg/source/agg_vcgen_stroke.cpp b/agg/source/agg_vcgen_stroke.cpp
old mode 100755
new mode 100644
diff --git a/agg/source/agg_vpgen_clip_polygon.cpp b/agg/source/agg_vpgen_clip_polygon.cpp
old mode 100755
new mode 100644
diff --git a/agg/source/agg_vpgen_clip_polyline.cpp b/agg/source/agg_vpgen_clip_polyline.cpp
old mode 100755
new mode 100644
diff --git a/agg/source/agg_vpgen_segmentator.cpp b/agg/source/agg_vpgen_segmentator.cpp
old mode 100755
new mode 100644
diff --git a/agg/source/makefile.mk b/agg/source/makefile.mk
old mode 100755
new mode 100644
index 6182f8c..ed24eaa
--- a/agg/source/makefile.mk
+++ b/agg/source/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.8 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/apple_remote/makefile.mk b/apple_remote/makefile.mk
index 4abde8b..06b3cb4 100644
--- a/apple_remote/makefile.mk
+++ b/apple_remote/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.2 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/beanshell/bsh-2.0b1-src.patch b/beanshell/bsh-2.0b1-src.patch
index aa88097..99e8b8b 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 215c598..9497f70 100644
--- a/beanshell/makefile.mk
+++ b/beanshell/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index 8f63656..ebc6b82 100644
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.1.2.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/epm/makefile.mk b/epm/makefile.mk
index 5f4f93d..8acb28f 100644
--- a/epm/makefile.mk
+++ b/epm/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.7 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/external/glibc-2.1.3.patch b/external/glibc-2.1.3.patch
index 4faa30a..57aae6a 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 8940a0c..8d7e97c 100644
--- a/external/glibc/makefile.mk
+++ b/external/glibc/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.10 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/external/mingwheaders/makefile.mk b/external/mingwheaders/makefile.mk
index 2834a54..65ccb9b 100644
--- a/external/mingwheaders/makefile.mk
+++ b/external/mingwheaders/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.8.10.1 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/fondu/makefile.mk b/fondu/makefile.mk
index a543eaa..d8bf8fd 100644
--- a/fondu/makefile.mk
+++ b/fondu/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/hsqldb/makefile.mk b/hsqldb/makefile.mk
old mode 100755
new mode 100644
index b38dea0..fa56888
--- a/hsqldb/makefile.mk
+++ b/hsqldb/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.22 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/hsqldb/version.mk b/hsqldb/version.mk
old mode 100755
new mode 100644
diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk
index ab1c4d7..7bc4830 100644
--- a/hyphen/makefile.mk
+++ b/hyphen/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.8.2.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/icc/makefile.mk b/icc/makefile.mk
index 2f353bc..ab010ac 100644
--- a/icc/makefile.mk
+++ b/icc/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/icc/source/create_sRGB_profile/create_sRGB_profile.cpp b/icc/source/create_sRGB_profile/create_sRGB_profile.cpp
index a75c676..20a8c7c 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 at 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 ee9a59d..2422ae0 100644
--- a/libegg/source/makefile.mk
+++ b/libegg/source/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/libtextcat/makefile.mk b/libtextcat/makefile.mk
index c7d66e5..b9db3bd 100644
--- a/libtextcat/makefile.mk
+++ b/libtextcat/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.8 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/libwpd/makefile.mk b/libwpd/makefile.mk
index 0d66765..6fa4cb1 100644
--- a/libwpd/makefile.mk
+++ b/libwpd/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.16 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk
index d0b1b21..89f1506 100644
--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.19 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/lpsolve/makefile.mk b/lpsolve/makefile.mk
index d8663f7..d390b7b 100644
--- a/lpsolve/makefile.mk
+++ b/lpsolve/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.5 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/lucene/makefile.mk b/lucene/makefile.mk
index 2d87f23..67e36e3 100644
--- a/lucene/makefile.mk
+++ b/lucene/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3.2.2 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/lucene/version.mk b/lucene/version.mk
index dd81ce1..73d922b 100644
--- a/lucene/version.mk
+++ b/lucene/version.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: version.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.2 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/np_sdk/mozsrc/makefile.mk b/np_sdk/mozsrc/makefile.mk
index 3e7f2ef..cec76ff 100644
--- a/np_sdk/mozsrc/makefile.mk
+++ b/np_sdk/mozsrc/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.7 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/openssl/makefile.mk b/openssl/makefile.mk
index 6fb48b7..5506e50 100644
--- a/openssl/makefile.mk
+++ b/openssl/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.26 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/openssl/version.mk b/openssl/version.mk
index cd3b967..d436596 100644
--- a/openssl/version.mk
+++ b/openssl/version.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: version.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.4 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index 2dd5dfe..5beb9e9 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6.4.4 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index c7ae0ed..96a35f4 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.8.2.2 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index bb9fe20..f2a9efc 100644
--- a/redland/redland/makefile.mk
+++ b/redland/redland/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.8.2.2 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/redland/redlandversion.mk b/redland/redlandversion.mk
index e81022d..0999ef0 100644
--- a/redland/redlandversion.mk
+++ b/redland/redlandversion.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: redlandversion.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.1 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/rhino/makefile.mk b/rhino/makefile.mk
old mode 100755
new mode 100644
index 24517b6..f35367b
--- a/rhino/makefile.mk
+++ b/rhino/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.10 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/rhino/rhino1_5R5.patch b/rhino/rhino1_5R5.patch
index 1c8fb23..21b4a48 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 de99d74..8a3ed30 100644
--- a/twain/util/makefile.mk
+++ b/twain/util/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.4 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/vigra/makefile.mk b/vigra/makefile.mk
index 97f6b0e..84034b6 100644
--- a/vigra/makefile.mk
+++ b/vigra/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.3 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
diff --git a/xsltml/makefile.mk b/xsltml/makefile.mk
old mode 100755
new mode 100644
index 7192cd5..71dbe85
--- a/xsltml/makefile.mk
+++ b/xsltml/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
 #
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-# $Revision: 1.6 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
 # This file is part of OpenOffice.org.
 #
commit 9ddf365f6bcba5963c4c0af8ec5ff62318546228
Author: Dirk Voelzke <dv at openoffice.org>
Date:   Fri Mar 5 09:48:14 2010 +0100

    native0ext:#161688# rebranding extensions, part 2

diff --git a/mysqlcppconn/makefile.mk b/mysqlcppconn/makefile.mk
index a27ab3c..191bae2 100755
--- a/mysqlcppconn/makefile.mk
+++ b/mysqlcppconn/makefile.mk
@@ -52,7 +52,7 @@ ADDITIONAL_FILES=\
 CONVERTFILES=\
                 cppconn$/build_config.h
 
-PATCH_FILE_NAME=$(TARFILE_NAME).patch
+PATCH_FILES=$(TARFILE_NAME).patch
 
 BUILD_DIR=driver
 BUILD_ACTION = \
commit 3bc7e0774fcda94ac132afeba03b4343dc0efa83
Author: Dirk Voelzke <dv at openoffice.org>
Date:   Thu Mar 4 16:00:23 2010 +0100

    native0ext:#161688# rebranding extensions

diff --git a/mysqlcppconn/cppconn_config.pmk b/mysqlcppconn/cppconn_config.pmk
new file mode 100644
index 0000000..b787c96
--- /dev/null
+++ b/mysqlcppconn/cppconn_config.pmk
@@ -0,0 +1,33 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+#   OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org 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 Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJNAME = mysqlcppconn
+ENABLE_EXCEPTIONS = TRUE
+USE_LDUMP2 = TRUE
+EXTERNAL_WARNINGS_NOT_ERRORS = TRUE
+
+CPPCONN_NATIVEAPI = cppconn_nativeapi
diff --git a/mysqlcppconn/download/mysql-connector-cpp.zip b/mysqlcppconn/download/mysql-connector-cpp.zip
new file mode 100644
index 0000000..07670ba
Binary files /dev/null and b/mysqlcppconn/download/mysql-connector-cpp.zip differ
diff --git a/mysqlcppconn/makefile.mk b/mysqlcppconn/makefile.mk
new file mode 100755
index 0000000..a27ab3c
--- /dev/null
+++ b/mysqlcppconn/makefile.mk
@@ -0,0 +1,88 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# 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
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org 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 Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=.
+
+PRJNAME=mysqlcppconn
+TARGET=so_mysqlcppconn
+
+EXT_PROJECT_NAME=mysql-connector-cpp
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+# --- Files --------------------------------------------------------
+
+TARFILE_NAME=$(EXT_PROJECT_NAME)
+ADDITIONAL_FILES=\
+                 driver$/makefile.mk \
+                 driver$/nativeapi$/makefile.mk \
+                 driver$/nativeapi$/binding_config.h \
+                 cppconn$/config.h
+
+CONVERTFILES=\
+                cppconn$/build_config.h
+
+PATCH_FILE_NAME=$(TARFILE_NAME).patch
+
+BUILD_DIR=driver
+BUILD_ACTION = \
+            cd nativeapi \
+         && $(MAKE) $(MFLAGS) $(CALLMACROS) \
+         && cd .. \
+         && $(MAKE) $(MFLAGS) $(CALLMACROS)
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+.INCLUDE : tg_ext.mk
+
+# --- post-build ---------------------------------------------------
+
+# "normalize" the output structure, in that the C/C++ headers are
+# copied to the canonic location in OUTPATH
+# The allows, later on, to use the standard mechanisms to deliver those
+# files, instead of delivering them out of OUTPATH/misc/build/..., which
+# could cause problems
+
+NORMALIZE_FLAG_FILE=so_normalized_$(TARGET)
+
+$(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
+    @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(EXT_PROJECT_NAME)$/driver$/mysql_driver.h $(INCCOM)
+    -@$(MKDIRHIER) $(INCCOM)$/cppconn
+    @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(EXT_PROJECT_NAME)$/cppconn$/* $(INCCOM)$/cppconn
+    @$(TOUCH) $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE)
+
+normalize: $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE)
+
+$(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) : normalize
diff --git a/mysqlcppconn/mysql-connector-cpp.patch b/mysqlcppconn/mysql-connector-cpp.patch
new file mode 100644
index 0000000..da90b01
--- /dev/null
+++ b/mysqlcppconn/mysql-connector-cpp.patch
@@ -0,0 +1,351 @@
+--- misc/mysql-connector-cpp/cppconn/build_config.h	2009-08-13 17:13:46.000000000 +0200
++++ misc/build/mysql-connector-cpp/cppconn/build_config.h	2009-08-14 09:56:40.296875000 +0200
+@@ -12,25 +12,23 @@
+ #ifndef _SQL_BUILD_CONFIG_H_
+ #define _SQL_BUILD_CONFIG_H_
+ 
+-#ifndef CPPCONN_PUBLIC_FUNC
+-
+-#if defined(_WIN32)
++#ifndef _SAL_TYPES_H_
++#include <sal/types.h>
++#endif
++  
+  // mysqlcppconn_EXPORTS is added by cmake and defined for dynamic lib build only
+   #ifdef mysqlcppconn_EXPORTS
+-    #define CPPCONN_PUBLIC_FUNC __declspec(dllexport)
++    #define CPPCONN_PUBLIC_FUNC SAL_DLLPUBLIC_EXPORT
+   #else
+     // this is for static build
+     #ifdef CPPCONN_LIB_BUILD
+       #define CPPCONN_PUBLIC_FUNC
+     #else
+       // this is for clients using dynamic lib
+-      #define CPPCONN_PUBLIC_FUNC __declspec(dllimport)
++      #define CPPCONN_PUBLIC_FUNC SAL_DLLPUBLIC_IMPORT
+     #endif
+   #endif
+-#else
+-  #define CPPCONN_PUBLIC_FUNC
+-#endif
+ 
+-#endif    //#ifndef CPPCONN_PUBLIC_FUNC
++  #define CPPCONN_PUBLIC_EXCEPTION SAL_EXCEPTION_DLLPUBLIC_EXPORT
+ 
+ #endif    //#ifndef _SQL_BUILD_CONFIG_H_
+--- misc/mysql-connector-cpp/cppconn/config.h	2009-08-14 10:17:38.234375000 +0200
++++ misc/build/mysql-connector-cpp/cppconn/config.h	2009-08-14 09:56:37.000000000 +0200
+@@ -1 +1,34 @@
+-dummy
++#include <sal/types.h>
++
++#define HAVE_FUNCTION_STRTOL 1
++#define HAVE_FUNCTION_STRTOUL 1
++#define HAVE_FUNCTION_STRTOL 1
++#define HAVE_FUNCTION_STRTOULL 1
++
++#if defined(MACOSX) || defined(SOLARIS) || defined(LINUX)
++    #define HAVE_STDINT_H
++    #define HAVE_INTTYPES_H
++#endif
++
++#ifdef HAVE_STDINT_H
++#include <stdint.h>
++#endif
++
++#ifdef HAVE_INTTYPES_H
++#include <inttypes.h>
++#endif
++
++#if !defined(HAVE_STDINT_H) && !defined(HAVE_INTTYPES_H) 
++
++// if we do not have the standard C99 integer types, then define them based on the respective SAL types
++#if !defined(_SYS_TYPES_H)
++typedef sal_Int8    int8_t;
++typedef sal_Int16   int16_t;
++typedef sal_Int32   int32_t;
++#endif // !defined(_SYS_TYPES_H)
++typedef sal_uInt8   uint8_t;
++typedef sal_uInt16  uint16_t;
++typedef sal_uInt32  uint32_t;
++typedef sal_Int64   int64_t;
++typedef sal_uInt64  uint64_t;
++#endif // !defined(HAVE_STDINT_H) && !defined(HAVE_INTTYPES_H)
+--- misc/mysql-connector-cpp/cppconn/connection.h	2009-08-13 17:13:46.000000000 +0200
++++ misc/build/mysql-connector-cpp/cppconn/connection.h	2009-08-14 09:56:37.000000000 +0200
+@@ -13,7 +13,6 @@
+ #define _SQL_CONNECTION_H_
+ 
+ #include <map>
+-#include <boost/variant.hpp>
+ 
+ #include "build_config.h"
+ #include "warning.h"
+@@ -22,8 +21,54 @@
+ namespace sql
+ {
+ 
+-
+-typedef boost::variant<int, double, bool, sql::SQLString > ConnectPropertyVal;
++// hack around the non-existent ::boost::variant in OOo 3.1 build env
++struct ConnectPropertyVal
++{
++    sql::SQLString valString;
++    int            valInt;
++    bool           valBool;
++
++    ConnectPropertyVal()
++    {
++        reset();
++    }
++    ConnectPropertyVal( const sql::SQLString& _val )
++    {
++        *this = _val;
++    }
++    ConnectPropertyVal( const int _val )
++    {
++        *this = _val;
++    }
++    ConnectPropertyVal( const bool _val )
++    {
++        *this = _val;
++    }
++    ConnectPropertyVal& operator=( const sql::SQLString& _val )
++    {
++        reset();
++        valString = _val;
++        return *this;
++    }
++    ConnectPropertyVal& operator=( const int _val )
++    {
++        reset();
++        valInt = _val;
++        return *this;
++    }
++    ConnectPropertyVal& operator=( const bool _val )
++    {
++        reset();
++        valBool = _val;
++        return *this;
++    }
++    void reset()
++    {
++        valString = std::string();
++        valInt = 0;
++        valBool = false;
++    }
++};
+ 
+ typedef std::map< sql::SQLString, ConnectPropertyVal > ConnectOptionsMap;
+ 
+--- misc/mysql-connector-cpp/cppconn/exception.h	2009-08-13 17:13:46.000000000 +0200
++++ misc/build/mysql-connector-cpp/cppconn/exception.h	2009-08-14 09:56:37.000000000 +0200
+@@ -38,7 +38,7 @@
+ #pragma warning(push)
+ #pragma warning(disable: 4275)
+ #endif
+-class CPPCONN_PUBLIC_FUNC SQLException : public std::runtime_error
++class CPPCONN_PUBLIC_EXCEPTION SQLException : public std::runtime_error
+ {
+ #ifdef _WIN32
+ #pragma warning(pop)
+@@ -78,7 +78,7 @@
+ 	MEMORY_ALLOC_OPERATORS(SQLException)
+ };
+ 
+-struct CPPCONN_PUBLIC_FUNC MethodNotImplementedException : public SQLException
++struct CPPCONN_PUBLIC_EXCEPTION MethodNotImplementedException : public SQLException
+ {
+ 	MethodNotImplementedException(const MethodNotImplementedException& e) : SQLException(e.what(), e.sql_state, e.errNo) { }
+ 	MethodNotImplementedException(const std::string& reason) : SQLException(reason, "", 0) {}
+@@ -87,7 +87,7 @@
+ 	virtual SQLException* copy() { return new MethodNotImplementedException(*this); }
+ };
+ 
+-struct CPPCONN_PUBLIC_FUNC InvalidArgumentException : public SQLException
++struct CPPCONN_PUBLIC_EXCEPTION InvalidArgumentException : public SQLException
+ {
+ 	InvalidArgumentException(const InvalidArgumentException& e) : SQLException(e.what(), e.sql_state, e.errNo) { }
+ 	InvalidArgumentException(const std::string& reason) : SQLException(reason, "", 0) {}
+@@ -96,7 +96,7 @@
+ 	virtual SQLException* copy() { return new InvalidArgumentException(*this); }
+ };
+ 
+-struct CPPCONN_PUBLIC_FUNC InvalidInstanceException : public SQLException
++struct CPPCONN_PUBLIC_EXCEPTION InvalidInstanceException : public SQLException
+ {
+ 	InvalidInstanceException(const InvalidInstanceException& e) : SQLException(e.what(), e.sql_state, e.errNo) { }
+ 	InvalidInstanceException(const std::string& reason) : SQLException(reason, "", 0) {}
+@@ -106,7 +106,7 @@
+ };
+ 
+ 
+-struct CPPCONN_PUBLIC_FUNC NonScrollableException : public SQLException
++struct CPPCONN_PUBLIC_EXCEPTION NonScrollableException : public SQLException
+ {
+ 	NonScrollableException(const NonScrollableException& e) : SQLException(e.what(), e.sql_state, e.errNo) { }
+ 	NonScrollableException(const std::string& reason) : SQLException(reason, "", 0) {}
+--- misc/mysql-connector-cpp/driver/makefile.mk	2009-08-14 10:17:33.890625000 +0200
++++ misc/build/mysql-connector-cpp/driver/makefile.mk	2009-08-14 09:56:37.015625000 +0200
+@@ -1 +1,63@@
+-dummy
++PRJ=..$/..$/..$/..$/..
++
++.INCLUDE : $(PRJ)$/cppconn_config.pmk
++
++PRJINC=..
++TARGET=$(PRJNAME)
++
++# --- Settings -----------------------------------------------------
++
++.INCLUDE :  settings.mk
++
++.INCLUDE : $(PRJ)$/mysql_config.pmk
++
++# --- Files --------------------------------------------------------
++
++.IF "$(GUI)-$(OS)-$(RTL_ARCH)" == "UNX-LINUX-x86"
++    SHL1NOCHECK=TRUE
++.ENDIF
++SHL1TARGET=$(TARGET)
++
++LIB1TARGET=$(SLB)$/$(PRJNAME).lib
++LIB1OBJFILES+= \
++        $(SLO)$/mysql_art_resultset.obj \
++        $(SLO)$/mysql_art_rset_metadata.obj \
++        $(SLO)$/mysql_connection.obj \
++        $(SLO)$/mysql_debug.obj \
++        $(SLO)$/mysql_driver.obj \
++        $(SLO)$/mysql_metadata.obj \
++        $(SLO)$/mysql_parameter_metadata.obj \
++        $(SLO)$/mysql_prepared_statement.obj \
++        $(SLO)$/mysql_ps_resultset.obj \
++        $(SLO)$/mysql_ps_resultset_metadata.obj \
++        $(SLO)$/mysql_resultbind.obj \
++        $(SLO)$/mysql_resultset.obj \
++        $(SLO)$/mysql_resultset_metadata.obj \
++        $(SLO)$/mysql_statement.obj \
++        $(SLO)$/mysql_util.obj \
++        $(SLO)$/mysql_warning.obj \
++
++SHL1STDLIBS=\
++       $(MYSQL_LIB)
++
++SHL1IMPLIB=  i$(TARGET)
++SHL1LIBS=    $(LIB1TARGET) $(SLB)$/$(CPPCONN_NATIVEAPI).lib
++SHL1DEF=     $(MISC)$/$(SHL1TARGET).def
++DEF1NAME=    $(SHL1TARGET)
++DEF1DEPN=    $(MISC)$/$(SHL1TARGET).flt \
++              $(LIB1TARGET)
++DEFLIB1NAME=$(TARGET)
++
++# --- Targets ------------------------------------------------------
++
++.INCLUDE :  target.mk
++
++# --- filter file ------------------------------
++
++.IF "$(depend)"==""
++$(MISC)$/$(SHL1TARGET).flt: makefile.mk
++    @echo CLEAR_THE_FILE	> $@
++	@echo _TI				>>$@
++	@echo _real				>>$@
++	@echo __CT				>>$@
++.ENDIF # "$(depend)"==""
+--- misc/mysql-connector-cpp/driver/mysql_connection.cpp	2009-08-13 17:13:46.000000000 +0200
++++ misc/build/mysql-connector-cpp/driver/mysql_connection.cpp	2009-08-14 09:56:37.015625000 +0200
+@@ -50,6 +50,34 @@
+ #include "mysql_debug.h"
+ 
+ 
++// part II of the hack to make C/C++ compile in an OOo env which doesn't have boost::variant installed
++namespace boost
++{
++    template < class TYPE >
++    const TYPE* get( const sql::ConnectPropertyVal* val )
++    {
++        return val;
++    }
++
++    template < >
++    const sql::SQLString* get< sql::SQLString >( const sql::ConnectPropertyVal* val )
++    {
++        return &val->valString;
++    }
++
++    template < >
++    const int* get< int >( const sql::ConnectPropertyVal* val )
++    {
++        return &val->valInt;
++    }
++
++    template < >
++    const bool* get< bool >( const sql::ConnectPropertyVal* val )
++    {
++        return &val->valBool;
++    }
++}
++
+ namespace sql
+ {
+ namespace mysql
+--- misc/mysql-connector-cpp/driver/mysql_debug.h	2009-08-13 17:13:46.000000000 +0200
++++ misc/build/mysql-connector-cpp/driver/mysql_debug.h	2009-08-14 09:56:37.015625000 +0200
+@@ -25,16 +25,6 @@
+ 
+ 
+ 
+-#if defined(WE_HAVE_VARARGS_MACRO_SUPPORT) && (CPPCONN_TRACE_ENABLED || defined(SAL_DLLPRIVATE))
+-	#define CPP_ENTER(msg)			const boost::shared_ptr< MySQL_DebugLogger > __l = this->logger;(void)__l;\
+-									MySQL_DebugEnterEvent __this_func(__LINE__, __FILE__, msg, this->logger)
+-	#define CPP_ENTER_WL(l, msg)	const boost::shared_ptr< MySQL_DebugLogger > __l = (l);(void)__l;\
+-									MySQL_DebugEnterEvent __this_func(__LINE__, __FILE__, msg, (l))
+-	#define CPP_INFO(msg)		{if (__l) __l->log("INF", msg); }
+-	#define CPP_INFO_FMT(...)	{if (__l) __l->log_va("INF", __VA_ARGS__); }
+-	#define CPP_ERR(msg)		{if (__l) __l->log("ERR", msg); }
+-	#define CPP_ERR_FMT(...)	{if (__l) __l->log_va("ERR", __VA_ARGS__); }
+-#else
+ 	#define CPP_ENTER(msg)
+ 	#define CPP_ENTER_WL(l, msg)
+ 	#define CPP_INFO(msg)
+@@ -42,7 +32,6 @@
+ 	#define CPP_ENTER_WL(l, msg)
+ 	static inline void CPP_INFO_FMT(...) {}
+ 	static inline void CPP_ERR_FMT(...) {}
+-#endif
+ 
+ #include <stack>
+ #include "mysql_util.h"
+--- misc/mysql-connector-cpp/driver/nativeapi/binding_config.h	2009-08-14 10:17:23.640625000 +0200
++++ misc/build/mysql-connector-cpp/driver/nativeapi/binding_config.h	2009-08-14 10:13:50.359375000 +0200
+@@ -1 +1,2 @@
+-dummy
++#define HAVE_DLFCN_H 1
++//#define MYSQLCLIENT_STATIC_BINDING 1
+--- misc/mysql-connector-cpp/driver/nativeapi/makefile.mk	2009-08-17 21:32:53.694119382 +0200
++++ misc/build/mysql-connector-cpp/driver/nativeapi/makefile.mk	2009-08-17 21:32:50.534346360 +0200
+@@ -1 +1,23 @@
+-dummy
++PRJ=..$/..$/..$/..$/..$/..
++PRJINC=..$/..
++
++.INCLUDE : $(PRJ)$/cppconn_config.pmk
++
++TARGET=$(CPPCONN_NATIVEAPI)
++
++# --- Settings -----------------------------------------------------
++
++.INCLUDE :  settings.mk
++
++.INCLUDE : $(PRJ)$/mysql_config.pmk
++
++LIB1TARGET=$(SLB)$/$(TARGET).lib
++LIB1OBJFILES+= \
++        $(SLO)$/mysql_client_api.obj \
++        $(SLO)$/library_loader.obj \
++        $(SLO)$/mysql_native_connection_wrapper.obj \
++        $(SLO)$/mysql_native_resultset_wrapper.obj \
++        $(SLO)$/mysql_native_statement_wrapper.obj \
++
++# --- Targets ------------------------------------------------------
++.INCLUDE :  target.mk
diff --git a/mysqlcppconn/mysql_config.pmk b/mysqlcppconn/mysql_config.pmk
new file mode 100644
index 0000000..e18697c
--- /dev/null
+++ b/mysqlcppconn/mysql_config.pmk
@@ -0,0 +1,55 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+#   OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org 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 Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+.IF "$(SYSTEM_MYSQL)" == "YES"
+  CFLAGS+=-DSYSTEM_MYSQL
+.ELSE
+  .IF "$(LIBMYSQL_PATH)" == ""
+    alltar:
+      @echo "need to have LIBMYSQL_PATH set to the location where libmysql (also known as 'MySQL Connector/C') is installed"
+      @force_dmake_to_error
+  .ENDIF
+.ENDIF
+
+.IF "$(GUI)"!="WNT"
+
+.IF "$(SYSTEM_MYSQL)" == "YES"
+    MYSQL_LIB+=-lmysqlcppconn
+.ENDIF
+
+.ELSE   # "$(GUI)"!="WNT"
+
+CFLAGS+=-DCPPDBC_WIN32 -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS
+
+.ENDIF  # "$(GUI)"!="WNT"
+
+.IF "$(SYSTEM_MYSQL)" != "YES"
+    MYSQL_INC+=-I$(LIBMYSQL_PATH)$/include
+.ENDIF
+
+CFLAGS+=-I$(PRJINC) -I$(PRJINC)$/cppconn $(MYSQL_INC) -DCPPCONN_LIB_BUILD
+
diff --git a/mysqlcppconn/prj/build.lst b/mysqlcppconn/prj/build.lst
new file mode 100755
index 0000000..f7407ba
--- /dev/null
+++ b/mysqlcppconn/prj/build.lst
@@ -0,0 +1,3 @@
+my	mysqlcppconn	:	solenv sal NULL
+my	mysqlcppconn    nmake	-	all	my_mkout NULL
+
diff --git a/mysqlcppconn/prj/d.lst b/mysqlcppconn/prj/d.lst
new file mode 100755
index 0000000..7a32571
--- /dev/null
+++ b/mysqlcppconn/prj/d.lst
@@ -0,0 +1,15 @@
+# mirror the dir structure a make install would create
+mkdir: %_DEST%\inc%_EXT%\mysqlcppconn
+mkdir: %_DEST%\inc%_EXT%\mysqlcppconn\cppconn
+
+..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\mysqlcppconn\*.h
+..\%__SRC%\inc\cppconn\*.h %_DEST%\inc%_EXT%\mysqlcppconn\cppconn\*.h
+
+..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
+
+ ..\%__SRC%\lib\lib*.so* %_DEST%\lib%_EXT%
+..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl
+..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
+..\%__SRC%\lib\*.dylib.* %_DEST%\lib%_EXT%\*.dylib.*
+..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
+..\%__SRC%\lib\i*.lib %_DEST%\lib%_EXT%
commit 417d28459835a2a3203fd4c029196638fc242ae0
Author: Kurt Zenker <kz at openoffice.org>
Date:   Mon Feb 15 13:42:50 2010 +0000

    Create tag for OOo 3.2 aka SO 9.2
commit d009c43bcf0c9bcea8c57a2211723c4706cb9d5c
Author: Release Engineers <releng at openoffice.org>
Date:   Tue Feb 2 11:49:41 2010 +0000

    Create OOO320_m12 milestone tag from branches/OOO320 at 277974
commit bec2aceaf2e23101f78e92b4d2a6d8f11f8f3505
Author: Philipp Lohmann <pl at openoffice.org>
Date:   Wed Jan 20 16:10:31 2010 +0000

    #i108457# downport i107648 to 3.2.1

diff --git a/apple_remote/AppleRemote.m b/apple_remote/AppleRemote.m
index 25a6771..a65cc64 100644
--- a/apple_remote/AppleRemote.m
+++ b/apple_remote/AppleRemote.m
@@ -42,6 +42,9 @@ const char* AppleRemoteDeviceName = "AppleIRController";
 #ifndef NSAppKitVersionNumber10_4
 	#define NSAppKitVersionNumber10_4 824
 #endif
+#ifndef NSAppKitVersionNumber10_5
+	#define NSAppKitVersionNumber10_5 949
+#endif
 
 @implementation AppleRemote
 
@@ -53,6 +56,9 @@ const char* AppleRemoteDeviceName = "AppleIRController";
     
     // TODO : avoid such magics 
 	if (floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_4) {
+	    #ifdef DEBUG
+	    NSLog( @"setting 10.4 cookies" );
+	    #endif
 		// 10.4.x Tiger
 		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlus]		forKey:@"14_12_11_6_"];
 		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMinus]		forKey:@"14_13_11_6_"];		
@@ -65,7 +71,10 @@ const char* AppleRemoteDeviceName = "AppleIRController";
 		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu_Hold]	forKey:@"14_6_14_6_"];
 		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay_Hold]	forKey:@"18_14_6_18_14_6_"];
 		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched]	forKey:@"19_"];			
-	} else {
+	} else if( floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_5 ) {
+	    #ifdef DEBUG
+	    NSLog( @"setting 10.5 cookies" );
+	    #endif
 		// 10.5.x Leopard
 		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlus]		forKey:@"31_29_28_19_18_"];
 		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMinus]		forKey:@"31_30_28_19_18_"];	
@@ -79,6 +88,24 @@ const char* AppleRemoteDeviceName = "AppleIRController";
 		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay_Hold]	forKey:@"35_31_19_18_35_31_19_18_"];
 		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched]	forKey:@"19_"];			
 	}
+	else
+	{
+	    #ifdef DEBUG
+	    NSLog( @"setting 10.6 cookies" );
+	    #endif
+	    // 10.6.x Snow Leopard
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlus]		forKey:@"33_31_30_21_20_2_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMinus]		forKey:@"33_32_30_21_20_2_"];	
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu]		forKey:@"33_22_21_20_2_33_22_21_20_2_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay]		forKey:@"33_23_21_20_2_33_23_21_20_2_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight]		forKey:@"33_24_21_20_2_33_24_21_20_2_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft]		forKey:@"33_25_21_20_2_33_25_21_20_2_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight_Hold]	forKey:@"33_21_20_14_12_2_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft_Hold]	forKey:@"33_21_20_13_12_2_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu_Hold]	forKey:@"33_21_20_2_33_21_20_2_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay_Hold]	forKey:@"37_33_21_20_2_37_33_21_20_2_"];
+		[_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched]	forKey:@"19_"];
+	}
 }
 
 - (void) sendRemoteButtonEvent: (RemoteControlEventIdentifier) event pressedDown: (BOOL) pressedDown {
