[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

./packages/openofficeorg/3.2/unstable r1898: cleanup patch a bit



------------------------------------------------------------
revno: 1898
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Mon 2010-03-29 19:41:31 +0200
message:
  cleanup patch a bit
modified:
  patches/update-mysqlc.diff
=== modified file 'patches/update-mysqlc.diff'
--- a/patches/update-mysqlc.diff	2010-03-29 12:53:07 +0000
+++ b/patches/update-mysqlc.diff	2010-03-29 17:41:31 +0000
@@ -23,18 +23,18 @@
  # add hack to link against STLport version of libmysqlcppconn on i386.
 --- /dev/null	2010-03-23 19:39:08.172681047 +0100
 +++ openoffice.org-3.2.0/ooo-build-3-2-0-9/patches/dev300/mysqlc-from-OOO320_m14.diff	2010-03-29 10:51:29.000000000 +0200
-@@ -0,0 +1,11860 @@
+@@ -0,0 +1,11869 @@
 +Binary files foo/images/sun_extension_hc.png and mysqlc/images/sun_extension_hc.png differ
 +Binary files foo/images/sun_extension.png and mysqlc/images/sun_extension.png differ
 +diff -urN foo/prj/build.lst mysqlc/prj/build.lst
-+--- foo/prj/build.lst	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/prj/build.lst	2010-03-26 23:00:32.000000000 +0100
 +@@ -0,0 +1,3 @@
 ++mc	mysqlc	:	solenv MYSQLCPPCONN:mysqlcppconn offuh cppu soltools cppuhelper readlicense_oo NULL
 ++ch	mysqlc              usr1    -	all mc_mkout NULL
 ++mc	mysqlc\source       nmake   -   all mc_source NULL
 +diff -urN foo/prj/d.lst mysqlc/prj/d.lst
-+--- foo/prj/d.lst	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/prj/d.lst	2010-03-26 23:00:32.000000000 +0100
 +@@ -0,0 +1,4 @@
 ++# Extensions
@@ -42,7 +42,7 @@
 ++..\%__SRC%\bin\*.oxt %_DEST%\bin%_EXT%\*.oxt
 ++
 +diff -urN foo/source/DataAccess.xcu mysqlc/source/DataAccess.xcu
-+--- foo/source/DataAccess.xcu	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/DataAccess.xcu	2010-03-26 23:00:32.000000000 +0100
 +@@ -0,0 +1,19 @@
 ++<?xml version="1.0" encoding="UTF-8"?>
@@ -65,101 +65,101 @@
 ++ </node>
 ++</oor:node>
 +diff -urN foo/source/description/description_de.txt mysqlc/source/description/description_de.txt
-+--- foo/source/description/description_de.txt	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/description/description_de.txt	2010-03-26 23:00:32.000000000 +0100
 +@@ -0,0 +1 @@
 ++Verbindet OpenOffice.org direkt mit MySQL-Servern
 +\ Kein Zeilenumbruch am Dateiende.
 +diff -urN foo/source/description/description_en-US.txt mysqlc/source/description/description_en-US.txt
-+--- foo/source/description/description_en-US.txt	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/description/description_en-US.txt	2010-03-26 23:00:32.000000000 +0100
 +@@ -0,0 +1 @@
 ++The MySQL Connector for Oracle Open Office (formerly StarOffice) and OpenOffice.org installs a native MySQL database driver. It is faster, seamless integrated, easier to administrate and there is no need to install and setup a JDBC or ODBC driver separately. It was never easier to use MySQL databases in OpenOffice.org Base.
 +diff -urN foo/source/description/description_es.txt mysqlc/source/description/description_es.txt
-+--- foo/source/description/description_es.txt	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/description/description_es.txt	2010-03-26 23:00:32.000000000 +0100
 +@@ -0,0 +1 @@
 ++Conecta OpenOffice.org directamente con los servidores de MySQL
 +\ Kein Zeilenumbruch am Dateiende.
 +diff -urN foo/source/description/description_fr.txt mysqlc/source/description/description_fr.txt
-+--- foo/source/description/description_fr.txt	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/description/description_fr.txt	2010-03-26 23:00:32.000000000 +0100
 +@@ -0,0 +1 @@
 ++Connexion directe d'OpenOffice.org avec les serveurs MySQL.
 +\ Kein Zeilenumbruch am Dateiende.
 +diff -urN foo/source/description/description_hu.txt mysqlc/source/description/description_hu.txt
-+--- foo/source/description/description_hu.txt	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/description/description_hu.txt	2010-03-26 23:00:32.000000000 +0100
 +@@ -0,0 +1 @@
 ++Közvetlen kapcsolatot teremt az OpenOffice.org és a MySQL-kiszolgálók között.
 +\ Kein Zeilenumbruch am Dateiende.
 +diff -urN foo/source/description/description_it.txt mysqlc/source/description/description_it.txt
-+--- foo/source/description/description_it.txt	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/description/description_it.txt	2010-03-26 23:00:32.000000000 +0100
 +@@ -0,0 +1 @@
 ++Consente la connessione diretta tra OpenOffice.org e i server MySQL
 +\ Kein Zeilenumbruch am Dateiende.
 +diff -urN foo/source/description/description_ja.txt mysqlc/source/description/description_ja.txt
-+--- foo/source/description/description_ja.txt	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/description/description_ja.txt	2010-03-26 23:00:32.000000000 +0100
 +@@ -0,0 +1 @@
 ++OpenOffice.org を MySQL サーバーと直接に接続させる
 +\ Kein Zeilenumbruch am Dateiende.
 +diff -urN foo/source/description/description_ko.txt mysqlc/source/description/description_ko.txt
-+--- foo/source/description/description_ko.txt	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/description/description_ko.txt	2010-03-26 23:00:32.000000000 +0100
 +@@ -0,0 +1 @@
 ++MySQL 서버를 통해 OpenOffice.org에 직접 연결합니다.
 +\ Kein Zeilenumbruch am Dateiende.
 +diff -urN foo/source/description/description_nl.txt mysqlc/source/description/description_nl.txt
-+--- foo/source/description/description_nl.txt	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/description/description_nl.txt	2010-03-26 23:00:32.000000000 +0100
 +@@ -0,0 +1 @@
 ++Verbindt OpenOffice.org direct met MySQL Servers
 +\ Kein Zeilenumbruch am Dateiende.
 +diff -urN foo/source/description/description_pl.txt mysqlc/source/description/description_pl.txt
-+--- foo/source/description/description_pl.txt	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/description/description_pl.txt	2010-03-26 23:00:32.000000000 +0100
 +@@ -0,0 +1 @@
 ++Laczy witryne OpenOffice.org bezposrednio z systemem MySQL Servers
 +\ Kein Zeilenumbruch am Dateiende.
 +diff -urN foo/source/description/description_pt-BR.txt mysqlc/source/description/description_pt-BR.txt
-+--- foo/source/description/description_pt-BR.txt	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/description/description_pt-BR.txt	2010-03-26 23:00:32.000000000 +0100
 +@@ -0,0 +1 @@
 ++Conecta o OpenOffice.org diretamente aos servidores MySQL
 +\ Kein Zeilenumbruch am Dateiende.
 +diff -urN foo/source/description/description_pt.txt mysqlc/source/description/description_pt.txt
-+--- foo/source/description/description_pt.txt	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/description/description_pt.txt	2010-03-26 23:00:32.000000000 +0100
 +@@ -0,0 +1 @@
 ++Liga o OpenOffice.org directamente aos servidores MySQL
 +\ Kein Zeilenumbruch am Dateiende.
 +diff -urN foo/source/description/description_ru.txt mysqlc/source/description/description_ru.txt
-+--- foo/source/description/description_ru.txt	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/description/description_ru.txt	2010-03-26 23:00:32.000000000 +0100
 +@@ -0,0 +1 @@
 ++Подключает OpenOffice.org напрямую к серверам MySQL
 +diff -urN foo/source/description/description_sv.txt mysqlc/source/description/description_sv.txt
-+--- foo/source/description/description_sv.txt	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/description/description_sv.txt	2010-03-26 23:00:32.000000000 +0100
 +@@ -0,0 +1 @@
 ++Ansluter OpenOffice.org direkt till MySQL-servrarna
 +\ Kein Zeilenumbruch am Dateiende.
 +diff -urN foo/source/description/description_zh-CN.txt mysqlc/source/description/description_zh-CN.txt
-+--- foo/source/description/description_zh-CN.txt	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/description/description_zh-CN.txt	2010-03-26 23:00:32.000000000 +0100
 +@@ -0,0 +1 @@
 ++将 OpenOffice.org 与 MySQL 服务器直接相连
 +\ Kein Zeilenumbruch am Dateiende.
 +diff -urN foo/source/description/description_zh-TW.txt mysqlc/source/description/description_zh-TW.txt
-+--- foo/source/description/description_zh-TW.txt	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/description/description_zh-TW.txt	2010-03-26 23:00:32.000000000 +0100
 +@@ -0,0 +1 @@
 ++將 OpenOffice.org 直接連線至 MySQL 伺服器
 +\ Kein Zeilenumbruch am Dateiende.
 +diff -urN foo/source/description.xml mysqlc/source/description.xml
-+--- foo/source/description.xml	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/description.xml	2010-03-26 23:00:32.000000000 +0100
 +@@ -0,0 +1,29 @@
 ++<?xml version="1.0" encoding="UTF-8"?>
@@ -192,19 +192,19 @@
 ++    </extension-description>
 ++</description> 
 +diff -urN foo/source/exports.dxp mysqlc/source/exports.dxp
-+--- foo/source/exports.dxp	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/exports.dxp	2010-03-26 23:00:32.000000000 +0100
 +@@ -0,0 +1,3 @@
 ++component_getImplementationEnvironment
 ++component_writeInfo
 ++component_getFactory
 +diff -urN foo/source/delzip mysqlc/source/delzip
-+--- foo/source/delzip  1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/delzip       2010-03-29 10:44:02.000000000 +0200
 +@@ -0,0 +1 @@
 ++
 +diff -urN foo/source/makefile.mk mysqlc/source/makefile.mk
-+--- foo/source/makefile.mk	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/makefile.mk	2010-03-29 10:44:02.000000000 +0200
 +@@ -0,0 +1,328 @@
 ++#*************************************************************************
@@ -536,7 +536,7 @@
 ++    install_name_tool -change $(MYSQL_LIBFILE:f) @loader_path/$(MYSQL_LIBFILE:f) $(EXTENSIONDIR)$/$(SHL1TARGET)$(DLLPOST)
 ++.ENDIF
 +diff -urN foo/source/manifest.xml mysqlc/source/manifest.xml
-+--- foo/source/manifest.xml	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/manifest.xml	2010-03-26 23:00:32.000000000 +0100
 +@@ -0,0 +1,8 @@
 ++<?xml version="1.0" encoding="UTF-8"?>
@@ -548,7 +548,7 @@
 ++                 manifest:full-path="registry/data/org/openoffice/Office/DataAccess/Drivers.xcu"/>
 ++</manifest:manifest>
 +diff -urN foo/source/mysqlc_connection.cxx mysqlc/source/mysqlc_connection.cxx
-+--- foo/source/mysqlc_connection.cxx	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/mysqlc_connection.cxx	2010-03-26 23:00:32.000000000 +0100
 +@@ -0,0 +1,791 @@
 ++/*************************************************************************
@@ -1343,7 +1343,7 @@
 ++ * vim<600: noet sw=4 ts=4
 ++ */
 +diff -urN foo/source/mysqlc_connection.hxx mysqlc/source/mysqlc_connection.hxx
-+--- foo/source/mysqlc_connection.hxx	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/mysqlc_connection.hxx	2010-03-26 23:00:32.000000000 +0100
 +@@ -0,0 +1,250 @@
 ++/*************************************************************************
@@ -1597,7 +1597,7 @@
 ++ */
 ++
 +diff -urN foo/source/mysqlc_databasemetadata.cxx mysqlc/source/mysqlc_databasemetadata.cxx
-+--- foo/source/mysqlc_databasemetadata.cxx	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/mysqlc_databasemetadata.cxx	2010-03-26 23:00:32.000000000 +0100
 +@@ -0,0 +1,2215 @@
 ++/*************************************************************************
@@ -3816,7 +3816,7 @@
 ++ */
 ++
 +diff -urN foo/source/mysqlc_databasemetadata.hxx mysqlc/source/mysqlc_databasemetadata.hxx
-+--- foo/source/mysqlc_databasemetadata.hxx	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/mysqlc_databasemetadata.hxx	2010-03-26 23:00:33.000000000 +0100
 +@@ -0,0 +1,243 @@
 ++/*************************************************************************
@@ -4063,7 +4063,7 @@
 ++
 ++#endif // CONNECTIVITY_SDATABASEMETADATA_HXX
 +diff -urN foo/source/mysqlc_driver.cxx mysqlc/source/mysqlc_driver.cxx
-+--- foo/source/mysqlc_driver.cxx	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/mysqlc_driver.cxx	2010-03-26 23:00:33.000000000 +0100
 +@@ -0,0 +1,368 @@
 ++/*************************************************************************
@@ -4435,7 +4435,7 @@
 ++ * vim<600: noet sw=4 ts=4
 ++ */
 +diff -urN foo/source/mysqlc_driver.hxx mysqlc/source/mysqlc_driver.hxx
-+--- foo/source/mysqlc_driver.hxx	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/mysqlc_driver.hxx	2010-03-26 23:00:33.000000000 +0100
 +@@ -0,0 +1,118 @@
 ++/*************************************************************************
@@ -4557,7 +4557,7 @@
 ++ * vim<600: noet sw=4 ts=4
 ++ */
 +diff -urN foo/source/mysqlc_general.cxx mysqlc/source/mysqlc_general.cxx
-+--- foo/source/mysqlc_general.cxx	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/mysqlc_general.cxx	2010-03-26 23:00:33.000000000 +0100
 +@@ -0,0 +1,176 @@
 ++/*************************************************************************
@@ -4737,7 +4737,7 @@
 ++
 ++} /* namespace */
 +diff -urN foo/source/mysqlc_general.hxx mysqlc/source/mysqlc_general.hxx
-+--- foo/source/mysqlc_general.hxx	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/mysqlc_general.hxx	2010-03-26 23:00:33.000000000 +0100
 +@@ -0,0 +1,66 @@
 ++/*************************************************************************
@@ -4807,7 +4807,7 @@
 ++
 ++#endif
 +diff -urN foo/source/mysqlc.map mysqlc/source/mysqlc.map
-+--- foo/source/mysqlc.map	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/mysqlc.map	2010-03-26 23:00:32.000000000 +0100
 +@@ -0,0 +1,8 @@
 ++UDK_3_0_0 {
@@ -4819,7 +4819,7 @@
 ++		*;
 ++};
 +diff -urN foo/source/mysqlc_preparedstatement.cxx mysqlc/source/mysqlc_preparedstatement.cxx
-+--- foo/source/mysqlc_preparedstatement.cxx	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/mysqlc_preparedstatement.cxx	2010-03-26 23:00:33.000000000 +0100
 +@@ -0,0 +1,944 @@
 ++/*************************************************************************
@@ -5767,7 +5767,7 @@
 ++ * vim<600: noet sw=4 ts=4
 ++ */
 +diff -urN foo/source/mysqlc_preparedstatement.hxx mysqlc/source/mysqlc_preparedstatement.hxx
-+--- foo/source/mysqlc_preparedstatement.hxx	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/mysqlc_preparedstatement.hxx	2010-03-26 23:00:33.000000000 +0100
 +@@ -0,0 +1,194 @@
 ++/*************************************************************************
@@ -5965,7 +5965,7 @@
 ++ */
 ++ 
 +diff -urN foo/source/mysqlc_propertyids.cxx mysqlc/source/mysqlc_propertyids.cxx
-+--- foo/source/mysqlc_propertyids.cxx	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/mysqlc_propertyids.cxx	2010-03-26 23:00:33.000000000 +0100
 +@@ -0,0 +1,210 @@
 ++/*************************************************************************
@@ -6179,7 +6179,7 @@
 ++ * vim<600: noet sw=4 ts=4
 ++ */
 +diff -urN foo/source/mysqlc_propertyids.hxx mysqlc/source/mysqlc_propertyids.hxx
-+--- foo/source/mysqlc_propertyids.hxx	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/mysqlc_propertyids.hxx	2010-03-26 23:00:33.000000000 +0100
 +@@ -0,0 +1,136 @@
 ++
@@ -6319,7 +6319,7 @@
 ++
 ++
 +diff -urN foo/source/mysqlc_resultset.cxx mysqlc/source/mysqlc_resultset.cxx
-+--- foo/source/mysqlc_resultset.cxx	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/mysqlc_resultset.cxx	2010-03-26 23:00:33.000000000 +0100
 +@@ -0,0 +1,1509 @@
 ++/*************************************************************************
@@ -7832,7 +7832,7 @@
 ++ * vim<600: noet sw=4 ts=4
 ++ */
 +diff -urN foo/source/mysqlc_resultset.hxx mysqlc/source/mysqlc_resultset.hxx
-+--- foo/source/mysqlc_resultset.hxx	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/mysqlc_resultset.hxx	2010-03-26 23:00:33.000000000 +0100
 +@@ -0,0 +1,337 @@
 ++/*************************************************************************
@@ -8173,7 +8173,7 @@
 ++ * vim<600: noet sw=4 ts=4
 ++ */
 +diff -urN foo/source/mysqlc_resultsetmetadata.cxx mysqlc/source/mysqlc_resultsetmetadata.cxx
-+--- foo/source/mysqlc_resultsetmetadata.cxx	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/mysqlc_resultsetmetadata.cxx	2010-03-26 23:00:33.000000000 +0100
 +@@ -0,0 +1,468 @@
 ++/*************************************************************************
@@ -8645,7 +8645,7 @@
 ++ */
 ++
 +diff -urN foo/source/mysqlc_resultsetmetadata.hxx mysqlc/source/mysqlc_resultsetmetadata.hxx
-+--- foo/source/mysqlc_resultsetmetadata.hxx	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/mysqlc_resultsetmetadata.hxx	2010-03-26 23:00:33.000000000 +0100
 +@@ -0,0 +1,121 @@
 ++/*************************************************************************
@@ -8770,7 +8770,7 @@
 ++
 ++#endif // CONNECTIVITY_SRESULSETMETADATA_HXX
 +diff -urN foo/source/mysqlc_services.cxx mysqlc/source/mysqlc_services.cxx
-+--- foo/source/mysqlc_services.cxx	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/mysqlc_services.cxx	2010-03-26 23:00:33.000000000 +0100
 +@@ -0,0 +1,183 @@
 ++/*************************************************************************
@@ -8957,7 +8957,7 @@
 ++ * vim<600: noet sw=4 ts=4
 ++ */
 +diff -urN foo/source/mysqlc_statement.cxx mysqlc/source/mysqlc_statement.cxx
-+--- foo/source/mysqlc_statement.cxx	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/mysqlc_statement.cxx	2010-03-26 23:00:33.000000000 +0100
 +@@ -0,0 +1,531 @@
 ++/*************************************************************************
@@ -9492,7 +9492,7 @@
 ++ * vim<600: noet sw=4 ts=4
 ++ */
 +diff -urN foo/source/mysqlc_statement.hxx mysqlc/source/mysqlc_statement.hxx
-+--- foo/source/mysqlc_statement.hxx	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/mysqlc_statement.hxx	2010-03-26 23:00:33.000000000 +0100
 +@@ -0,0 +1,187 @@
 ++#ifndef MYSQLC_STATEMENT_HXX
@@ -9683,7 +9683,7 @@
 ++ * vim<600: noet sw=4 ts=4
 ++ */
 +diff -urN foo/source/mysqlc_subcomponent.hxx mysqlc/source/mysqlc_subcomponent.hxx
-+--- foo/source/mysqlc_subcomponent.hxx	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/mysqlc_subcomponent.hxx	2010-03-26 23:00:33.000000000 +0100
 +@@ -0,0 +1,255 @@
 ++/*************************************************************************
@@ -9942,7 +9942,7 @@
 ++#endif // _CONNECTIVITY_OSUBCOMPONENT_HXX_
 ++
 +diff -urN foo/source/mysqlc_types.cxx mysqlc/source/mysqlc_types.cxx
-+--- foo/source/mysqlc_types.cxx	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/mysqlc_types.cxx	2010-03-26 23:00:33.000000000 +0100
 +@@ -0,0 +1,792 @@
 ++/*************************************************************************
@@ -10738,7 +10738,7 @@
 ++    }
 ++};
 +diff -urN foo/source/mysqlc_types.hxx mysqlc/source/mysqlc_types.hxx
-+--- foo/source/mysqlc_types.hxx	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/mysqlc_types.hxx	2010-03-26 23:00:33.000000000 +0100
 +@@ -0,0 +1,56 @@
 ++/*************************************************************************
@@ -10798,7 +10798,7 @@
 ++
 ++#endif /* MYSQLC_TYPES_HXX */
 +diff -urN foo/source/mysqlc.xml mysqlc/source/mysqlc.xml
-+--- foo/source/mysqlc.xml	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/mysqlc.xml	2010-03-26 23:00:32.000000000 +0100
 +@@ -0,0 +1,81 @@
 ++<?xml version='1.0' encoding="UTF-8"?>
@@ -10883,7 +10883,7 @@
 ++	<type>	com.sun.star.sdb.XColumn					</type>
 ++</module-description>
 +diff -urN foo/source/README mysqlc/source/README
-+--- foo/source/README	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/README	2010-03-26 23:00:32.000000000 +0100
 +@@ -0,0 +1,65 @@
 ++---------- Status -------------------------------------------------------------
@@ -10952,7 +10952,7 @@
 ++A common issue is libmysqlclient.so.15 vs. libmysqlclient.so.16 .
 ++
 +diff -urN foo/source/registry/data/org/openoffice/Office/DataAccess/Drivers.xcu mysqlc/source/registry/data/org/openoffice/Office/DataAccess/Drivers.xcu
-+--- foo/source/registry/data/org/openoffice/Office/DataAccess/Drivers.xcu	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/source/registry/data/org/openoffice/Office/DataAccess/Drivers.xcu	2010-03-26 23:00:33.000000000 +0100
 +@@ -0,0 +1,93 @@
 ++<?xml version="1.0" encoding="UTF-8"?>
@@ -11049,7 +11049,7 @@
 ++  </node>
 ++</oor:component-data>
 +diff -urN foo/version.mk mysqlc/version.mk
-+--- foo/version.mk	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlc/version.mk	2010-03-26 23:00:33.000000000 +0100
 +@@ -0,0 +1,38 @@
 ++#*************************************************************************
@@ -11091,7 +11091,7 @@
 ++# and also added to the file name of the resulting .oxt file
 ++MYSQLC_STATUS=final
 +diff -urN foo/cppconn_config.pmk mysqlcppconn/cppconn_config.pmk
-+--- foo/cppconn_config.pmk	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlcppconn/cppconn_config.pmk	2010-03-26 23:00:33.000000000 +0100
 +@@ -0,0 +1,33 @@
 ++#*************************************************************************
@@ -11129,7 +11129,7 @@
 ++CPPCONN_NATIVEAPI = cppconn_nativeapi
 +Binary files foo/download/mysql-connector-cpp.zip and mysqlcppconn/download/mysql-connector-cpp.zip differ
 +diff -urN foo/makefile.mk mysqlcppconn/makefile.mk
-+--- foo/makefile.mk	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlcppconn/makefile.mk	2010-03-26 23:00:34.000000000 +0100
 +@@ -0,0 +1,88 @@
 ++#*************************************************************************
@@ -11221,7 +11221,7 @@
 ++
 ++$(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) : normalize
 +diff -urN foo/mysql_config.pmk mysqlcppconn/mysql_config.pmk
-+--- foo/mysql_config.pmk	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlcppconn/mysql_config.pmk	2010-03-29 10:44:10.000000000 +0200
 +@@ -0,0 +1,55 @@
 ++#*************************************************************************
@@ -11280,7 +11280,7 @@
 ++CFLAGS+=-I$(PRJINC) -I$(PRJINC)$/cppconn $(MYSQL_INC) -DCPPCONN_LIB_BUILD
 ++
 +diff -urN foo/mysql_config.pmk.orig mysqlcppconn/mysql_config.pmk.orig
-+--- foo/mysql_config.pmk.orig	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlcppconn/mysql_config.pmk.orig	2010-03-26 23:36:09.000000000 +0100
 +@@ -0,0 +1,49 @@
 ++#*************************************************************************
@@ -11333,7 +11333,7 @@
 ++CFLAGS+=-I$(PRJINC) -I$(PRJINC)$/cppconn $(MYSQL_INC) -DCPPCONN_LIB_BUILD
 ++
 +diff -urN foo/mysql-connector-cpp.patch mysqlcppconn/mysql-connector-cpp.patch
-+--- foo/mysql-connector-cpp.patch	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlcppconn/mysql-connector-cpp.patch	2010-03-26 23:00:34.000000000 +0100
 +@@ -0,0 +1,351 @@
 ++--- misc/mysql-connector-cpp/cppconn/build_config.h	2009-08-13 17:13:46.000000000 +0200
@@ -11688,14 +11688,14 @@
 +++# --- Targets ------------------------------------------------------
 +++.INCLUDE :  target.mk
 +diff -urN foo/prj/build.lst mysqlcppconn/prj/build.lst
-+--- foo/prj/build.lst	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlcppconn/prj/build.lst	2010-03-26 23:00:34.000000000 +0100
 +@@ -0,0 +1,3 @@
 ++my	mysqlcppconn	:	solenv sal NULL
 ++my	mysqlcppconn    nmake	-	all	my_mkout NULL
 ++
 +diff -urN foo/prj/d.lst mysqlcppconn/prj/d.lst
-+--- foo/prj/d.lst	1970-01-01 01:00:00.000000000 +0100
++--- /dev/null
 ++++ mysqlcppconn/prj/d.lst	2010-03-26 23:00:34.000000000 +0100
 +@@ -0,0 +1,15 @@
 ++# mirror the dir structure a make install would create
@@ -11713,8 +11713,8 @@
 ++..\%__SRC%\lib\*.dylib.* %_DEST%\lib%_EXT%\*.dylib.*
 ++..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
 ++..\%__SRC%\lib\i*.lib %_DEST%\lib%_EXT%
-+--- configure.in	2010-03-29 10:50:19.000000000 +0200
-++++ configure.in-new	2010-03-29 10:49:44.000000000 +0200
++--- configure.in-old	2010-03-29 10:50:19.000000000 +0200
+++++ configure.in	2010-03-29 10:49:44.000000000 +0200
 +@@ -375,6 +375,23 @@
 + [  --with-lucene-analyzers-jar=JARFILE   Specify path to jarfile manually ],
 + [ LUCENE_ANALYZERS_JAR="$withval"
@@ -11868,8 +11868,8 @@
 + dnl ===================================================================
 + dnl Check for system hsqldb
 + dnl ===================================================================
-+--- set_soenv.in	2010-03-29 10:51:02.000000000 +0200
-++++ set_soenv.in.new	2010-03-29 10:50:46.000000000 +0200
++--- set_soenv.in-old	2010-03-29 10:51:02.000000000 +0200
+++++ set_soenv.in	2010-03-29 10:50:46.000000000 +0200
 +@@ -1894,6 +1894,13 @@
 + ToFile( "SYSTEM_DB",         "@SYSTEM_DB@",        "e" );
 + ToFile( "DB_VERSION",        "@DB_VERSION@",       "e" );
@@ -11884,6 +11884,15 @@
 + ToFile( "SYSTEM_HSQLDB",     "@SYSTEM_HSQLDB@",    "e" );
 + ToFile( "HSQLDB_JAR",        "@HSQLDB_JAR@",       "e" );
 + ToFile( "SYSTEM_LUCENE",     "@SYSTEM_LUCENE@",    "e" );
++diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
++--- postprocess/prj/build.lst
+++++ postprocess/prj/build.lst
++@@ -1,4 +1,4 @@
++-po     postprocess     ::      accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts AGFA_MONOTYPE_FONTS:agfa_monotype_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext writerfilter oox NULL
+++po     postprocess     ::      accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts AGFA_MONOTYPE_FONTS:agfa_monotype_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext writerfilter MYSQLC:mysqlc oox NULL
++ po     postprocess                             usr1    -       all     po_mkout NULL
++ po     postprocess\checkxml            nmake   -       all     po_checkxml NULL
++ po     postprocess\checkdeliver        nmake   -       all     po_checkdlv NULL
 --- /dev/null	2010-03-23 19:39:08.172681047 +0100
 +++ openoffice.org-3.2.0/ooo-build-3-2-0-9/patches/dev300/mysqlc-missing-buildfixes-from-DEV300.diff	2010-03-29 10:43:30.000000000 +0200
 @@ -0,0 +1,30 @@


Reply to: