Author: twerner Date: 2009-10-25 20:45:34 +0000 (Sun, 25 Oct 2009) New Revision: 10903
Added: trunk/libjboss-buildmagic-java/debian/patches/0001-disabling-maven-because-of-missing-maven-ant-tasks.patch Removed: trunk/libjboss-buildmagic-java/debian/patches/0001-support-ant-version-1.7.patch trunk/libjboss-buildmagic-java/debian/patches/0002-support-current-commons-httpclient.patch trunk/libjboss-buildmagic-java/debian/patches/0003-bsf-is-an-apache-project-now.patch trunk/libjboss-buildmagic-java/debian/patches/0004-disabling-maven-because-of-missing-maven-ant-tasks.patch Modified: trunk/libjboss-buildmagic-java/debian/changelog trunk/libjboss-buildmagic-java/debian/patches/series Log: Update patches to new upstream version. Modified: trunk/libjboss-buildmagic-java/debian/changelog =================================================================== --- trunk/libjboss-buildmagic-java/debian/changelog 2009-10-25 20:30:08 UTC (rev 10902) +++ trunk/libjboss-buildmagic-java/debian/changelog 2009-10-25 20:45:34 UTC (rev 10903) @@ -1,11 +1,11 @@ -libjboss-buildmagic-java (2.1.1-1) unstable; urgency=low +libjboss-buildmagic-java (2.1.1-1) UNRELEASED; urgency=low - UNRELEASED * new upstream release * Fix debian/watch and debian/orig-tar.sh. * Convert patches to dep3 format. + * Update patches to new upstream version. - -- Torsten Werner <[email protected]> Sun, 25 Oct 2009 21:11:59 +0100 + -- Torsten Werner <[email protected]> Sun, 25 Oct 2009 21:30:52 +0100 libjboss-buildmagic-java (2.0.1-2) unstable; urgency=low Copied: trunk/libjboss-buildmagic-java/debian/patches/0001-disabling-maven-because-of-missing-maven-ant-tasks.patch (from rev 10902, trunk/libjboss-buildmagic-java/debian/patches/0004-disabling-maven-because-of-missing-maven-ant-tasks.patch) =================================================================== --- trunk/libjboss-buildmagic-java/debian/patches/0001-disabling-maven-because-of-missing-maven-ant-tasks.patch (rev 0) +++ trunk/libjboss-buildmagic-java/debian/patches/0001-disabling-maven-because-of-missing-maven-ant-tasks.patch 2009-10-25 20:45:34 UTC (rev 10903) @@ -0,0 +1,22 @@ +From: Torsten Werner <[email protected]> +Date: Sun, 25 Oct 2009 21:06:33 +0100 +Subject: [PATCH] disabling maven because of missing maven-ant-tasks + +--- + tools/etc/buildmagic/defaults.ent | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/tools/etc/buildmagic/defaults.ent b/tools/etc/buildmagic/defaults.ent +index 4b4e410..75fe81b 100644 +--- a/tools/etc/buildmagic/defaults.ent ++++ b/tools/etc/buildmagic/defaults.ent +@@ -104,7 +104,7 @@ + + <!-- The combined thirdparty classpath --> + <path id="thirdparty.classpath"> +- <path refid="library.classpath"/> ++ <!--<path refid="library.classpath"/>--> + <!--<path refid="dependentmodule.classpath"/>--> + </path> + +-- Deleted: trunk/libjboss-buildmagic-java/debian/patches/0001-support-ant-version-1.7.patch =================================================================== --- trunk/libjboss-buildmagic-java/debian/patches/0001-support-ant-version-1.7.patch 2009-10-25 20:30:08 UTC (rev 10902) +++ trunk/libjboss-buildmagic-java/debian/patches/0001-support-ant-version-1.7.patch 2009-10-25 20:45:34 UTC (rev 10903) @@ -1,30 +0,0 @@ -From: Torsten Werner <[email protected]> -Date: Sun, 25 Oct 2009 21:06:26 +0100 -Subject: [PATCH] support ant version 1.7 - ---- - tools/etc/buildmagic/buildmagic.ent | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/tools/etc/buildmagic/buildmagic.ent b/tools/etc/buildmagic/buildmagic.ent -index 0863bd4..771aa36 100644 ---- a/tools/etc/buildmagic/buildmagic.ent -+++ b/tools/etc/buildmagic/buildmagic.ent -@@ -10,6 +10,7 @@ - <!-- Make sure we have the right version of Ant --> - <property name="buildmagic.ant15.baseversion" value="1.5"/> - <property name="buildmagic.ant16.baseversion" value="1.6"/> -+ <property name="buildmagic.ant17.baseversion" value="1.7"/> - - <!-- - | Add new conditions for other supported Ant versions when they -@@ -22,6 +23,8 @@ - substring="Ant version ${buildmagic.ant15.baseversion}"/> - <contains string="${ant.version}" - substring="Ant version ${buildmagic.ant16.baseversion}"/> -+ <contains string="${ant.version}" -+ substring="Ant version ${buildmagic.ant17.baseversion}"/> - </or> - </condition> - --- Deleted: trunk/libjboss-buildmagic-java/debian/patches/0002-support-current-commons-httpclient.patch =================================================================== --- trunk/libjboss-buildmagic-java/debian/patches/0002-support-current-commons-httpclient.patch 2009-10-25 20:30:08 UTC (rev 10902) +++ trunk/libjboss-buildmagic-java/debian/patches/0002-support-current-commons-httpclient.patch 2009-10-25 20:45:34 UTC (rev 10903) @@ -1,31 +0,0 @@ -From: Torsten Werner <[email protected]> -Date: Sun, 25 Oct 2009 21:06:28 +0100 -Subject: [PATCH] support current commons-httpclient - ---- - .../org/jboss/net/protocol/http/DavURLLister.java | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/common/src/main/org/jboss/net/protocol/http/DavURLLister.java b/common/src/main/org/jboss/net/protocol/http/DavURLLister.java -index 34336dd..7b0f85f 100644 ---- a/common/src/main/org/jboss/net/protocol/http/DavURLLister.java -+++ b/common/src/main/org/jboss/net/protocol/http/DavURLLister.java -@@ -18,7 +18,7 @@ import java.util.Collection; - import java.util.List; - - import org.apache.commons.httpclient.HttpException; --import org.apache.util.HttpURL; -+import org.apache.commons.httpclient.HttpURL; - import org.apache.webdav.lib.WebdavResource; - import org.jboss.net.protocol.URLListerBase; - -@@ -33,7 +33,7 @@ public class DavURLLister extends URLListerBase { - WebdavResource member = resources[i]; - HttpURL httpURL = member.getHttpURL(); - if (filter.accept(baseUrl, httpURL.getName())) { -- String url = httpURL.getUnescapedHttpURL(); -+ String url = httpURL.getURI(); - if (member.isCollection() && url.endsWith("/") == false) { - url += "/"; - } --- Deleted: trunk/libjboss-buildmagic-java/debian/patches/0003-bsf-is-an-apache-project-now.patch =================================================================== --- trunk/libjboss-buildmagic-java/debian/patches/0003-bsf-is-an-apache-project-now.patch 2009-10-25 20:30:08 UTC (rev 10902) +++ trunk/libjboss-buildmagic-java/debian/patches/0003-bsf-is-an-apache-project-now.patch 2009-10-25 20:45:34 UTC (rev 10903) @@ -1,36 +0,0 @@ -From: Torsten Werner <[email protected]> -Date: Sun, 25 Oct 2009 21:06:30 +0100 -Subject: [PATCH] bsf is an apache project now - ---- - .../org/jboss/tools/buildmagic/task/Script.java | 2 +- - .../jboss/tools/buildmagic/task/ScriptedTask.java | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tasks/src/main/org/jboss/tools/buildmagic/task/Script.java b/tasks/src/main/org/jboss/tools/buildmagic/task/Script.java -index 3204881..75c40e1 100644 ---- a/tasks/src/main/org/jboss/tools/buildmagic/task/Script.java -+++ b/tasks/src/main/org/jboss/tools/buildmagic/task/Script.java -@@ -14,7 +14,7 @@ import java.util.*; - - import org.apache.tools.ant.*; - --import com.ibm.bsf.*; -+import org.apache.bsf.*; - - /** - * Execute a script. -diff --git a/tasks/src/main/org/jboss/tools/buildmagic/task/ScriptedTask.java b/tasks/src/main/org/jboss/tools/buildmagic/task/ScriptedTask.java -index 90c28da..8001cdb 100644 ---- a/tasks/src/main/org/jboss/tools/buildmagic/task/ScriptedTask.java -+++ b/tasks/src/main/org/jboss/tools/buildmagic/task/ScriptedTask.java -@@ -13,7 +13,7 @@ import java.util.*; - - import org.apache.tools.ant.*; - --import com.ibm.bsf.*; -+import org.apache.bsf.*; - - import org.jboss.tools.buildmagic.task.*; - import org.jboss.tools.buildmagic.task.util.TaskLogger; --- Deleted: trunk/libjboss-buildmagic-java/debian/patches/0004-disabling-maven-because-of-missing-maven-ant-tasks.patch =================================================================== --- trunk/libjboss-buildmagic-java/debian/patches/0004-disabling-maven-because-of-missing-maven-ant-tasks.patch 2009-10-25 20:30:08 UTC (rev 10902) +++ trunk/libjboss-buildmagic-java/debian/patches/0004-disabling-maven-because-of-missing-maven-ant-tasks.patch 2009-10-25 20:45:34 UTC (rev 10903) @@ -1,94 +0,0 @@ -From: Torsten Werner <[email protected]> -Date: Sun, 25 Oct 2009 21:06:33 +0100 -Subject: [PATCH] disabling maven because of missing maven-ant-tasks - ---- - common/build.xml | 21 --------------------- - tasks/build.xml | 13 ------------- - tools/etc/buildmagic/defaults.ent | 2 +- - 3 files changed, 1 insertions(+), 35 deletions(-) - -diff --git a/common/build.xml b/common/build.xml -index 15f1bdb..cc3ed6b 100644 ---- a/common/build.xml -+++ b/common/build.xml -@@ -34,10 +34,6 @@ - &defaults; - &tools; - -- <path id="maven-ant-tasks.classpath" path="../tools/lib/maven-ant-tasks-2.0.9.jar" /> -- <typedef resource="org/apache/maven/artifact/ant/antlib.xml" -- uri="urn:maven-artifact-ant" -- classpathref="maven-ant-tasks.classpath" /> - - - <!--+====================================================================+--> -@@ -65,23 +61,6 @@ - <property name="module.name" value="common"/> - <property name="module.Name" value="JBoss/Common"/> - -- <!-- Configure thirdparty libraries using maven--> -- <artifact:dependencies pathId="library.classpath"> -- <dependency groupId="log4j" artifactId="log4j" -- version="1.2.4"/> -- <dependency groupId="slide" artifactId="webdavlib" -- version="1.0.16" /> -- <dependency groupId="commons-httpclient" artifactId="commons-httpclient" -- version="1.0" /> -- <dependency groupId="junit" artifactId="junit" -- version="3.7" /> -- <dependency groupId="gnu-regexp" artifactId="gnu-regexp" -- version="1.1.4" /> -- <!--<dependency groupId="com.sun.jmx" artifactId="jmxri" -- version="1.2" /> --> -- <dependency groupId="dom4j" artifactId="dom4j" -- version="1.3" /> -- </artifact:dependencies> - - <!--<dependency-manager - cacheDir="${project.thirdparty.cache}" -diff --git a/tasks/build.xml b/tasks/build.xml -index 2553c37..43222b5 100644 ---- a/tasks/build.xml -+++ b/tasks/build.xml -@@ -35,9 +35,6 @@ - &tools; - - <path id="maven-ant-tasks.classpath" path="../tools/lib/maven-ant-tasks-2.0.9.jar" /> -- <typedef resource="org/apache/maven/artifact/ant/antlib.xml" -- uri="urn:maven-artifact-ant" -- classpathref="maven-ant-tasks.classpath" /> - - <!--+====================================================================+--> - <!--| Initialization |--> -@@ -68,16 +65,6 @@ - <!--| Library & Module Dependencies. |--> - <!--+================================+--> - -- <!-- Configure thirdparty libraries using maven --> -- -- <artifact:dependencies pathId="library.classpath"> -- <dependency groupId="log4j" artifactId="log4j" -- version="1.2.4"/> -- <dependency groupId="bsf" artifactId="bsf" -- version="2.2" /> -- <dependency groupId="jboss" artifactId="jboss-common" -- version="1.0.3.GA" /> -- </artifact:dependencies> - - <!--<dependency-manager - cacheDir="${project.thirdparty.cache}" -diff --git a/tools/etc/buildmagic/defaults.ent b/tools/etc/buildmagic/defaults.ent -index 8e08ae6..daa49e7 100644 ---- a/tools/etc/buildmagic/defaults.ent -+++ b/tools/etc/buildmagic/defaults.ent -@@ -104,7 +104,7 @@ - - <!-- The combined thirdparty classpath --> - <path id="thirdparty.classpath"> -- <path refid="library.classpath"/> -+ <!--<path refid="library.classpath"/>--> - <!--<path refid="dependentmodule.classpath"/>--> - </path> - --- Modified: trunk/libjboss-buildmagic-java/debian/patches/series =================================================================== --- trunk/libjboss-buildmagic-java/debian/patches/series 2009-10-25 20:30:08 UTC (rev 10902) +++ trunk/libjboss-buildmagic-java/debian/patches/series 2009-10-25 20:45:34 UTC (rev 10903) @@ -1,4 +1 @@ -0001-support-ant-version-1.7.patch -0002-support-current-commons-httpclient.patch -0003-bsf-is-an-apache-project-now.patch -0004-disabling-maven-because-of-missing-maven-ant-tasks.patch +0001-disabling-maven-because-of-missing-maven-ant-tasks.patch _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
