← Back to branch summary

~openoffice-pkgs/openoffice/3.2.0-lucid

« back to all changes in this revision

Viewing changes to patches/update-mysqlc.diff

  • Committer: Chris Cheney
  • Date: 2010-04-14 17:25:28 UTC
  • mfrom: (1022.17.301 debian)
  • Revision ID: ccheney@ubuntu.com-20100414172528-dcbj8kh8x7ynwa3g
Debian merge:

openoffice.org (1:3.2.0-7) unstable; urgency=low

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/update-mysqlc.diff
3
3
 
4
4
diff --git patches/dev300/apply patches/dev300/apply
5
5
index a1c1306..f1251e2 100644
6
 
--- openoffice.org-3.2.0/ooo-build-3-2-0-9/patches/dev300/apply
7
 
+++ openoffice.org-3.2.0/ooo-build-3-2-0-9/patches/dev300/apply
 
6
--- openoffice.org-3.2.0/ooo-build-3-2-0-10/patches/dev300/apply
 
7
+++ openoffice.org-3.2.0/ooo-build-3-2-0-10/patches/dev300/apply
8
8
@@ -273,10 +273,6 @@
9
9
 linkoo-dev300.diff, jholesov
10
10
 
47
47
 # the changes in this patch should be integrated into existing patches or
48
48
diff --git a/patches/dev300/cws-buildverbosity.diff b/patches/dev300/cws-buildverbosity.diff
49
49
index 2b75e44..ffefe05 100644
50
 
--- openoffice.org-3.2.0/ooo-build-3-2-0-9/patches/dev300/cws-buildverbosity.diff
51
 
+++ openoffice.org-3.2.0/ooo-build-3-2-0-9/patches/dev300/cws-buildverbosity.diff
 
50
--- openoffice.org-3.2.0/ooo-build-3-2-0-10/patches/dev300/cws-buildverbosity.diff
 
51
+++ openoffice.org-3.2.0/ooo-build-3-2-0-10/patches/dev300/cws-buildverbosity.diff
52
52
@@ -9889,19 +9889,24 @@ index 25dfa76..120fc10 100644
53
53
  .IF "$(OS)$(CPU)"=="WNTI"
54
54
  .IF "$(COM)"=="GCC"
86
86
  .ENDIF                        # "$(DESCRIPTION)"!=""
87
87
 @@ -151,7 +151,7 @@ PACKLICDEPS=$(CUSTOM_LICENSE)
88
88
--- /dev/null   2010-03-23 19:39:08.172681047 +0100
89
 
+++ 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
 
89
+++ openoffice.org-3.2.0/ooo-build-3-2-0-10/patches/dev300/mysqlc-from-OOO320_m14.diff  2010-03-29 10:51:29.000000000 +0200
90
90
@@ -0,0 +1,12132 @@
91
91
+Binary files foo/images/sun_extension_hc.png and mysqlc/images/sun_extension_hc.png differ
92
92
+Binary files foo/images/sun_extension.png and mysqlc/images/sun_extension.png differ
12221
12221
+ .ENDIF                        # "$(DESCRIPTION)"!=""
12222
12222
+ # default OOo license text!!!
12223
12223
--- /dev/null   2010-03-23 19:39:08.172681047 +0100
12224
 
+++ 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
 
12224
+++ openoffice.org-3.2.0/ooo-build-3-2-0-10/patches/dev300/mysqlc-missing-buildfixes-from-DEV300.diff   2010-03-29 10:43:30.000000000 +0200
12225
12225
@@ -0,0 +1,30 @@
12226
12226
+diff --git a/mysqlc/source/makefile.mk b/mysqlc/source/makefile.mk
12227
12227
+--- mysqlc/source/makefile.mk
12254
12254
+ CFLAGS+=-DCPPDBC_WIN32 -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS
12255
12255
+ 
12256
12256
--- /dev/null   2010-03-23 19:39:08.172681047 +0100
12257
 
+++ openoffice.org-3.2.0/ooo-build-3-2-0-9/patches/dev300/mysqlc-no-license.diff        2010-03-29 11:02:04.000000000 +0200
 
12257
+++ openoffice.org-3.2.0/ooo-build-3-2-0-10/patches/dev300/mysqlc-no-license.diff       2010-03-29 11:02:04.000000000 +0200
12258
12258
@@ -0,0 +1,14 @@
12259
12259
+--- mysqlc/source/description.xml-old  2010-03-29 11:01:27.000000000 +0200
12260
12260
++++ mysqlc/source/description.xml      2010-03-29 11:01:40.000000000 +0200