[pkg-java] r8325 - trunk/ant-contrib/debian/patches

[Daniel Leidert]

Author: dleidert-guest
Date: 2009-06-08 23:04:46 +0000 (Mon, 08 Jun 2009)
New Revision: 8325

Added:
   trunk/ant-contrib/debian/patches/ivy_2.dpatch
Modified:
   trunk/ant-contrib/debian/patches/00list
Log:
A patch to port it to Ivy 2. But there are still errors and we should maybe use
the version from upstreama subversion repository.



Modified: trunk/ant-contrib/debian/patches/00list
===================================================================
--- trunk/ant-contrib/debian/patches/00list	2009-06-08 22:12:11 UTC (rev 8324)
+++ trunk/ant-contrib/debian/patches/00list	2009-06-08 23:04:46 UTC (rev 8325)
@@ -1 +1,2 @@
 debianize_build_xml
+ivy_2

Added: trunk/ant-contrib/debian/patches/ivy_2.dpatch
===================================================================
--- trunk/ant-contrib/debian/patches/ivy_2.dpatch	                        (rev 0)
+++ trunk/ant-contrib/debian/patches/ivy_2.dpatch	2009-06-08 23:04:46 UTC (rev 8325)
@@ -0,0 +1,45 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ivy_2.dpatch by Daniel Leidert (dale) <daniel.leidert at wgdd.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad pkg-ant-contrib~/src/java/net/sf/antcontrib/net/URLImportTask.java pkg-ant-contrib/src/java/net/sf/antcontrib/net/URLImportTask.java
+--- pkg-ant-contrib~/src/java/net/sf/antcontrib/net/URLImportTask.java	2006-10-28 13:57:48.000000000 +0200
++++ pkg-ant-contrib/src/java/net/sf/antcontrib/net/URLImportTask.java	2009-06-09 00:38:52.000000000 +0200
+@@ -27,20 +27,20 @@
+ import org.apache.tools.ant.taskdefs.Expand;
+ import org.apache.tools.ant.taskdefs.ImportTask;
+ 
+-import fr.jayasoft.ivy.Artifact;
+-import fr.jayasoft.ivy.DefaultModuleDescriptor;
+-import fr.jayasoft.ivy.DependencyResolver;
+-import fr.jayasoft.ivy.Ivy;
+-import fr.jayasoft.ivy.MDArtifact;
+-import fr.jayasoft.ivy.ModuleDescriptor;
+-import fr.jayasoft.ivy.ModuleId;
+-import fr.jayasoft.ivy.ModuleRevisionId;
+-import fr.jayasoft.ivy.report.ArtifactDownloadReport;
+-import fr.jayasoft.ivy.report.DownloadStatus;
+-import fr.jayasoft.ivy.repository.Repository;
+-import fr.jayasoft.ivy.resolver.FileSystemResolver;
+-import fr.jayasoft.ivy.resolver.IvyRepResolver;
+-import fr.jayasoft.ivy.resolver.URLResolver;
++import org.apache.ivy.core.module.descriptor.Artifact;
++import org.apache.ivy.core.module.descriptor.DefaultModuleDescriptor;
++import org.apache.ivy.plugins.resolver.DependencyResolver;
++import org.apache.ivy.Ivy;
++import org.apache.ivy.core.module.descriptor.MDArtifact;
++import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
++import org.apache.ivy.core.module.id.ModuleId;
++import org.apache.ivy.core.module.id.ModuleRevisionId;
++import org.apache.ivy.core.report.ArtifactDownloadReport;
++import org.apache.ivy.core.report.DownloadStatus;
++import org.apache.ivy.plugins.repository.Repository;
++import org.apache.ivy.plugins.resolver.FileSystemResolver;
++import org.apache.ivy.plugins.resolver.IvyRepResolver;
++import org.apache.ivy.plugins.resolver.URLResolver;
+ 
+ /***
+  * Task to import a build file from a url.  The build file can be a build.xml,


Property changes on: trunk/ant-contrib/debian/patches/ivy_2.dpatch
___________________________________________________________________
Added: svn:executable
   + *