Commit graph

395 commits

Author SHA1 Message Date
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
Jens-Heiner Rechtien
f0698c6ca6 INTEGRATION: CWS native50 (1.43.12); FILE MERGED
2006/12/20 13:47:56 is 1.43.12.2: #i72802# functionality from solenv to scp2, but deactivating xpd installer
2006/12/07 15:27:58 is 1.43.12.1: #i65425# preparing xpd installer
2007-01-02 14:25:49 +00:00
Ivo Hinkelmann
70e923f688 INTEGRATION: CWS native72 (1.43.16); FILE MERGED
2006/12/12 10:48:48 is 1.43.16.2: #144138# 2.2 readyness
2006/11/20 14:17:24 is 1.43.16.1: #i70859# new variable ABOUTBOXPRODUCTVERSION
2006-12-19 17:32:36 +00:00
Ivo Hinkelmann
e0c64fa759 INTEGRATION: CWS native72 (1.3.192); FILE MERGED
2006/12/13 13:21:09 is 1.3.192.1: #i34068# smaller bitmaps for a11y, no text on bitmap
2006-12-19 17:32:22 +00:00
Ivo Hinkelmann
9cf4ebd8f6 INTEGRATION: CWS native72 (1.4.146); FILE MERGED
2006/12/13 13:21:08 is 1.4.146.1: #i34068# smaller bitmaps for a11y, no text on bitmap
2006-12-19 17:31:54 +00:00
Ivo Hinkelmann
8dccde8b55 INTEGRATION: CWS native72 (1.5.2); FILE MERGED
2006/12/13 13:21:08 is 1.5.2.1: #i34068# smaller bitmaps for a11y, no text on bitmap
2006-12-19 17:31:26 +00:00
Ivo Hinkelmann
26bcb617eb INTEGRATION: CWS native72 (1.2.270); FILE MERGED
2006/12/13 13:21:07 is 1.2.270.1: #i34068# smaller bitmaps for a11y, no text on bitmap
2006-12-19 17:31:13 +00:00
Ivo Hinkelmann
43008f20e4 INTEGRATION: CWS native72 (1.8.146); FILE MERGED
2006/12/13 13:21:07 is 1.8.146.1: #i34068# smaller bitmaps for a11y, no text on bitmap
2006-12-19 17:30:46 +00:00
Ivo Hinkelmann
ae8b1a733f INTEGRATION: CWS native72 (1.3.270); FILE MERGED
2006/12/13 13:21:06 is 1.3.270.1: #i34068# smaller bitmaps for a11y, no text on bitmap
2006-12-19 17:30:32 +00:00
Ivo Hinkelmann
de83d288e9 INTEGRATION: CWS native72 (1.9.146); FILE MERGED
2006/12/13 13:21:06 is 1.9.146.1: #i34068# smaller bitmaps for a11y, no text on bitmap
2006-12-19 17:30:05 +00:00
Kurt Zenker
f9c294430f INTEGRATION: CWS jsc14 (1.2.168); FILE MERGED
2006/10/24 14:14:38 jsc 1.2.168.1: #i65331# update image
2006-11-06 13:57:44 +00:00
Kurt Zenker
0979b34428 INTEGRATION: CWS jsc14 (1.4.140); FILE MERGED
2006/10/27 15:49:57 jsc 1.4.140.1: #i65331# adapt image sizes to new bitmap
2006-11-06 13:57:25 +00:00
Oliver Bolte
8b31fe6b38 INTEGRATION: CWS native62 (1.17.42); FILE MERGED
2006/09/25 08:51:23 is 1.17.42.1: #i67179# new pkgformats archive and installed
2006-10-13 09:37:32 +00:00
Oliver Bolte
fe74d9e8bf INTEGRATION: CWS native62 (1.40.34); FILE MERGED
2006/09/25 08:41:14 is 1.40.34.2: ## new PKGFORMATS archive and installed
2006/09/15 13:02:36 is 1.40.34.1: #i67077# new simple package mechanism for OOo dev product
2006-10-13 09:37:19 +00:00
Oliver Bolte
25eacb4534 INTEGRATION: CWS native62 (1.58.28); FILE MERGED
2006/09/25 08:50:50 is 1.58.28.1: #i67179# new pkgformats archive and installed
2006-10-13 09:37:05 +00:00
Oliver Bolte
983ea60334 INTEGRATION: CWS native63 (1.7.120); FILE MERGED
2006/09/20 10:45:16 is 1.7.120.1: #i69466# removing quickstarter link at uninstallation
2006-10-13 07:37:40 +00:00
Oliver Bolte
9bc03b24b0 INTEGRATION: CWS native66 (1.40.50); FILE MERGED
2006/09/27 15:07:01 is 1.40.50.1: #i69915# removing superfluous include pathes
2006-10-11 08:05:33 +00:00
Kurt Zenker
53f0fefe77 INTEGRATION: CWS ause068 (1.59.4); FILE MERGED
2006/09/22 17:48:26 hjs 1.59.4.1: #i69536# + no longer required before echo command
2006-10-05 09:29:45 +00:00
Kurt Zenker
fab3504a1b INTEGRATION: CWS native61 (1.40.26); FILE MERGED
2006/09/07 15:27:24 is 1.40.26.2: #140290# setting new version
2006/08/30 11:02:28 is 1.40.26.1: #140290# pu5 ready
2006-10-05 08:19:29 +00:00
Oliver Bolte
b44aad6dfa #i10000# one ALLUSERS setting too much 2006-09-19 05:41:10 +00:00
Oliver Bolte
3e0ea34d10 INTEGRATION: CWS writerfilter (1.43.8); FILE MERGED
2006/08/03 08:48:24 hbrinkm 1.43.8.7: RESYNC: (1.56-1.58); FILE MERGED
2006/07/21 08:20:24 hbrinkm 1.43.8.6: RESYNC: (1.55-1.56); FILE MERGED
2006/04/18 08:32:17 tra 1.43.8.5: RESYNC: (1.53-1.55); FILE MERGED
2006/03/14 13:54:48 tra 1.43.8.4: RESYNC: (1.52-1.53); FILE MERGED
2006/02/20 14:37:11 tra 1.43.8.3: RESYNC: (1.51-1.52); FILE MERGED
2006/01/02 17:24:51 tra 1.43.8.2: RESYNC: (1.43-1.51); FILE MERGED
2005/11/15 12:31:43 sb 1.43.8.1: #i57188# Missing fix for the recent MSITEMPLATEDIR changes (fix by is).
2006-09-15 13:38:43 +00:00
Oliver Bolte
0665e03e30 INTEGRATION: CWS writerfilter (1.2.86); FILE MERGED
2006/02/20 14:36:53 tra 1.2.86.2: RESYNC: (1.2-1.3); FILE MERGED
2005/11/15 12:30:22 sb 1.2.86.1: #i57188# When storing the path to the installed URE in the Windows registry, make sure that it ends up in HKEY_LOCAL_MACHINE.
2006-09-15 13:38:28 +00:00
Kurt Zenker
d37ddd8d0a INTEGRATION: CWS native56 (1.2.194); FILE MERGED
2006/07/19 14:48:23 is 1.2.194.1: #138243# followupdialog for outofdiscspace
2006-07-21 09:35:21 +00:00