[pkg-java] r11630 - in trunk/libjboss-buildmagic-java/debian: . patches

[Torsten Werner]

Author: twerner
Date: 2010-02-18 20:19:30 +0000 (Thu, 18 Feb 2010)
New Revision: 11630

Added:
   trunk/libjboss-buildmagic-java/debian/patches/0002-disable-ant-version-check.patch
   trunk/libjboss-buildmagic-java/debian/patches/0003-disable-ivy-dependency-resolution.patch
Modified:
   trunk/libjboss-buildmagic-java/debian/changelog
   trunk/libjboss-buildmagic-java/debian/patches/series
Log:
Add 2 more patches that disable ivy retrieve and ant version checking.

Modified: trunk/libjboss-buildmagic-java/debian/changelog
===================================================================
--- trunk/libjboss-buildmagic-java/debian/changelog	2010-02-18 19:43:48 UTC (rev 11629)
+++ trunk/libjboss-buildmagic-java/debian/changelog	2010-02-18 20:19:30 UTC (rev 11630)
@@ -8,8 +8,9 @@
   * Remove build.log in clean target.
   * Update Standards-Version: 3.8.3.
   * Change Section: java.
+  * Add 2 more patches that disable ivy retrieve and ant version checking.
 
- -- Torsten Werner <twerner at debian.org>  Thu, 18 Feb 2010 20:42:27 +0100
+ -- Torsten Werner <twerner at debian.org>  Thu, 18 Feb 2010 21:18:07 +0100
 
 libjboss-buildmagic-java (2.0.1-2) unstable; urgency=low
 

Added: trunk/libjboss-buildmagic-java/debian/patches/0002-disable-ant-version-check.patch
===================================================================
--- trunk/libjboss-buildmagic-java/debian/patches/0002-disable-ant-version-check.patch	                        (rev 0)
+++ trunk/libjboss-buildmagic-java/debian/patches/0002-disable-ant-version-check.patch	2010-02-18 20:19:30 UTC (rev 11630)
@@ -0,0 +1,29 @@
+From: Torsten Werner <twerner at debian.org>
+Date: Thu, 18 Feb 2010 20:59:35 +0100
+Subject: [PATCH] disable ant version check
+
+---
+ tools/etc/buildmagic/buildmagic.ent |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/tools/etc/buildmagic/buildmagic.ent b/tools/etc/buildmagic/buildmagic.ent
+index 3bb9821..8677b7a 100644
+--- a/tools/etc/buildmagic/buildmagic.ent
++++ b/tools/etc/buildmagic/buildmagic.ent
+@@ -25,6 +25,7 @@
+     </or>
+   </condition>
+ 
++<!--
+   <fail unless="buildmagic.ant.compatible">
+ 
+   Unsupported Ant version:
+@@ -34,6 +35,7 @@
+   Please install a version which is compatible with Ant ${buildmagic.ant16.baseversion}, or ${buildmagic.ant17.baseversion}.
+ 
+   </fail>
++-->
+ 
+   <!-- JDK Detection -->
+   <available classname="java.lang.Void" property="HAVE_JDK_1.1"/>
+-- 

Added: trunk/libjboss-buildmagic-java/debian/patches/0003-disable-ivy-dependency-resolution.patch
===================================================================
--- trunk/libjboss-buildmagic-java/debian/patches/0003-disable-ivy-dependency-resolution.patch	                        (rev 0)
+++ trunk/libjboss-buildmagic-java/debian/patches/0003-disable-ivy-dependency-resolution.patch	2010-02-18 20:19:30 UTC (rev 11630)
@@ -0,0 +1,42 @@
+From: Torsten Werner <twerner at debian.org>
+Date: Thu, 18 Feb 2010 21:00:25 +0100
+Subject: [PATCH] disable ivy dependency resolution
+
+---
+ tasks/build.xml |    7 ++++---
+ 1 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/tasks/build.xml b/tasks/build.xml
+index f6964d9..5c73fed 100644
+--- a/tasks/build.xml
++++ b/tasks/build.xml
+@@ -124,8 +124,7 @@
+ 
+   <target name="compile"
+ 	  description="Compile all source files."
+-	  depends="resolve-compile-dependencies,
+-                   _default:compile-classes,
++	  depends="_default:compile-classes,
+                    _default:compile-etc,
+                    _default:compile-resources">
+     <!-- Add module specific elements here. -->
+@@ -186,7 +185,7 @@
+ 
+   <target name="output"
+ 	  description="Generate all target output."
+-	  depends="compile, test">
++	  depends="compile">
+ 
+     <mkdir dir="${build.lib}"/>
+ 
+@@ -205,7 +204,9 @@
+     <mkdir dir="${dist.root}/lib"/>
+     <copy file="${build.lib}/buildmagic-tasks.jar" tofile="${dist.root}/lib/buildmagic-tasks.jar"/>
+     
++<!--
+     <ivy:retrieve pattern="${dist.root}/lib/[artifact]-[revision].[ext]" conf="compile"/>
++-->
+     
+     <mkdir dir="${dist.root}/etc"/>
+     <copy todir="${dist.root}/etc">
+-- 

Modified: trunk/libjboss-buildmagic-java/debian/patches/series
===================================================================
--- trunk/libjboss-buildmagic-java/debian/patches/series	2010-02-18 19:43:48 UTC (rev 11629)
+++ trunk/libjboss-buildmagic-java/debian/patches/series	2010-02-18 20:19:30 UTC (rev 11630)
@@ -1 +1,3 @@
 0001-disabling-maven-because-of-missing-maven-ant-tasks.patch
+0002-disable-ant-version-check.patch
+0003-disable-ivy-dependency-resolution.patch