r1880 - in trunk/eclipse/debian: . patches

[Michael Koch]

Author: mkoch
Date: 2006-02-08 11:37:43 +0000 (Wed, 08 Feb 2006)
New Revision: 1880

Modified:
   trunk/eclipse/debian/changelog
   trunk/eclipse/debian/patches/eclipse-libswt-firefox.dpatch
   trunk/eclipse/debian/patches/eclipse-libswt-mozilla.dpatch
   trunk/eclipse/debian/rules
Log:
Make libswt3.1-gtk-java only depend on mozilla-browser (Debian)
or firefox (Ubuntu). Link against libgtkembedmoz.so during build.


Modified: trunk/eclipse/debian/changelog
===================================================================
--- trunk/eclipse/debian/changelog	2006-02-08 11:31:37 UTC (rev 1879)
+++ trunk/eclipse/debian/changelog	2006-02-08 11:37:43 UTC (rev 1880)
@@ -26,7 +26,10 @@
   [ Michael Koch ]
   * debian/extra/eclipse.sh: Made the -vm option working. Fixed tests for
     xpcom.so. Exec the eclipse binary directly. Check for libgtkembedmoz.so.
-    Closes: #343667
+  * debian/patches/eclipse-libswt-firefox.dpatch, debian/rules,
+    debian/patches/eclipse-libswt-mozilla.dpatch: Make libswt3.1-gtk-java only
+    depend on mozilla-browser (Debian) or firefox (Ubuntu). Link against
+    libgtkembedmoz.so during build. Closes: #343667
   * 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
@@ -41,7 +44,7 @@
   [ Matthias Klose ]
   * Add support to build using firefox-dev (turned off by default).
 
- -- Michael Koch <konqueror at gmx.de>  Wed,  8 Feb 2006 12:34:03 +0000
+ -- Michael Koch <konqueror at gmx.de>  Wed,  8 Feb 2006 12:40:58 +0000
 
 eclipse (3.1.1-8) unstable; urgency=low
 

Modified: trunk/eclipse/debian/patches/eclipse-libswt-firefox.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-libswt-firefox.dpatch	2006-02-08 11:31:37 UTC (rev 1879)
+++ trunk/eclipse/debian/patches/eclipse-libswt-firefox.dpatch	2006-02-08 11:37:43 UTC (rev 1880)
@@ -28,8 +28,8 @@
  
  case $OS in
  	"Linux")
-+		GECKO_INCLUDES=`pkg-config --cflags firefox-xpcom`
-+		GECKO_LIBS=`pkg-config --libs firefox-xpcom`
++		GECKO_INCLUDES=`pkg-config --cflags firefox-gtkmozembed`
++		GECKO_LIBS=`pkg-config --libs firefox-gtkmozembed`
 +		# Set this to something to override the presets
 +		GECKO_SDK="_"
  		case $MODEL in

Modified: trunk/eclipse/debian/patches/eclipse-libswt-mozilla.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-libswt-mozilla.dpatch	2006-02-08 11:31:37 UTC (rev 1879)
+++ trunk/eclipse/debian/patches/eclipse-libswt-mozilla.dpatch	2006-02-08 11:37:43 UTC (rev 1880)
@@ -28,8 +28,8 @@
  
  case $OS in
  	"Linux")
-+		GECKO_INCLUDES=`pkg-config --cflags mozilla-xpcom`
-+		GECKO_LIBS=`pkg-config --libs mozilla-xpcom`
++		GECKO_INCLUDES=`pkg-config --cflags mozilla-gtkmozembed`
++		GECKO_LIBS=`pkg-config --libs mozilla-gtkmozembed`
 +		# Set this to something to override the presets
 +		GECKO_SDK="_"
  		case $MODEL in

Modified: trunk/eclipse/debian/rules
===================================================================
--- trunk/eclipse/debian/rules	2006-02-08 11:31:37 UTC (rev 1879)
+++ trunk/eclipse/debian/rules	2006-02-08 11:37:43 UTC (rev 1880)
@@ -153,7 +153,8 @@
 	eclipse-libswt-mozilla
 
   BUILD_DEPS += , mozilla-dev
-  MOZILLA_DEP = mozilla-browser (>= 2:1.7.0) | firefox (>= 1.4.99) | mozilla-firefox (>= 1.0.7)
+#  MOZILLA_DEP = mozilla-browser (>= 2:1.7.0) | firefox (>= 1.4.99) | mozilla-firefox (>= 1.0.7)
+  MOZILLA_DEP = mozilla-browser (>= 2:1.7.0)
 endif
 
 ifeq ($(with_browser),firefox)
@@ -161,7 +162,8 @@
 	eclipse-libswt-firefox
 
   BUILD_DEPS += , firefox-dev
-  MOZILLA_DEP = firefox (>= 1.4.99) | mozilla-browser (>= 2:1.7.0) | mozilla-firefox (>= 1.0.7)
+#  MOZILLA_DEP = firefox (>= 1.4.99) | mozilla-browser (>= 2:1.7.0) | mozilla-firefox (>= 1.0.7)
+  MOZILLA_DEP = firefox (>= 1.4.99)
 endif
 
 export PATCHLIST = $(eclipse_patches)