From 6f145447ed82a18fbaa362795fbae91b9ded3267 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Wed, 27 Aug 2008 14:23:13 +0000 Subject: INTEGRATION: CWS native189_DEV300 (1.6.30); FILE MERGED 2008/08/26 13:47:06 is 1.6.30.1: #i93138# removing solaris packages after dependency check --- .../org/openoffice/setup/InstallerHelper/SolarisHelper.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'javainstaller2') diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/SolarisHelper.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/SolarisHelper.java index 967187f90005..4b91edf3c198 100755 --- a/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/SolarisHelper.java +++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallerHelper/SolarisHelper.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: SolarisHelper.java,v $ - * $Revision: 1.6 $ + * $Revision: 1.7 $ * * This file is part of OpenOffice.org. * @@ -146,8 +146,8 @@ public class SolarisHelper { // if ( data.isUserInstallation() ) { idependLine = "idepend=nocheck"; } adminFile.add(idependLine); - String rdependLine = "rdepend=nocheck"; - // String rdependLine = "rdepend=quit"; + // String rdependLine = "rdepend=nocheck"; + String rdependLine = "rdepend=quit"; if ( data.isUserInstallation() ) { rdependLine = "rdepend=nocheck"; } adminFile.add(rdependLine); -- cgit