[ooo-build-commit] Branch 'ooo-build-3-1' - patches/dev300

[Kalman "" Szalai]

 patches/dev300/apply                           |    7 ++++++-
 patches/dev300/ooop-updatable-sameversion.diff |   20 ++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

New commits:
commit e966f43a571abbea606f603a0cfaabace61eabe3
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date:   Tue Jun 2 19:15:59 2009 +0200

    Make OxygenOffice updatable from same version.
    
    * patches/dev300/apply:
    * patches/dev300/ooop-updatable-sameversion.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 2f6c6a0..17e7d20 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -140,7 +140,7 @@ OxygenOfficeMacOSXCommon :	Common, SystemBits, IntegrateExtensions, DejaVuFonts,
 OxygenOfficeWin32Common :	Common, Win32Only, NotDebian, IntegrateExtensions, DejaVuFonts, CalcRowLimit, OOXMLExport
 
 OxygenOfficeLinux:	OxygenOfficeLinuxCommon, OxygenOfficePalettes, OxygenOfficeDefaultSettings, OxygenOfficeExtras
-OxygenOfficeWindows:	OxygenOfficeWin32Common, OxygenOfficePalettes, OxygenOfficeDefaultSettings, OxygenOfficeExtras
+OxygenOfficeWindows:	OxygenOfficeWin32Common, OxygenOfficePalettes, OxygenOfficeDefaultSettings, OxygenOfficeExtras, OxygenOfficeWin32Only
 # FSFhu
 FSFhuWindows : Win32Common, NovellOnly, Lockdown, Fpickers, CustomUserConfig, DejaVuFonts, IntegrateExtensions
 FSFhuLinux : NovellBase, EMFPlus, CairoFonts, DejaVuFonts, IntegrateExtensions
@@ -2542,6 +2542,11 @@ ooowikipedia_genericcommands.diff
 ooowikipedia_writer.diff
 ooowikipedia_toolbars.diff
 
+[ OxygenOfficeWin32Only ]
+# Update Windows installation of OpenOffice.org even the version is same
+# So you can upgrade to OxygenOffice without removing OpenOffice.org
+ooop-updatable-sameversion.diff
+
 [ Win32Only ]
 mozilla-source-1.7.5.patch.diff, i#84961, tml
 
diff --git a/patches/dev300/ooop-updatable-sameversion.diff b/patches/dev300/ooop-updatable-sameversion.diff
new file mode 100644
index 0000000..9852938
--- /dev/null
+++ b/patches/dev300/ooop-updatable-sameversion.diff
@@ -0,0 +1,20 @@
+--- instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt.original	2009-06-02 18:56:22.000000000 +0200
++++ instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt	2009-06-02 18:56:22.000000000 +0200
+@@ -83,7 +83,6 @@
+ RemoveShortcuts		1600
+ RunningOffice	OFFICERUNS="1"	135
+ RMCCPSearch	Not CCP_SUCCESS And CCP_TEST	250
+-SameProductFound	SAMEPRODUCTS	120
+ ScheduleReboot	ISSCHEDULEREBOOT	3125
+ SelfRegModules		2850
+ SelfUnregModules		1100
+--- instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt.original	2009-06-02 18:56:41.000000000 +0200
++++ instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt	2009-06-02 18:56:41.000000000 +0200
+@@ -18,7 +18,6 @@
+ PatchWelcome	Installed And PATCH And Not IS_MAJOR_UPGRADE	625
+ ResolveSource	Not Installed And Not PATCH	525
+ RMCCPSearch	Not CCP_SUCCESS And CCP_TEST	300
+-SameProductFound	SAMEPRODUCTS	170
+ setAllUsersProfile2K	VersionNT >= 500	512
+ SetAllUsersProfileNT	VersionNT = 400	511
+ SetupCompleteError		-3