r1876 - in trunk/eclipse/debian: . extra

[Michael Koch]

Author: mkoch
Date: 2006-02-08 06:11:46 +0000 (Wed, 08 Feb 2006)
New Revision: 1876

Modified:
   trunk/eclipse/debian/changelog
   trunk/eclipse/debian/extra/eclipse.sh
Log:
Fixed tests for xpcom.so. Exec the eclipse binary directly.


Modified: trunk/eclipse/debian/changelog
===================================================================
--- trunk/eclipse/debian/changelog	2006-02-08 03:56:02 UTC (rev 1875)
+++ trunk/eclipse/debian/changelog	2006-02-08 06:11:46 UTC (rev 1876)
@@ -24,7 +24,8 @@
     Eclipse if you have the eclipse package installed. Closes: #348584
 
   [ Michael Koch ]
-  * debian/extra/eclipse.sh: Made the -vm option working.
+  * debian/extra/eclipse.sh: Made the -vm option working. Fixed tests for
+    xpcom.so. Exec the eclipse binary directly.
   * debian/control.in: eclipse-platform-common: Depends on zenity |
     kdebase-bin | xdialog instead of zenity only.
   * Added debian/patches/eclipse-heapstatus.dpatch to show the heap status
@@ -37,7 +38,7 @@
   [ Matthias Klose ]
   * Add support to build using firefox-dev (turned off by default).
 
- -- Michael Koch <konqueror at gmx.de>  Tue,  7 Feb 2006 22:35:26 +0000
+ -- Michael Koch <konqueror at gmx.de>  Wed,  8 Feb 2006 07:16:22 +0000
 
 eclipse (3.1.1-8) unstable; urgency=low
 

Modified: trunk/eclipse/debian/extra/eclipse.sh
===================================================================
--- trunk/eclipse/debian/extra/eclipse.sh	2006-02-08 03:56:02 UTC (rev 1875)
+++ trunk/eclipse/debian/extra/eclipse.sh	2006-02-08 06:11:46 UTC (rev 1876)
@@ -124,16 +124,16 @@
 fi
 
 # Set path for the Mozilla SWT binding
-if [ -d /usr/lib/firefox/libxpcom.so ]; then
+if [ -e /usr/lib/firefox/libxpcom.so ]; then
     export MOZILLA_FIVE_HOME=/usr/lib/firefox
-elif [ -d /usr/lib/mozilla-firefox/libxpcom.so ]; then
+elif [ -e /usr/lib/mozilla-firefox/libxpcom.so ]; then
     export MOZILLA_FIVE_HOME=/usr/lib/mozilla-firefox
-elif [ -d /usr/lib/mozilla/libxpcom.so ]; then
+elif [ -e /usr/lib/mozilla/libxpcom.so ]; then
     export MOZILLA_FIVE_HOME=/usr/lib/mozilla
 fi
 
 # Do the actual launch of Eclipse with the selected VM.
-/usr/lib/eclipse/eclipse \
+exec /usr/lib/eclipse/eclipse \
     -vm "${JAVACMD}" \
     -install "${INSTALL}" \
     -startup "${STARTUP}" \
@@ -142,7 +142,3 @@
             -Dgnu.gcj.precompiled.db.path=/var/lib/gcj-4.0/classmap.db \
             -Dgnu.gcj.runtime.VMClassLoader.library_control=never \
             -Dosgi.locking=none ${VMARGS}
-
-
-
-exit $?