[ooo-build-commit] .: 3 commits - patches/dev300

René Engelhard rene at kemper.freedesktop.org
Mon Mar 29 09:58:19 PDT 2010 

 patches/dev300/apply                             |    9 -
 patches/dev300/mysqlc-from-OOO320_m14.diff       |  133 ++++++++++++-----------
 patches/dev300/postprocess-extra-extensions.diff |   10 -
 3 files changed, 81 insertions(+), 71 deletions(-)

New commits:
commit 2222fa2a79ae22b037e475990817ad21b6dd6c0b
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Mar 29 18:57:17 2010 +0200

    move basegfx-boxclipper-* up before basegfx-clipstate.diff

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 443f6de..b158b5b 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3793,6 +3793,11 @@ basegfx-colorspace-fix.diff, i#109364, thorsten
 vbahelper-optionality-fix.diff, i#108853, ericb
 vcl-gtk-process-events-on-exit.diff, rodo
 sfx2-add-to-recently-used-after-save.diff, rodo
+[ Fixes < ooo320-m14 ]
+basegfx-boxclipper-m13.diff, i#72418, thorsten
+[ Fixes >= ooo320-m14 ]
+basegfx-boxclipper.diff, i#72418, thorsten
+[ Fixes ]
 basegfx-clipstate.diff, i#72418, thorsten
 slideshow-clipstate.diff, i#72418, thorsten
 svtools-wmf-clipperf.diff, n#535304, thorsten
@@ -3807,10 +3812,6 @@ sw-caption-separator.diff, i#110287, timar
 svx-hu-name-order.diff, i#105342, timar
 vcl-stl-fix.diff, n#588957, thorsten
 
-[ Fixes < ooo320-m14 ]
-basegfx-boxclipper-m13.diff, i#72418, thorsten
-[ Fixes >= ooo320-m14 ]
-basegfx-boxclipper.diff, i#72418, thorsten
 
 [ Features ]
 # embed generic media files inside odf docs, 2nd part
commit 6e494d2d87d8e04abd495805de60350790d68c85
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Mar 29 18:52:58 2010 +0200

    fix mysqlc patch applying
    
    * patches/dev300/mysqlc-from-OOO320_m14.diff:
    * patches/dev300/postprocess-extra-extensions.diff:

diff --git a/patches/dev300/mysqlc-from-OOO320_m14.diff b/patches/dev300/mysqlc-from-OOO320_m14.diff
index cb5da02..a447d73 100644
--- a/patches/dev300/mysqlc-from-OOO320_m14.diff
+++ b/patches/dev300/mysqlc-from-OOO320_m14.diff
@@ -11687,8 +11687,8 @@ diff -urN foo/prj/d.lst mysqlcppconn/prj/d.lst
 +..\%__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"
@@ -11842,8 +11842,8 @@ diff -urN foo/prj/d.lst mysqlcppconn/prj/d.lst
  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" );
@@ -11858,3 +11858,12 @@ diff -urN foo/prj/d.lst mysqlcppconn/prj/d.lst
  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
diff --git a/patches/dev300/postprocess-extra-extensions.diff b/patches/dev300/postprocess-extra-extensions.diff
index d02ae96..3b6e3c3 100644
--- a/patches/dev300/postprocess-extra-extensions.diff
+++ b/patches/dev300/postprocess-extra-extensions.diff
@@ -1,8 +1,8 @@
 --- postprocess/prj/build.lst.old	2010-03-04 18:13:57.000000000 +0100
 +++ postprocess/prj/build.lst	2010-03-04 18:16:44.000000000 +0100
 @@ -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 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     ::      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 DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport CT2N:ct2n NLPSOLVER:nlpsolver 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
+-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	::	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 CT2N:ct2n NLPSOLVER:nlpsolver 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
commit c223f6263ea008382f678e022fb398a33a6abd80
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Mar 29 18:14:01 2010 +0200

    make --- /dev/null so make mysqlc patch apply (hopefully)
    
    * patches/dev300/apply:
    * patches/dev300/mysqlc-from-OOO320_m14.diff:

diff --git a/patches/dev300/mysqlc-from-OOO320_m14.diff b/patches/dev300/mysqlc-from-OOO320_m14.diff
index ab65ed7..cb5da02 100644
--- a/patches/dev300/mysqlc-from-OOO320_m14.diff
+++ b/patches/dev300/mysqlc-from-OOO320_m14.diff
@@ -1,14 +1,14 @@
 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
@@ -16,7 +16,7 @@ diff -urN foo/prj/d.lst mysqlc/prj/d.lst
 +..\%__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"?>
@@ -39,101 +39,101 @@ diff -urN foo/source/DataAccess.xcu mysqlc/source/DataAccess.xcu
 + </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"?>
@@ -166,19 +166,19 @@ diff -urN foo/source/description.xml mysqlc/source/description.xml
 +    </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 @@
 +#*************************************************************************
@@ -510,7 +510,7 @@ diff -urN foo/source/makefile.mk mysqlc/source/makefile.mk
 +    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"?>
