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

[mkoch at alioth.debian.org]

Author: mkoch
Date: 2007-10-07 09:15:35 +0000 (Sun, 07 Oct 2007)
New Revision: 4316

Modified:
   trunk/eclipse/debian/changelog
   trunk/eclipse/debian/patches/eclipse-ant-manifest.dpatch
   trunk/eclipse/debian/rules
Log:
* debian/patches/eclipse-ant-manifest.dpatch: Don't remove ant-launcher.jar
  from ant plugin classpath. Needed for Ant 1.7.
* debian/rules: Honor 'parallel=X' setting in DEB_BUILD_OPTIONS.


Modified: trunk/eclipse/debian/changelog
===================================================================
--- trunk/eclipse/debian/changelog	2007-10-06 20:19:24 UTC (rev 4315)
+++ trunk/eclipse/debian/changelog	2007-10-07 09:15:35 UTC (rev 4316)
@@ -6,13 +6,16 @@
   * Updated Depends on jsch.
   * Remove *lucene*.jar from native compilation.
   * Introduce build option 'nonative' to disable native compilation easily.
+  * debian/patches/eclipse-ant-manifest.dpatch: Don't remove ant-launcher.jar
+    from ant plugin classpath. Needed for Ant 1.7.
+  * debian/rules: Honor 'parallel=X' setting in DEB_BUILD_OPTIONS.
 
   [ Flávio Martins ]
   * Make eclipse-gcj depend on ecj-gcj instead of ecj-bootstrap-gcj.
   * Added support for lpia architecture
   * Fix powerpc FTBFS issue for real now. Closes: #432648
 
- -- Michael Koch <konqueror at gmx.de>  Mon, 24 Sep 2007 07:43:22 +0200
+ -- Michael Koch <konqueror at gmx.de>  Sun, 07 Oct 2007 11:15:44 +0200
 
 eclipse (3.2.2-3) unstable; urgency=low
 

Modified: trunk/eclipse/debian/patches/eclipse-ant-manifest.dpatch
===================================================================
--- trunk/eclipse/debian/patches/eclipse-ant-manifest.dpatch	2007-10-06 20:19:24 UTC (rev 4315)
+++ trunk/eclipse/debian/patches/eclipse-ant-manifest.dpatch	2007-10-07 09:15:35 UTC (rev 4316)
@@ -23,7 +23,7 @@
 @DPATCH@
 --- source-tree/plugins/org.apache.ant/META-INF/MANIFEST.MF.orig	2005-10-29 18:14:17.000000000 +0200
 +++ source-tree/plugins/org.apache.ant/META-INF/MANIFEST.MF	2005-10-29 18:18:39.000000000 +0200
-@@ -13,24 +13,14 @@
+@@ -13,24 +13,15 @@
   lib/ant-apache-resolver.jar,
   lib/ant-commons-logging.jar,
   lib/ant-commons-net.jar,
@@ -34,7 +34,7 @@
   lib/ant-jmf.jar,
   lib/ant-jsch.jar,
   lib/ant-junit.jar,
-- lib/ant-launcher.jar,
+  lib/ant-launcher.jar,
 - lib/ant-netrexx.jar,
   lib/ant-nodeps.jar,
 - lib/ant-starteam.jar,

Modified: trunk/eclipse/debian/rules
===================================================================
--- trunk/eclipse/debian/rules	2007-10-06 20:19:24 UTC (rev 4315)
+++ trunk/eclipse/debian/rules	2007-10-07 09:15:35 UTC (rev 4316)
@@ -44,7 +44,11 @@
 endif
 
 ifeq ($(enable_native),yes)
+  ifneq (,$(findstring parallel,$(DEB_BUILD_OPTIONS)))
+    AVAIL_CPUS := $(shell echo $(DEB_BUILD_OPTIONS) | sed -e 's/^.*parallel=\([1-9]*\).*/\1/' )
+  else
     AVAIL_CPUS := $(shell n=$$(getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1); awk -v n=$$n '/^MemTotal:/ { n2=int($$2/196608); if (n2<n) n=n2; print n}' /proc/meminfo)
+  endif
   ifneq ($(AVAIL_CPUS),1)
 	AOT_MAKEFLAGS = -j$(AVAIL_CPUS)
 	export AOT_MAKEFLAGS