[pkg-java] r2618 - in trunk/eclipse/debian: . extra

[Matthias Klose]

Author: doko
Date: 2006-10-16 13:12:10 +0000 (Mon, 16 Oct 2006)
New Revision: 2618

Modified:
   trunk/eclipse/debian/changelog
   trunk/eclipse/debian/control
   trunk/eclipse/debian/control.in
   trunk/eclipse/debian/extra/eclipse.sh
Log:
+  * debian/extras/eclipse.sh: Remove mozilla error dialog.
+  * debian/control.in: Let eclipse recommend eclipse-gcj.


Modified: trunk/eclipse/debian/changelog
===================================================================
--- trunk/eclipse/debian/changelog	2006-10-16 12:01:15 UTC (rev 2617)
+++ trunk/eclipse/debian/changelog	2006-10-16 13:12:10 UTC (rev 2618)
@@ -59,6 +59,8 @@
   * debian/patches/eclipse-libswt-firefox2.dpatch: New, taken from FC.
   * debian/rules: Uses bashisms, set SHELL.
   * Speed up native build on multiprocessor machines.
+  * debian/extras/eclipse.sh: Remove mozilla error dialog.
+  * debian/control.in: Let eclipse recommend eclipse-gcj.
 
  -- Michael Koch <konqueror at gmx.de>  Tue,  3 Oct 2006 17:22:09 +0000
 

Modified: trunk/eclipse/debian/control
===================================================================
--- trunk/eclipse/debian/control	2006-10-16 12:01:15 UTC (rev 2617)
+++ trunk/eclipse/debian/control	2006-10-16 13:12:10 UTC (rev 2618)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Jerry Haltom <wasabi at larvalstage.net>, Michael Koch <konqueror at gmx.de>, Matthias Klose <doko at debian.org>, Stephan Michels <stephan at apache.org>
-Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, bzip2, sharutils, java-gcj-compat-dev (>= 1.0.65-6), liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), junit (>= 3.8), libjsch-java (>= 0.1.28), libgtk2.0-dev (>= 2.4), libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6), libxtst-dev, libgl1-mesa-dev, libglu1-mesa-dev, classpath-doc, pkg-config, libcairo2-dev, ant-optional (>= 1.6.5-3), libtomcat5.5-java, mozilla-dev
+Build-Depends: debhelper (>> 4.2), dpatch (>= 2.0), lsb-release, bzip2, sharutils, java-gcj-compat-dev (>= 1.0.65-6), liblucene-java (>= 1.4.2), liblucene-java-doc (>= 1.4.2), junit (>= 3.8), libjsch-java (>= 0.1.28), libgtk2.0-dev (>= 2.4), libgnome2-dev (>= 2.6), libgnomeui-dev (>= 2.6), libxtst-dev, libgl1-mesa-dev, libglu1-mesa-dev, classpath-doc, pkg-config, libcairo2-dev, ant-optional (>= 1.6.5-3), libtomcat5.5-java, firefox-dev
 Standards-Version: 3.7.2
 
 Package: eclipse-rcp
@@ -160,6 +160,7 @@
 Architecture: any
 Depends: eclipse-jdt (= ${Source-Version}), eclipse-pde (= ${Source-Version}), eclipse-source (= ${Source-Version})
 Conflicts: eclipse-sdk (<= 3.1.1-5), eclipse-platform-common (<< 3.1.2-1)
+Recommends: eclipse-gcj
 Replaces: eclipse-sdk (<= 3.1.1-5), eclipse-platform-common (<< 3.1.2-1), eclipse-platform (<< 3.1.2-2)
 Description: Extensible Tool Platform and Java IDE
  The Eclipse Platform is an open and extensible platform for anything and yet
@@ -187,7 +188,7 @@
 Package: libswt3.2-gtk-java
 Architecture: any
 Depends: libswt3.2-gtk-jni (= ${Source-Version}), java-common