@@ -522,7 +522,7 @@ diff -urN foo/source/manifest.xml mysqlc/source/manifest.xml
 +                 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 @@
 +/*************************************************************************
@@ -1317,7 +1317,7 @@ diff -urN foo/source/mysqlc_connection.cxx mysqlc/source/mysqlc_connection.cxx
 + * 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 @@
 +/*************************************************************************
@@ -1571,7 +1571,7 @@ diff -urN foo/source/mysqlc_connection.hxx mysqlc/source/mysqlc_connection.hxx
 + */
 +
 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 @@
 +/*************************************************************************
@@ -3790,7 +3790,7 @@ diff -urN foo/source/mysqlc_databasemetadata.cxx mysqlc/source/mysqlc_databaseme
 + */
 +
 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 @@
 +/*************************************************************************
@@ -4037,7 +4037,7 @@ diff -urN foo/source/mysqlc_databasemetadata.hxx mysqlc/source/mysqlc_databaseme
 +
 +#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 @@
 +/*************************************************************************
@@ -4409,7 +4409,7 @@ diff -urN foo/source/mysqlc_driver.cxx mysqlc/source/mysqlc_driver.cxx
 + * 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 @@
 +/*************************************************************************
@@ -4531,7 +4531,7 @@ diff -urN foo/source/mysqlc_driver.hxx mysqlc/source/mysqlc_driver.hxx
 + * 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 @@
 +/*************************************************************************
@@ -4711,7 +4711,7 @@ diff -urN foo/source/mysqlc_general.cxx mysqlc/source/mysqlc_general.cxx
 +
 +} /* 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 @@
 +/*************************************************************************
@@ -4781,7 +4781,7 @@ diff -urN foo/source/mysqlc_general.hxx mysqlc/source/mysqlc_general.hxx
 +
 +#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 {
@@ -4793,7 +4793,7 @@ diff -urN foo/source/mysqlc.map mysqlc/source/mysqlc.map
 +		*;
 +};
 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 @@
 +/*************************************************************************
@@ -5741,7 +5741,7 @@ diff -urN foo/source/mysqlc_preparedstatement.cxx mysqlc/source/mysqlc_prepareds
 + * 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 @@
 +/*************************************************************************
@@ -5939,7 +5939,7 @@ diff -urN foo/source/mysqlc_preparedstatement.hxx mysqlc/source/mysqlc_prepareds
 + */
 + 
 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 @@
 +/*************************************************************************
@@ -6153,7 +6153,7 @@ diff -urN foo/source/mysqlc_propertyids.cxx mysqlc/source/mysqlc_propertyids.cxx
 + * 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 @@
 +
@@ -6293,7 +6293,7 @@ diff -urN foo/source/mysqlc_propertyids.hxx mysqlc/source/mysqlc_propertyids.hxx
 +
 +
 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 @@
 +/*************************************************************************
@@ -7806,7 +7806,7 @@ diff -urN foo/source/mysqlc_resultset.cxx mysqlc/source/mysqlc_resultset.cxx
 + * 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 @@
 +/*************************************************************************
@@ -8147,7 +8147,7 @@ diff -urN foo/source/mysqlc_resultset.hxx mysqlc/source/mysqlc_resultset.hxx
 + * 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 @@
 +/*************************************************************************
@@ -8619,7 +8619,7 @@ diff -urN foo/source/mysqlc_resultsetmetadata.cxx mysqlc/source/mysqlc_resultset
 + */
 +
 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 @@
 +/*************************************************************************
@@ -8744,7 +8744,7 @@ diff -urN foo/source/mysqlc_resultsetmetadata.hxx mysqlc/source/mysqlc_resultset
 +
 +#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 @@
 +/*************************************************************************
@@ -8931,7 +8931,7 @@ diff -urN foo/source/mysqlc_services.cxx mysqlc/source/mysqlc_services.cxx
 + * 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 @@
 +/*************************************************************************
@@ -9466,7 +9466,7 @@ diff -urN foo/source/mysqlc_statement.cxx mysqlc/source/mysqlc_statement.cxx
 + * 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
@@ -9657,7 +9657,7 @@ diff -urN foo/source/mysqlc_statement.hxx mysqlc/source/mysqlc_statement.hxx
 + * 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 @@
 +/*************************************************************************
@@ -9916,7 +9916,7 @@ diff -urN foo/source/mysqlc_subcomponent.hxx mysqlc/source/mysqlc_subcomponent.h
 +#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 @@
 +/*************************************************************************
@@ -10712,7 +10712,7 @@ diff -urN foo/source/mysqlc_types.cxx mysqlc/source/mysqlc_types.cxx
 +    }
 +};
 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 @@
 +/*************************************************************************
@@ -10772,7 +10772,7 @@ diff -urN foo/source/mysqlc_types.hxx mysqlc/source/mysqlc_types.hxx
 +
 +#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"?>
@@ -10857,7 +10857,7 @@ diff -urN foo/source/mysqlc.xml mysqlc/source/mysqlc.xml
 +	<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 -------------------------------------------------------------
@@ -10926,7 +10926,7 @@ diff -urN foo/source/README mysqlc/source/README
 +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"?>
@@ -11023,7 +11023,7 @@ diff -urN foo/source/registry/data/org/openoffice/Office/DataAccess/Drivers.xcu
 +  </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 @@
 +#*************************************************************************
@@ -11065,7 +11065,7 @@ diff -urN foo/version.mk mysqlc/version.mk
 +# 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 @@
 +#*************************************************************************
@@ -11103,7 +11103,7 @@ diff -urN foo/cppconn_config.pmk mysqlcppconn/cppconn_config.pmk
 +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 @@
 +#*************************************************************************
@@ -11195,7 +11195,7 @@ diff -urN foo/makefile.mk mysqlcppconn/makefile.mk
 +
 +$(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 @@
 +#*************************************************************************
@@ -11254,7 +11254,7 @@ diff -urN foo/mysql_config.pmk mysqlcppconn/mysql_config.pmk
 +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 @@
 +#*************************************************************************
@@ -11307,7 +11307,7 @@ diff -urN foo/mysql_config.pmk.orig mysqlcppconn/mysql_config.pmk.orig
 +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
@@ -11662,14 +11662,14 @@ diff -urN foo/mysql-connector-cpp.patch mysqlcppconn/mysql-connector-cpp.patch
 ++# --- 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

More information about the ooo-build-commit mailing list