diff -urN eclipse-3.0.1/debian/changelog eclipse-3.0.1.new/debian/changelog
--- eclipse-3.0.1/debian/changelog	2005-07-03 13:56:04.736493320 +0200
+++ eclipse-3.0.1.new/debian/changelog	2005-07-03 13:54:15.499099928 +0200
@@ -1,3 +1,9 @@
+eclipse (3.0.1-0wasabi10) unstable; urgency=low
+
+  * Cleaned it up. Made it compile on SID again.
+
+ -- David Voit <david.voit@gmail.com>  Sat,  2 Jul 2005 23:50:31 +0000
+
 eclipse (3.0.1-0wasabi9) unstable; urgency=low
 
   * Increased the maximum heap size of the VM to 2GB.
diff -urN eclipse-3.0.1/debian/rules eclipse-3.0.1.new/debian/rules
--- eclipse-3.0.1/debian/rules	2005-07-03 13:56:04.748491496 +0200
+++ eclipse-3.0.1.new/debian/rules	2005-07-03 13:54:15.484102208 +0200
@@ -39,7 +39,7 @@
 # ECJ_CLASSPATH		classpath components required to use the ecj compiler
 # ECJ_COMPILER		Ant compilation adapter class
 # ECJ_ANT_RUN		command line for invoking Ant with ecj
-ECJ_CLASSPATH=$$(for jar in $(SOURCE_TREE)/ecj/*.jar; do echo -n "$$jar:"; done)
+ECJ_CLASSPATH=$$(for jar in $(SOURCE_TREE)/ecj/*.jar; do echo -n "$$jar:"; done):/usr/share/java/libgcj-4.0.jar
 ECJ_COMPILER=org.eclipse.jdt.core.JDTCompilerAdapter
 ECJ_ANT_RUN=LD_PRELOAD=$$(for so in $(BUILD_TREE)/ecj/*.jar.so; do echo -n "$$so:"; done) $(JAVA_RUN) -cp $(JAVA_CLASSPATH):$(ANT_CLASSPATH):$(ECJ_CLASSPATH) $(ANT_OPTS) -Dbuild.compiler=$(ECJ_COMPILER) $(ANT_CLASS)
 
@@ -355,7 +355,7 @@
 	cd $(BUILD_TREE)/native/swt-gtk && \
 	make \
 		XTEST_LIB_PATH=/usr/X11R6/lib \
-		SWT_PTR_CFLAGS="-I/usr/lib/gcc/i486-linux/4.0.0/include/" \
+		SWT_PTR_CFLAGS="-I`gcc-4.0 -print-libgcc-file-name | sed s/libgcc.a/include/`" \
 		-f make_gtk.mak all
 	
 	# We need to compile the native "platform-launcher". This is a small
@@ -372,12 +372,12 @@
 	
 	# This plug-in does not build its native resources on its own.
 	cd $(SOURCE_TREE)/plugins/org.eclipse.core.resources.linux/src && \
-	make JDK_INCLUDE="/usr/lib/gcc/i486-linux/4.0.0/include/"
+	make JDK_INCLUDE=`gcc-4.0 -print-libgcc-file-name | sed s/libgcc.a/include/`
 	
 	# This plug-in also does not build its native resources on its own. At
 	# least it has an Ant build script.
 	cd $(SOURCE_TREE)/plugins/org.eclipse.update.core.linux/src && \
-	$(ECJ_ANT_RUN) -Dheader-path=/usr/lib/gcc/i486-linux/4.0.0/include/ && \
+	$(ECJ_ANT_RUN) -Dheader-path=`gcc-4.0 -print-libgcc-file-name | sed s/libgcc.a/include/` && \
 	cp ../os/linux/$(ECLIPSE_ARCH)/*.so $(BUILD_TREE)/native
 	
 	# Create native libraries for the XML APIs. gcj in Debian does not yet