[pkg-java] r4039 - in trunk/eclipse/debian: . patches

[mkoch at alioth.debian.org]

Author: mkoch
Date: 2007-08-21 20:42:54 +0000 (Tue, 21 Aug 2007)
New Revision: 4039

Modified:
   trunk/eclipse/debian/changelog
   trunk/eclipse/debian/patches/eclipse-java-home.dpatch
   trunk/eclipse/debian/rules
Log:
[ Fl?\195?\161vio Martins ]
* Resurrected and tweaked eclipse-java-home.dpatch to fix FTBFS.


Modified: trunk/eclipse/debian/changelog
===================================================================
--- trunk/eclipse/debian/changelog	2007-08-19 23:26:57 UTC (rev 4038)
+++ trunk/eclipse/debian/changelog	2007-08-21 20:42:54 UTC (rev 4039)
@@ -1,10 +1,14 @@
 eclipse (3.2.2-3) UNRELEASED; urgency=low
 
+  [ Michael Koch ]
   * debian/control.in: eclipse-platform: Removed zenity alternatives from
     Depends. Closes: #419668.
 
- -- Michael Koch <konqueror at gmx.de>  Wed, 25 Jul 2007 20:08:36 +0200
+  [ Flávio Martins ]
+  * Resurrected and tweaked eclipse-java-home.dpatch to fix FTBFS.
 
+ -- Michael Koch <konqueror at gmx.de>  Tue, 21 Aug 2007 09:55:20 +0200
+
 eclipse (3.2.2-2) unstable; urgency=low
 
   * debian/extra/java_home: Use /usr/lib/jvm/java-6-sun instead of

Modified: trunk/eclipse/debian/patches/eclipse-java-home.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-java-home.dpatch	2007-08-19 23:26:57 UTC (rev 4038)
+++ trunk/eclipse/debian/patches/eclipse-java-home.dpatch	2007-08-21 20:42:54 UTC (rev 4039)
@@ -21,8 +21,8 @@
 exit 0
 
 @DPATCH@
---- source-tree/plugins/org.eclipse.core.resources.linux/src/Makefile~	2006-01-18 22:12:26.000000000 +0100
-+++ source-tree/plugins/org.eclipse.core.resources.linux/src/Makefile	2006-02-19 04:59:55.766546664 +0100
+--- source-tree/plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile~	2006-01-18 22:12:26.000000000 +0100
++++ source-tree/plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile	2006-02-19 04:59:55.766546664 +0100
 @@ -17,7 +17,7 @@
  OS_TYPE = linux
  
@@ -31,4 +31,4 @@
 +JAVA_HOME ?= /usr/lib/jvm/java-gcj
  
  JDK_INCLUDE = -I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS_TYPE}
- 
+ COMMON_INCLUDE = -I include

Modified: trunk/eclipse/debian/rules
===================================================================
--- trunk/eclipse/debian/rules	2007-08-19 23:26:57 UTC (rev 4038)
+++ trunk/eclipse/debian/rules	2007-08-21 20:42:54 UTC (rev 4039)
@@ -144,6 +144,7 @@
 	eclipse-disable-motif \
 	eclipse-ecj-gcj \
 	eclipse-add-ppc64-sparc64-s390-s390x \
+	eclipse-java-home \
 
 #	eclipse-icon \
 #	eclipse-efj \