r2122 - trunk/eclipse/debian

[Michael Koch]

Author: mkoch
Date: 2006-05-17 12:49:58 +0000 (Wed, 17 May 2006)
New Revision: 2122

Modified:
   trunk/eclipse/debian/changelog
   trunk/eclipse/debian/rules
Log:
* debian/rules: Don't compile catalina.jar to native as this ICEe current
  gcj-4.1.


Modified: trunk/eclipse/debian/changelog
===================================================================
--- trunk/eclipse/debian/changelog	2006-05-17 06:12:35 UTC (rev 2121)
+++ trunk/eclipse/debian/changelog	2006-05-17 12:49:58 UTC (rev 2122)
@@ -17,6 +17,8 @@
   * debian/rules: Build the newest compiler. Closes: #356028
   * debian/control.in: libswt3.1-gtk-jni: Conflict with
     libswt-gnome-gtk-3.1-jni and libswt-mozilla-gtk-3.1-jni Closes: #361692
+  * debian/rules: Don't compile catalina.jar to native as this ICEe current
+    gcj-4.1.
 
   [ Matthias Klose ]
   * debian/control.in: eclipse replaces eclipse-platform (<< 3.1.2-2).
@@ -33,7 +35,7 @@
   * Merge from Ubuntu:
     - Build using gij-4.1/gcj-4.1.
 
- -- Michael Koch <konqueror at gmx.de>  Wed, 17 May 2006 06:10:24 +0000
+ -- Michael Koch <konqueror at gmx.de>  Wed, 17 May 2006 12:48:03 +0000
 
 eclipse (3.1.2-1) unstable; urgency=low
 

Modified: trunk/eclipse/debian/rules
===================================================================
--- trunk/eclipse/debian/rules	2006-05-17 06:12:35 UTC (rev 2121)
+++ trunk/eclipse/debian/rules	2006-05-17 12:49:58 UTC (rev 2122)
@@ -527,13 +527,13 @@
 ifeq ($(enable_native),yes)
 	mkdir -p $(DEBIAN_TMP)/$(GCJ_JARDIR) && \
 	cd $(DEBIAN_TMP)/$(ECLIPSE_HOME)/plugins && \
-	for jar in $$(find . -name '*.jar' | grep -v ant | sort); do \
+	for jar in $$(find . -name '*.jar' | grep -v ant | grep -v 'catalina.jar' | sort); do \
 		echo "$$jar" && \
 		mkdir -p $(DEBIAN_TMP)/$(GCJ_JARDIR)/$$(dirname $$jar) && \
 		$(AOT_COMPILE) $$jar $(DEBIAN_TMP)/$(GCJ_JARDIR)/$$jar.so || exit $$?; \
 	done
 	cd $(DEBIAN_TMP)/$(ECLIPSE_ARCH)/plugins && \
-	for jar in $$(find . -name '*swt.gtk.*.jar' | grep -v ant | sort); do \
+	for jar in $$(find . -name '*swt.gtk.*.jar' | grep -v ant | grep -v 'catalina.jar' | sort); do \
 		echo "$$jar" && \
 		mkdir -p $(DEBIAN_TMP)/$(GCJ_JARDIR)/$$(dirname $$jar) && \
 		$(AOT_COMPILE) $$jar $(DEBIAN_TMP)/$(GCJ_JARDIR)/$$jar.so || exit $$?; \