ooo-build r14479 - in branches/ooo-build-3-0: . patches/dev300

[tml svn gnome org]

Author: tml
Date: Tue Nov 11 09:50:48 2008
New Revision: 14479
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14479&view=rev

Log:
2008-11-11  Tor Lillqvist  <tml novell com>

	* patches/dev300/novell-win32-msi-patchability.diff
	(instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt):
	Change the condition of the SetOfficeInstallLocation,
	SetBasisInstallLocation and SetUreInstallLocation actions in the
	InstallExecuteSequence table to "Not Installed Or PATCH" instead
	of just "Not Installed". This precents the Registry entries that
	refer to [OFFICEINSTALLLOCATION] etc from getting screwed up when
	patching. Just a stopgap measure, not to be committed to
	trunk. Upstream will fix this in a slightly different way in 3.1 I
	think.



Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/novell-win32-msi-patchability.diff

Modified: branches/ooo-build-3-0/patches/dev300/novell-win32-msi-patchability.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/novell-win32-msi-patchability.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/novell-win32-msi-patchability.diff	Tue Nov 11 09:50:48 2008
@@ -104,3 +104,18 @@
 +yi = "{382C63FC-2CC9-4C7D-877B-AA779CEA0479}"
  multiwestern = "{385A1970-0257-4C57-9383-DD2D668B23CE}"
  multiasia = "{74543111-6ABF-4A12-AC11-D315E2939D2A}"
+--- instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
++++ instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
+@@ -87,9 +87,9 @@
+ SelfRegModules		2850
+ SelfUnregModules		1100
+ SetARPInstallLocation	Not Installed	990
+-SetOfficeInstallLocation	Not Installed	575
+-SetBasisInstallLocation	Not Installed	576
+-SetUreInstallLocation	Not Installed	577
++SetOfficeInstallLocation	Not Installed Or PATCH	575
++SetBasisInstallLocation	Not Installed Or PATCH	576
++SetUreInstallLocation	Not Installed Or PATCH	577
+ SetODBCFolders		550
+ StartServices	VersionNT	2800
+ StopServices	VersionNT	950