------------------------------------------------------------ revno: 1908 committer: Rene Engelhard <[email protected]> branch nick: unstable timestamp: Mon 2010-04-05 15:34:56 +0200 message: unfuzzy (non-fuzzy with sids patch) patch to make lennys patch (used by dak checks) happy modified: patches/update-mysqlc.diff
=== modified file 'patches/update-mysqlc.diff' --- a/patches/update-mysqlc.diff 2010-04-04 10:22:45 +0000 +++ b/patches/update-mysqlc.diff 2010-04-05 13:34:56 +0000 @@ -7,7 +7,7 @@ +++ openoffice.org-3.2.0/ooo-build-3-2-0-9/patches/dev300/apply @@ -273,10 +273,6 @@ linkoo-dev300.diff, jholesov - + [ TemporaryHacks ] -# Make the historically very verbose build quieter, helps us see warnings. -# From the upstream buildverbosity01 CWS @@ -15,13 +15,14 @@ - # gcc OOMs here otherwise (x86_64) writerfilter-qnametostr-NOOPTFILES.diff - -@@ -3310,7 +3310,13 @@ writer-doc-comparison-help.diff, tzvetelina - - + +@@ -3307,8 +3303,14 @@ + writer-doc-comparison-help.diff, tzvetelina + + -[ MySQL ] -+[ MySQL < ooo320-m14 ] -cws-mysqlnative-20090916.diff ++[ MySQL < ooo320-m14 ] +mysqlc-from-OOO320_m14.diff +[ MySQL < ooo320-m15 ] +mysqlc-missing-buildfixes-from-DEV300.diff @@ -29,13 +30,13 @@ +mysqlc-no-license.diff +[ ExtensionFixes >= ooo320-m14 ] +mysqlc-no-license.diff - + [ MySQL and DebianBaseOnly ] # add hack to link against STLport version of libmysqlcppconn on i386. -@@ -3436,6 +3432,11 @@ mysqlc-no-license.diff +@@ -3318,6 +3320,11 @@ # fix mysqlc to use the SONAME instead of the .so symlink... mysqlcppconn-mysqlclient-SONAME.diff - + +[ TemporaryHacks ] +# Make the historically very verbose build quieter, helps us see warnings. +# From the upstream buildverbosity01 CWS
