CVS eclipse/debian/extra

[Stephan Michels]

Update of /cvsroot/pkg-java/eclipse/debian/extra
In directory haydn:/tmp/cvs-serv24024/extra

Modified Files:
	config.ini eclipse.sh 
Log Message:
Updated debian/extra/config.ini
to fix the problem with the missing splash screen.
Updated debian/control, debian/extra/eclipse.sh
and debian/patches/eclipse-libswt-mozilla-classic.dpatch
to make it possible to use Firefox instead of Mozilla. Closes: #336285


--- /cvsroot/pkg-java/eclipse/debian/extra/config.ini	2005/10/15 12:29:55	1.1
+++ /cvsroot/pkg-java/eclipse/debian/extra/config.ini	2005/10/30 12:10:49	1.2
@@ -1,22 +1,22 @@
 # Eclipse runtime configuration file
-# This file contains a number of key/value pairs that are merged into the
-# System properties on system startup.  The values control the way the
+# This file contains a number of key/value pairs that are merged into the 
+# System properties on system startup.  The values control the way the 
 # runtime is structured and runs.
 
-# Note:  Only platform:/base/ and file: URLs are supported.  In general the
-# URLs given may include a version number (e.g., .../location_1.2.3).
+# Note:  Only platform:/base/ and file: URLs are supported.  In general the 
+# URLs given may include a version number (e.g., .../location_1.2.3).  
 # If a version is not specified, the system binds
 # to the location which matches exactly or to the versioned location with the
 # latest version number.  If a version number is given then only exact matches
 # are considered.
 
 # The URL for the runtime entry point.  The default value is
-# platform:/base/plugins/org.eclipse.osgi
-#osgi.framework=platform:/base/plugins/org.eclipse.osgi
+# platform:/base/plugins/org.eclipse.osgi 
+#osgi.framework = platform:/base/plugins/org.eclipse.osgi
 
-# The classpath for the framework found at the osgi.framework location.  This
+# The classpath for the framework found at the osgi.framework location.  This 
 # comma-separated list contains either URLs or simple element names.  Simple
-# names are assumed to be relative to the framework's install directory.
+# names are assumed to be relative to the framework's install directory.  
 # Typically this value need not be set as it is initialized by the framework itself.
 # Version match searching is not done for URLs listed here.
 #osgi.frameworkClassPath =
@@ -24,10 +24,10 @@
 # The comma-separated list of locations to search for the splash screen file (splash.bmp).
 # For each list element a subdirectory structure based on the pattern nl/<locale> is searched.
 # The system binds to the first matching file.  There is no default value.
-#osgi.splashPath=
+osgi.splashPath = platform:/base/plugins/org.eclipse.platform
 
-# The location of the splash screen file.  If this value is set at system startup it is used
-# in favour of the osgi.splashPath searching outlined above.  If the value is not set
+# The location of the splash screen file.  If this value is set at system startup it is used 
+# in favour of the osgi.splashPath searching outlined above.  If the value is not set 
 # the searching is done and this key is bound to the result of the search.
 #osgi.splashLocation =
 
@@ -38,21 +38,26 @@
 # If the "start" tag is added then the bundle will be marked as started after being installed.
 # Simple bundle locations are interepreted as relative to the framework's parent directory.
 # The startlevel indicates the OSGi start level at which the bundle should run.
-# If this value is not set, the system computes an appropriate default.
 osgi.bundles=org.eclipse.core.runtime at 2:start, org.eclipse.update.configurator at 3:start
 
 # The product to run.  A given Eclipse configuration may contain many products.
-# The product identified will supply the branding (window icons, title bar text) etc
-# as well as define the default application to run.
-eclipse.product=org.eclipse.platform.ide
+# The product identified will supply the branding (window icons, title bar text) etc 
+# as well as define the default application to run.  
+eclipse.product=org.eclipse.sdk.ide
 
 # The application to run.  The value specified here is the id of the application extension
-# the runtime will find, instantiate and execute once the system is up.  Note that typically
+# the runtime will find, instantiate and execute once the system is up.  Note that typically 
 # the identified eclipse.product defines the default application to run.
 #eclipse.application=
 
+# The default workspace location
+osgi.instance.area.default=@user.home/workspace
+
 # The build identifier
-eclipse.buildId=
+eclipse.buildId=@build@
+
+# entry required for gtk configurations of eclipse to enable stand-alone help
+osgi.ws=gtk
 
 # End of file marker - must be here
-eof=eof
+eof=eof
\ No newline at end of file
--- /cvsroot/pkg-java/eclipse/debian/extra/eclipse.sh	2005/10/15 12:29:55	1.1
+++ /cvsroot/pkg-java/eclipse/debian/extra/eclipse.sh	2005/10/30 12:10:49	1.2
@@ -87,7 +87,9 @@
 fi
 
 # Set path for the Mozilla SWT binding
-if [ -a /usr/lib/mozilla ]; then
+if [ -d /usr/lib/mozilla-firefox ]; then
+    export MOZILLA_FIVE_HOME=/usr/lib/mozilla-firefox
+elif [ -d /usr/lib/mozilla ]; then
     export MOZILLA_FIVE_HOME=/usr/lib/mozilla
 fi