[pkg-java] r3134 - trunk/eclipse/debian/patches

[Vladimír Lapáček]

Author: vladimir-guest
Date: 2007-03-29 21:48:01 +0000 (Thu, 29 Mar 2007)
New Revision: 3134

Modified:
   trunk/eclipse/debian/patches/eclipse-disable-junit4-apt.dpatch
Log:
Updated eclipse-disable-junit4-apt patch to include ppc architecture.

Modified: trunk/eclipse/debian/patches/eclipse-disable-junit4-apt.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-disable-junit4-apt.dpatch	2007-03-29 20:50:31 UTC (rev 3133)
+++ trunk/eclipse/debian/patches/eclipse-disable-junit4-apt.dpatch	2007-03-29 21:48:01 UTC (rev 3134)
@@ -321,6 +321,81 @@
  			<param name="elementName" value="org.eclipse.team.cvs.core_3.2.2.M20061205"/>
  		</antcall>
  		<antcall target="jarUp">
+--- source-tree/assemble.org.eclipse.sdk.linux.gtk.ppc.xml.orig	2007-03-29 23:32:57.000000000 +0200
++++ source-tree/assemble.org.eclipse.sdk.linux.gtk.ppc.xml	2007-03-29 23:34:19.000000000 +0200
+@@ -43,9 +43,6 @@
+ 		<mkdir dir="${archiveParentFolder}"/>
+ 		<mkdir dir="${assemblyTempDir}"/>
+ 		<mkdir dir="${buildLabel}"/>
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
+-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.core.manipulation" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -112,9 +109,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.core.commands" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
+-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.update.core.linux" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -178,9 +172,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.core.jobs" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+-		<ant antfile="build.xml" dir="plugins/org.junit4" target="gather.bin.parts">
+-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.pde.ui" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -274,9 +265,6 @@
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.debug" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+-		<ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit4.runtime" target="gather.bin.parts">
+-			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+-		</ant>
+ 		<ant antfile="build.xml" dir="plugins/org.eclipse.core.runtime.compatibility.registry" target="gather.bin.parts">
+ 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ 		</ant>
+@@ -399,10 +387,6 @@
+ 		</ant>
+ 		<antcall target="jarUp">
+ 			<param name="source" value="${eclipse.plugins}"/>
+-			<param name="elementName" value="org.eclipse.jdt.apt.ui_3.2.1.R32x_v20060822-2100"/>
+-		</antcall>
+-		<antcall target="jarUp">
+-			<param name="source" value="${eclipse.plugins}"/>
+ 			<param name="elementName" value="org.eclipse.jdt.core.manipulation_1.0.1.r321_v20060721"/>
+ 		</antcall>
+ 		<antcall target="jarUp">
+@@ -471,10 +455,6 @@
+ 		</antcall>
+ 		<antcall target="jarUp">
+ 			<param name="source" value="${eclipse.plugins}"/>
+-			<param name="elementName" value="org.eclipse.jdt.apt.core_3.2.1.R32x_v20060822-2100"/>
+-		</antcall>
+-		<antcall target="jarUp">
+-			<param name="source" value="${eclipse.plugins}"/>
+ 			<param name="elementName" value="org.eclipse.update.core.linux_3.2.0.v20060605"/>
+ 		</antcall>
+ 		<antcall target="jarUp">
+@@ -647,10 +627,6 @@
+ 		</antcall>
+ 		<antcall target="jarUp">
+ 			<param name="source" value="${eclipse.plugins}"/>
+-			<param name="elementName" value="org.eclipse.jdt.junit4.runtime_1.0.1.r321_v20060905"/>
+-		</antcall>
+-		<antcall target="jarUp">
+-			<param name="source" value="${eclipse.plugins}"/>
+ 			<param name="elementName" value="org.eclipse.team.cvs.core_3.2.2.M20061205"/>
+ 		</antcall>
+ 		<antcall target="jarUp">
 --- source-tree/features/org.eclipse.jdt/feature.xml.orig	2007-03-08 11:22:57.000000000 -0500
 +++ source-tree/features/org.eclipse.jdt/feature.xml	2007-03-08 11:27:11.000000000 -0500
 @@ -38,20 +38,6 @@