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

[mkoch at alioth.debian.org]

Author: mkoch
Date: 2008-01-07 08:05:13 +0000 (Mon, 07 Jan 2008)
New Revision: 5335

Modified:
   trunk/eclipse/debian/changelog
   trunk/eclipse/debian/patches/eclipse-build.dpatch
   trunk/eclipse/debian/rules
Log:
* dont compile junit-4*.jar to native


Modified: trunk/eclipse/debian/changelog
===================================================================
--- trunk/eclipse/debian/changelog	2008-01-07 08:03:35 UTC (rev 5334)
+++ trunk/eclipse/debian/changelog	2008-01-07 08:05:13 UTC (rev 5335)
@@ -4,6 +4,9 @@
   * Added ant-nodeps.jar to ant classpath. Needed for replaceregexp tag.
   * Simplified debian/rules by removing all JVM_* variables.
   * Updated watch file to match upstream correctly. Closes: #449647.
+  * Added Homepage, Vcs-Svn and Vcs-Browser fields.
+  * Updated Standards-Version to 3.7.3.
+  * debian/eclipse-rcp.dirs. Removed, unneeded.
 
  -- Michael Koch <konqueror at gmx.de>  Sun, 30 Dec 2007 17:53:29 +0100
 

Modified: trunk/eclipse/debian/patches/eclipse-build.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-build.dpatch	2008-01-07 08:03:35 UTC (rev 5334)
+++ trunk/eclipse/debian/patches/eclipse-build.dpatch	2008-01-07 08:05:13 UTC (rev 5335)
@@ -57,3 +57,14 @@
  
  		<!--set the compiler and compiler arguments-->
  		<!--the default compiler is set to the one used by eclipse rel. eng. -->
+--- source-tree/plugins/org.eclipse.platform.doc.isv/build.xml.orig	2007-10-26 11:22:24.000000000 +0200
++++ source-tree/plugins/org.eclipse.platform.doc.isv/build.xml	2007-10-26 11:23:25.000000000 +0200
+@@ -197,7 +197,7 @@
+ 		</subant>
+ 		<available property="activeHelpSample.jar" file="${build.result.folder}/activeHelpSample.jar"/>
+ 		<antcall target="activeHelpSample.jar"/>
+-		<subant antfile="${customBuildCallbacks}" target="post.build.jars" failonerror="false" buildpath=".">
++		<subant antfile="${customBuildCallbacks}" target="post.build.jars" failonerror="false" buildpath="." verbose="true">
+ 			<property name="build.result.folder" value="${build.result.folder}"/>
+ 		</subant>
+ 	</target>

Modified: trunk/eclipse/debian/rules
===================================================================
--- trunk/eclipse/debian/rules	2008-01-07 08:03:35 UTC (rev 5334)
+++ trunk/eclipse/debian/rules	2008-01-07 08:05:13 UTC (rev 5335)
@@ -579,6 +579,7 @@
 	    *org.eclipse.ui.workbench) continue;; \
 	    *org.eclipse.ui.forms) continue;; \
 	    *lucene*) continue;; \
+	    *junit-4*) continue;; \
 	  esac; \
 	  if [ $(DEB_HOST_ARCH) = ia64 ]; then \
 	    case "$$jar" in \