Author: twerner
Date: 2008-11-19 09:13:29 +0000 (Wed, 19 Nov 2008)
New Revision: 7389
Removed:
trunk/libjboss-buildmagic-java/debian/patches/no-common.diff
Modified:
trunk/libjboss-buildmagic-java/debian/control
trunk/libjboss-buildmagic-java/debian/patches/ant.diff
trunk/libjboss-buildmagic-java/debian/patches/bsf.diff
trunk/libjboss-buildmagic-java/debian/patches/httpurl.diff
trunk/libjboss-buildmagic-java/debian/patches/no-maven.diff
trunk/libjboss-buildmagic-java/debian/patches/series
Log:
* fix Build-Depends
* beautify the patches
Modified: trunk/libjboss-buildmagic-java/debian/control
===================================================================
--- trunk/libjboss-buildmagic-java/debian/control 2008-11-19 08:55:12 UTC
(rev 7388)
+++ trunk/libjboss-buildmagic-java/debian/control 2008-11-19 09:13:29 UTC
(rev 7389)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Java Maintainers <[EMAIL PROTECTED]>
Uploaders: Torsten Werner <[EMAIL PROTECTED]>
-Build-Depends: ant, default-jdk, debhelper (>= 5), cdbs, quilt,
+Build-Depends: ant-optional, default-jdk, debhelper (>= 5), cdbs, quilt,
libxerces2-java, junit4, libjboss-buildmagic-java, liblog4j1.2-java,
libgnu-regexp-java, libcommons-httpclient-java, libslide-webdavclient-java,
libdom4j-java, libbsf-java
Modified: trunk/libjboss-buildmagic-java/debian/patches/ant.diff
===================================================================
--- trunk/libjboss-buildmagic-java/debian/patches/ant.diff 2008-11-19
08:55:12 UTC (rev 7388)
+++ trunk/libjboss-buildmagic-java/debian/patches/ant.diff 2008-11-19
09:13:29 UTC (rev 7389)
@@ -1,3 +1,5 @@
+support ant version 1.7
+
Index: libjboss-buildmagic-java-2.0.1/tools/etc/buildmagic/buildmagic.ent
===================================================================
--- libjboss-buildmagic-java-2.0.1.orig/tools/etc/buildmagic/buildmagic.ent
2008-11-19 08:07:46.000000000 +0100
Modified: trunk/libjboss-buildmagic-java/debian/patches/bsf.diff
===================================================================
--- trunk/libjboss-buildmagic-java/debian/patches/bsf.diff 2008-11-19
08:55:12 UTC (rev 7388)
+++ trunk/libjboss-buildmagic-java/debian/patches/bsf.diff 2008-11-19
09:13:29 UTC (rev 7389)
@@ -1,3 +1,5 @@
+bsf is now an apache project
+
Index:
libjboss-buildmagic-java-2.0.1/tasks/src/main/org/jboss/tools/buildmagic/task/Script.java
===================================================================
---
libjboss-buildmagic-java-2.0.1.orig/tasks/src/main/org/jboss/tools/buildmagic/task/Script.java
2008-11-19 09:51:39.000000000 +0100
Modified: trunk/libjboss-buildmagic-java/debian/patches/httpurl.diff
===================================================================
--- trunk/libjboss-buildmagic-java/debian/patches/httpurl.diff 2008-11-19
08:55:12 UTC (rev 7388)
+++ trunk/libjboss-buildmagic-java/debian/patches/httpurl.diff 2008-11-19
09:13:29 UTC (rev 7389)
@@ -1,3 +1,5 @@
+support current versions of commons-httpclient
+
Index:
libjboss-buildmagic-java-2.0.1/common/src/main/org/jboss/net/protocol/http/DavURLLister.java
===================================================================
---
libjboss-buildmagic-java-2.0.1.orig/common/src/main/org/jboss/net/protocol/http/DavURLLister.java
2008-08-20 00:06:02.000000000 +0200
Deleted: trunk/libjboss-buildmagic-java/debian/patches/no-common.diff
===================================================================
--- trunk/libjboss-buildmagic-java/debian/patches/no-common.diff
2008-11-19 08:55:12 UTC (rev 7388)
+++ trunk/libjboss-buildmagic-java/debian/patches/no-common.diff
2008-11-19 09:13:29 UTC (rev 7389)
@@ -1,13 +0,0 @@
-Index: libjboss-buildmagic-java-2.0.1/tasks/build.xml
-===================================================================
---- libjboss-buildmagic-java-2.0.1.orig/tasks/build.xml 2008-11-19
08:14:21.000000000 +0100
-+++ libjboss-buildmagic-java-2.0.1/tasks/build.xml 2008-11-19
08:19:15.000000000 +0100
-@@ -75,8 +75,6 @@
- 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
Modified: trunk/libjboss-buildmagic-java/debian/patches/no-maven.diff
===================================================================
--- trunk/libjboss-buildmagic-java/debian/patches/no-maven.diff 2008-11-19
08:55:12 UTC (rev 7388)
+++ trunk/libjboss-buildmagic-java/debian/patches/no-maven.diff 2008-11-19
09:13:29 UTC (rev 7389)
@@ -1,7 +1,40 @@
+maven-ant-tasks is not packaged for Debian yet -> disabling maven stuff
+
+Index: libjboss-buildmagic-java-2.0.1/tasks/build.xml
+===================================================================
+--- libjboss-buildmagic-java-2.0.1.orig/tasks/build.xml 2008-08-27
23:01:35.000000000 +0200
++++ libjboss-buildmagic-java-2.0.1/tasks/build.xml 2008-11-19
10:09:22.000000000 +0100
+@@ -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}"
Index: libjboss-buildmagic-java-2.0.1/common/build.xml
===================================================================
---- libjboss-buildmagic-java-2.0.1.orig/common/build.xml 2008-11-19
09:46:27.000000000 +0100
-+++ libjboss-buildmagic-java-2.0.1/common/build.xml 2008-11-19
09:46:32.000000000 +0100
+--- libjboss-buildmagic-java-2.0.1.orig/common/build.xml 2008-09-19
16:02:41.000000000 +0200
++++ libjboss-buildmagic-java-2.0.1/common/build.xml 2008-11-19
10:09:22.000000000 +0100
@@ -34,10 +34,6 @@
&defaults;
&tools;
@@ -39,8 +72,8 @@
cacheDir="${project.thirdparty.cache}"
Index: libjboss-buildmagic-java-2.0.1/tools/etc/buildmagic/defaults.ent
===================================================================
---- libjboss-buildmagic-java-2.0.1.orig/tools/etc/buildmagic/defaults.ent
2008-11-19 09:46:27.000000000 +0100
-+++ libjboss-buildmagic-java-2.0.1/tools/etc/buildmagic/defaults.ent
2008-11-19 09:46:32.000000000 +0100
+--- libjboss-buildmagic-java-2.0.1.orig/tools/etc/buildmagic/defaults.ent
2008-09-19 16:02:41.000000000 +0200
++++ libjboss-buildmagic-java-2.0.1/tools/etc/buildmagic/defaults.ent
2008-11-19 10:09:22.000000000 +0100
@@ -104,7 +104,7 @@
<!-- The combined thirdparty classpath -->
@@ -50,39 +83,3 @@
<!--<path refid="dependentmodule.classpath"/>-->
</path>
-@@ -142,4 +142,4 @@
- <property name="junit.batchtest.todir" value="${build.reports}"/>
- <property name="junit.jvm.options" value="-Ddummy"/>
-
--</target>
-\ No newline at end of file
-+</target>
-Index: libjboss-buildmagic-java-2.0.1/tasks/build.xml
-===================================================================
---- libjboss-buildmagic-java-2.0.1.orig/tasks/build.xml 2008-11-19
09:47:45.000000000 +0100
-+++ libjboss-buildmagic-java-2.0.1/tasks/build.xml 2008-11-19
09:48:33.000000000 +0100
-@@ -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,14 +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" />
-- </artifact:dependencies>
-
- <!--<dependency-manager
- cacheDir="${project.thirdparty.cache}"
Modified: trunk/libjboss-buildmagic-java/debian/patches/series
===================================================================
--- trunk/libjboss-buildmagic-java/debian/patches/series 2008-11-19
08:55:12 UTC (rev 7388)
+++ trunk/libjboss-buildmagic-java/debian/patches/series 2008-11-19
09:13:29 UTC (rev 7389)
@@ -1,5 +1,4 @@
ant.diff
-no-common.diff
-no-maven.diff
httpurl.diff
bsf.diff
+no-maven.diff
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
