Commit graph

417 commits

Author SHA1 Message Date
Oliver Bolte
3207a0b3e7 INTEGRATION: CWS oointroaboutbrand (1.66.12); FILE MERGED
2007/05/25 10:44:27 cd 1.66.12.3: RESYNC: (1.66-1.67); FILE MERGED
2007/03/27 11:45:15 hjs 1.66.12.2: #i66426# intro and about bmp resorted - take care of the nologo versions
2007/03/26 13:14:52 hjs 1.66.12.1: #i66426# intro and about bmp resorted
2007-06-11 12:59:00 +00:00
Ivo Hinkelmann
4ec89f05be INTEGRATION: CWS aquabundle (1.2.30); FILE MERGED
2007/05/24 20:53:41 obr 1.2.30.1: #i73693# moved office directory structure up in the Mac OS X bundle and renamed program to MacOS
2007-06-05 10:52:25 +00:00
Ivo Hinkelmann
797b315b40 INTEGRATION: CWS aquabundle (1.2.28); FILE MERGED
2007/05/24 20:53:41 obr 1.2.28.1: #i73693# moved office directory structure up in the Mac OS X bundle and renamed program to MacOS
2007-06-05 10:52:07 +00:00
Rüdiger Timm
cc5fd84765 Disable 'dev' install sets for non-product platforms. 2007-05-24 09:14:55 +00:00
Rüdiger Timm
1e2cc05c67 Correct version info for BrOffice 2007-05-11 12:35:26 +00:00
Kurt Zenker
bb71f7e2d5 INTEGRATION: CWS nativebroffice_SRC680 (1.18.30.3.2); FILE MERGED
2007/03/26 15:18:24 rt 1.18.30.3.2.3: RESYNC: (1.18.30.4-1.18.30.5); FILE MERGED
2007/02/19 09:48:52 rt 1.18.30.3.2.2: RESYNC: (1.18.30.3-1.18.30.4); FILE MERGED
2007/02/13 14:53:11 is 1.18.30.3.2.1: #i74456# new BrOffice.org
2007-05-10 14:42:39 +00:00
Kurt Zenker
7710336a50 INTEGRATION: CWS nativebroffice_SRC680 (1.45.2.1.4); FILE MERGED
2007/03/19 11:44:59 rt 1.45.2.1.4.2: #i75474# No SISSL license any more.
2007/02/13 14:53:10 is 1.45.2.1.4.1: #i74456# new BrOffice.org
2007-05-10 14:10:50 +00:00
Kurt Zenker
d9b84346e0 INTEGRATION: CWS nativebroffice_SRC680 (1.62.2.1.4); FILE MERGED
2007/03/26 15:18:18 rt 1.62.2.1.4.2: RESYNC: (1.62.2.1-1.62.2.2); FILE MERGED
2007/02/13 14:53:10 is 1.62.2.1.4.1: #i74456# new BrOffice.org
2007-05-10 14:10:36 +00:00
Kurt Zenker
21866a1e7f INTEGRATION: CWS nativebroffice_SRC680 (1.1.2); FILE ADDED
2007/02/13 14:54:20 is 1.1.2.1: #i74456# new BrOffice.org
2007-05-10 14:10:22 +00:00
Kurt Zenker
247b3320d9 INTEGRATION: CWS nativebroffice_SRC680 (1.1.2); FILE ADDED
2007/02/13 14:54:05 is 1.1.2.1: #i74456# new BrOffice.org
2007-05-10 14:10:13 +00:00
Kurt Zenker
659ad7a112 INTEGRATION: CWS nativebroffice_SRC680 (1.1.2); FILE ADDED
2007/03/27 11:31:57 rt 1.1.2.1: #i74456# Needed for BrOffice.org
2007-05-10 14:09:22 +00:00
Gerd Weiss
16551963a8 INTEGRATION: CWS native82 (1.47.10); FILE MERGED
2007/04/11 11:43:26 is 1.47.10.2: RESYNC: (1.47-1.48); FILE MERGED
2007/03/20 10:40:37 is 1.47.10.1: #i74914# constant base dir for windows patch preparation
2007-05-10 10:01:20 +00:00
Kurt Zenker
bbe7fbcf3b INTEGRATION: CWS macosxpbuildrepair (1.2.14); FILE MERGED
2007/04/03 19:35:33 tra 1.2.14.1: #75972#fix Panther incompatibility
2007-05-10 08:15:16 +00:00
Ivo Hinkelmann
03cc6ca411 INTEGRATION: CWS mergede01 (1.3.330); FILE MERGED
2007/03/19 15:10:06 ihi 1.3.330.1: #i72301# Remove German
2007-04-19 13:48:48 +00:00
Ivo Hinkelmann
c4f22c8703 INTEGRATION: CWS mergede01 (1.4.262); FILE MERGED
2007/03/19 15:10:06 ihi 1.4.262.1: #i72301# Remove German
2007-04-19 13:48:36 +00:00
Ivo Hinkelmann
cf8a3f3657 INTEGRATION: CWS mergede01 (1.5.124); FILE MERGED
2007/03/19 15:10:06 ihi 1.5.124.1: #i72301# Remove German
2007-04-19 13:48:22 +00:00
Ivo Hinkelmann
9d3d20c02c INTEGRATION: CWS mergede01 (1.2.298); FILE MERGED
2007/03/19 15:10:05 ihi 1.2.298.1: #i72301# Remove German
2007-04-19 13:47:42 +00:00
Ivo Hinkelmann
6f9d404392 INTEGRATION: CWS mergede01 (1.3.330); FILE MERGED
2007/03/19 15:10:05 ihi 1.3.330.1: #i72301# Remove German
2007-04-19 13:47:27 +00:00
Ivo Hinkelmann
1e331b4997 INTEGRATION: CWS mergede01 (1.2.258); FILE MERGED
2007/03/19 15:10:05 ihi 1.2.258.1: #i72301# Remove German
2007-04-19 13:47:01 +00:00
Ivo Hinkelmann
b885704a67 INTEGRATION: CWS mergede01 (1.10.166); FILE MERGED
2007/03/19 15:10:04 ihi 1.10.166.1: #i72301# Remove German
2007-04-19 13:46:48 +00:00
Ivo Hinkelmann
7eb555a887 INTEGRATION: CWS mergede01 (1.4.172); FILE MERGED
2007/03/19 15:10:04 ihi 1.4.172.1: #i72301# Remove German
2007-04-19 13:46:22 +00:00
Rüdiger Timm
4b4330fecb INTEGRATION: CWS native80 (1.47.4); FILE MERGED
2007/03/06 13:44:20 is 1.47.4.2: #145483# no more orca errors
2007/03/05 16:47:31 is 1.47.4.1: #145483# removing errors in msi databases
2007-04-02 11:33:03 +00:00
Rüdiger Timm
94de759d71 INTEGRATION: CWS native80 (1.3.280); FILE MERGED
2007/03/06 14:11:43 is 1.3.280.1: #145483# no more orca errors
2007-04-02 11:32:49 +00:00
Rüdiger Timm
f18e0d9050 INTEGRATION: CWS native80 (1.2.280); FILE MERGED
2007/03/05 16:49:25 is 1.2.280.1: #145483# removing errors in msi databases
2007-04-02 11:32:35 +00:00
Rüdiger Timm
fdeed5bc28 INTEGRATION: CWS native80 (1.5.30); FILE MERGED
2007/03/05 16:49:25 is 1.5.30.1: #145483# removing errors in msi databases
2007-04-02 11:32:21 +00:00
Rüdiger Timm
74d47257e3 INTEGRATION: CWS native80 (1.2.208); FILE MERGED
2007/03/05 16:48:39 is 1.2.208.1: #145483# removing errors in msi databases
2007-04-02 11:31:51 +00:00
Rüdiger Timm
0f1d316069 INTEGRATION: CWS native80 (1.2.208); FILE MERGED
2007/03/05 16:48:37 is 1.2.208.1: #145483# removing errors in msi databases
2007-04-02 11:31:36 +00:00
Rüdiger Timm
7edcac9800 INTEGRATION: CWS native80 (1.6.30); FILE MERGED
2007/03/05 16:48:36 is 1.6.30.1: #145483# removing errors in msi databases
2007-04-02 11:31:24 +00:00
Rüdiger Timm
65008376c2 INTEGRATION: CWS native80 (1.8.52); FILE MERGED
2007/03/06 13:44:20 is 1.8.52.1: #145483# no more orca errors
2007-04-02 11:31:10 +00:00
Rüdiger Timm
d29e40456e INTEGRATION: CWS native80 (1.6.92); FILE MERGED
2007/03/05 16:47:58 is 1.6.92.1: #145483# removing errors in msi databases
2007-04-02 11:30:56 +00:00
Vladimir Glazounov
273f25672a INTEGRATION: CWS updatefeed3 (1.1.2); FILE ADDED
2007/02/27 12:01:11 obr 1.1.2.1: #i74775# generate update information file as needed for online update
2007-03-01 14:58:58 +00:00
Vladimir Glazounov
4837051460 INTEGRATION: CWS updatefeed3 (1.65.6); FILE MERGED
2007/03/01 08:26:21 rt 1.65.6.2: #i74775# Small syntax fix (specify path; for distributed packing in build server).
2007/02/27 12:01:10 obr 1.65.6.1: #i74775# generate update information file as needed for online update
2007-03-01 14:58:43 +00:00
Vladimir Glazounov
d8108d0659 INTEGRATION: CWS updatefeed3 (1.5.282); FILE MERGED
2007/02/27 12:01:10 obr 1.5.282.1: #i74775# generate update information file as needed for online update
2007-03-01 14:58:29 +00:00
Vladimir Glazounov
1e5687a3cb INTEGRATION: CWS macosxversioning01 (1.18.258); FILE MERGED
2007/01/07 11:40:40 mox 1.18.258.3: Fix mistake in build tags: con --> oon
2007/01/04 13:27:35 mox 1.18.258.2: Fix a compilation error.
2006/12/29 22:07:20 mox 1.18.258.1: Issue number:  #72835#
Insert the files moved from desktop module to here, instsetoo_native.
Create and adjust makefiles accordingly.
Put the files that need versioning in a separate folder, this makes it
possible to handle installer stuff (that also needs versioning) in the
instsetoo_native/macosx/ -folder.
2007-02-26 13:57:25 +00:00
Vladimir Glazounov
2f77110466 INTEGRATION: CWS macosxversioning01 (1.1.2); FILE ADDED
2007/01/06 23:01:12 mox 1.1.2.5: Manual resync with cws macosx22fixes (only relevant changes), per
pjanik's request
2007/01/06 22:54:15 mox 1.1.2.4: Add license text, remove user profile migration, per pjanik's request
2007/01/06 22:27:34 mox 1.1.2.3: Change versioning strings to match the rest of the OOo code
2006/12/30 10:00:54 mox 1.1.2.2: Issue number:  #72835#
Make the Mac OS X specific application files to automatically get the
appropriate OpenOffice.org version.
2006/12/29 22:07:19 mox 1.1.2.1: Issue number:  #72835#
Insert the files moved from desktop module to here, instsetoo_native.
Create and adjust makefiles accordingly.
Put the files that need versioning in a separate folder, this makes it
possible to handle installer stuff (that also needs versioning) in the
instsetoo_native/macosx/ -folder.
2007-02-26 13:57:12 +00:00
Vladimir Glazounov
876cdbb49f INTEGRATION: CWS macosxversioning01 (1.1.2); FILE ADDED
2007/01/06 22:27:34 mox 1.1.2.3: Change versioning strings to match the rest of the OOo code
2006/12/30 10:00:54 mox 1.1.2.2: Issue number:  #72835#
Make the Mac OS X specific application files to automatically get the
appropriate OpenOffice.org version.
2006/12/29 22:07:19 mox 1.1.2.1: Issue number:  #72835#
Insert the files moved from desktop module to here, instsetoo_native.
Create and adjust makefiles accordingly.
Put the files that need versioning in a separate folder, this makes it
possible to handle installer stuff (that also needs versioning) in the
instsetoo_native/macosx/ -folder.
2007-02-26 13:57:02 +00:00
Vladimir Glazounov
c1fe40ec98 INTEGRATION: CWS macosxversioning01 (1.1.2); FILE ADDED
2007/01/07 11:44:49 mox 1.1.2.4: Remove unnecessary IFDEFs from makefile.mk
2007/01/07 10:58:38 mox 1.1.2.3: Update Info.plist to follow Apple's standard ways of versioning. This
also obsoletes InfoPlist.strings. Fix sed command, broken by changes in
openoffice.lst
2006/12/30 10:00:54 mox 1.1.2.2: Issue number:  #72835#
Make the Mac OS X specific application files to automatically get the
appropriate OpenOffice.org version.
2006/12/29 22:07:18 mox 1.1.2.1: Issue number:  #72835#
Insert the files moved from desktop module to here, instsetoo_native.
Create and adjust makefiles accordingly.
Put the files that need versioning in a separate folder, this makes it
possible to handle installer stuff (that also needs versioning) in the
instsetoo_native/macosx/ -folder.
2007-02-26 13:56:38 +00:00
Vladimir Glazounov
a9aec76fb1 INTEGRATION: CWS macosxversioning01 (1.1.2); FILE ADDED
2007/01/07 10:58:37 mox 1.1.2.4: Update Info.plist to follow Apple's standard ways of versioning. This
also obsoletes InfoPlist.strings. Fix sed command, broken by changes in
openoffice.lst
2007/01/06 22:54:14 mox 1.1.2.3: Add license text, remove user profile migration, per pjanik's request
2007/01/06 22:27:33 mox 1.1.2.2: Change versioning strings to match the rest of the OOo code
2007/01/04 13:31:54 mox 1.1.2.1: Issue number:  #72835#
Add the missing script that does the actual versioning.
2007-02-26 13:56:27 +00:00
Rüdiger Timm
d6090b8bd9 INTEGRATION: CWS native77 (1.45.16); FILE MERGED
2007/02/12 15:38:41 is 1.45.16.3: #i74333# new update url
2007/02/06 12:49:05 is 1.45.16.2: RESYNC: (1.45-1.46); FILE MERGED
2007/02/06 11:57:36 is 1.45.16.1: #i74212# preparing OOo 2.3 and SO 8 PU7
2007-02-19 12:52:18 +00:00
Rüdiger Timm
d1a71ef36f INTEGRATION: CWS native77 (1.7.230); FILE MERGED
2007/02/08 16:22:49 is 1.7.230.1: #i73143# language modules defined in scp
2007-02-19 12:52:07 +00:00
Oliver Bolte
81e768c0b6 INTEGRATION: CWS ause069 (1.60.6); FILE MERGED
2007/01/24 12:43:19 hjs 1.60.6.5: RESYNC: (1.62-1.63); FILE MERGED
2007/01/10 22:25:26 hjs 1.60.6.4: RESYNC: (1.61-1.62); FILE MERGED
2006/11/24 14:54:11 hjs 1.60.6.3: #i70359# remove forced shell calls
2006/11/07 06:28:30 hjs 1.60.6.2: RESYNC: (1.60-1.61); FILE MERGED
2006/10/18 17:11:30 hjs 1.60.6.1: #i70359# remove forced shell calls
2007-01-25 15:02:30 +00:00
Oliver Bolte
d620a44155 INTEGRATION: CWS cloph06 (1.63.6); FILE MERGED
2007/01/22 21:17:10 cloph 1.63.6.1: remove the -u option to allow building without gnucp again
2007-01-25 10:14:13 +00:00
Oliver Bolte
6464e2191a INTEGRATION: CWS sb65 (1.43.22); FILE MERGED
2007/01/10 09:12:47 sb 1.43.22.2: RESYNC: (1.43-1.45); FILE MERGED
2006/12/11 14:26:36 sb 1.43.22.1: #i71283# URE 1.2.
2007-01-25 09:55:52 +00:00
Oliver Bolte
76cfad4e8a INTEGRATION: CWS native76 (1.3.164); FILE MERGED
2007/01/11 16:29:34 is 1.3.164.1: #i72495# installpath to uninstall keys with custom action
2007-01-22 13:43:24 +00:00
Oliver Bolte
9ca3d39917 INTEGRATION: CWS native76 (1.2.192); FILE MERGED
2007/01/11 16:29:33 is 1.2.192.1: #i72495# installpath to uninstall keys with custom action
2007-01-22 13:42:33 +00:00
Oliver Bolte
823abb080c INTEGRATION: CWS native76 (1.3.256); FILE MERGED
2007/01/11 16:29:33 is 1.3.256.1: #i72495# installpath to uninstall keys with custom action
2007-01-22 13:41:41 +00:00
Oliver Bolte
7614373230 INTEGRATION: CWS native76 (1.3.256); FILE MERGED
2007/01/11 16:29:32 is 1.3.256.1: #i72495# installpath to uninstall keys with custom action
2007-01-22 13:40:07 +00:00
Rüdiger Timm
cb91ee4e38 #i10000# 'openofficedevarchive' for product platforms only. 2007-01-19 10:06:48 +00:00
Vladimir Glazounov
ab8f310707 INTEGRATION: CWS macosxdmgapplink (1.61.24); FILE MERGED
2006/12/24 00:54:13 smsm1 1.61.24.1: #72008#: inserts line into the makefile so that the symlink is created for going into the base of the final disk image
2007-01-09 14:04:56 +00:00
Jens-Heiner Rechtien
3cd8b94945 INTEGRATION: CWS cloph05 (1.61.22); FILE MERGED
2006/12/21 12:35:36 cloph 1.61.22.1: Issue number: #i#72840#
Don't require gnu cp when building on Mac. The default (POSIX) cp works fine as well.
2007-01-03 09:13:53 +00:00