-Recommends: libswt3.2-gtk-gcj, mozilla-browser (>= 2:1.7.0)
+Recommends: libswt3.2-gtk-gcj, firefox (>= 1.4.99)
 Replaces: libswt3.1-gtk-java, libswt2.1-gtk2-java, libswt-gtk3-java, eclipse-rcp (<< 3.1.2-2)
 Conflicts: libswt3.1-gtk-java, libswt2.1-gtk2-java, libswt-gtk3-java, libswt-gtk-3.2-java
 Description: Fast and rich GUI toolkit for Java, gtk2 version

Modified: trunk/eclipse/debian/control.in
===================================================================
--- trunk/eclipse/debian/control.in	2006-10-16 12:01:15 UTC (rev 2617)
+++ trunk/eclipse/debian/control.in	2006-10-16 13:12:10 UTC (rev 2618)
@@ -160,6 +160,7 @@
 Architecture: any
 Depends: eclipse-jdt (= ${Source-Version}), eclipse-pde (= ${Source-Version}), eclipse-source (= ${Source-Version})
 Conflicts: eclipse-sdk (<= 3.1.1-5), eclipse-platform-common (<< 3.1.2-1)
+Recommends: eclipse-gcj
 Replaces: eclipse-sdk (<= 3.1.1-5), eclipse-platform-common (<< 3.1.2-1), eclipse-platform (<< 3.1.2-2)
 Description: Extensible Tool Platform and Java IDE
  The Eclipse Platform is an open and extensible platform for anything and yet

Modified: trunk/eclipse/debian/extra/eclipse.sh
===================================================================
--- trunk/eclipse/debian/extra/eclipse.sh	2006-10-16 12:01:15 UTC (rev 2617)
+++ trunk/eclipse/debian/extra/eclipse.sh	2006-10-16 13:12:10 UTC (rev 2618)
@@ -129,27 +129,20 @@
     :
 elif [ -e @MOZILLA_FIVE_HOME_DEFAULT@/libgtkembedmoz.so ]; then
     export MOZILLA_FIVE_HOME=@MOZILLA_FIVE_HOME_DEFAULT@
-elif [ -e /usr/lib/mozilla/libgtkembedmoz.so ]; then
-    export MOZILLA_FIVE_HOME=/usr/lib/mozilla
 elif [ -e /usr/lib/firefox/libgtkembedmoz.so ]; then
     export MOZILLA_FIVE_HOME=/usr/lib/firefox
+elif [ -e /usr/lib/xulrunner/libgtkembedmoz.so ]; then
+    export MOZILLA_FIVE_HOME=/usr/lib/firefox
 elif [ -e /usr/lib/mozilla-firefox/libgtkembedmoz.so ]; then
     export MOZILLA_FIVE_HOME=/usr/lib/mozilla-firefox
+elif [ -e /usr/lib/mozilla/libgtkembedmoz.so ]; then
+    export MOZILLA_FIVE_HOME=/usr/lib/mozilla
 fi
-# now forget everything ... everything besides mozilla doesn't work
-if false && [ "$MOZILLA_FIVE_HOME" != "/usr/lib/mozilla" ]; then
         $DIALOG \
-            --error \
-            --title="Could not launch Eclipse Platform" \
-            --text="Eclipse currently only works with the mozilla browser. Please make sure that the package mozilla-browser is installed and MOZILLA_FIVE_HOME is either unset or points to /usr/lib/mozilla"
-	exit 1
-fi
-if [ "$MOZILLA_FIVE_HOME" != "/usr/lib/mozilla" ]; then
-        $DIALOG \
-            --error \
-            --title="Could not launch Eclipse Platform" \
-            --text="Eclipse currently only works with the mozilla browser. Please make sure that the package mozilla-browser is installed and MOZILLA_FIVE_HOME is either unset or points to /usr/lib/mozilla. Ignoring this error for the upload to experimental"
-fi
+            --warning \
+            --title="Integrated browser support not working" \
+            --text="This Eclipse build doesn't have support for the integrated browser."
+	[ $? -eq 0 ] || exit 1
 
 # libraries from the mozilla choosen take precedence
 LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}