[pkg-java] r13690 - in trunk/ant-contrib/debian: . patches source
James Page
jamespage-guest at alioth.debian.org
Mon May 16 11:33:13 UTC 2011
Author: jamespage-guest
Date: 2011-05-16 11:33:10 +0000 (Mon, 16 May 2011)
New Revision: 13690
Added:
trunk/ant-contrib/debian/patches/02_592182_fortask.diff
trunk/ant-contrib/debian/patches/debianize_build_xml.diff
trunk/ant-contrib/debian/patches/series
trunk/ant-contrib/debian/source/
trunk/ant-contrib/debian/source/format
Removed:
trunk/ant-contrib/debian/README.source
trunk/ant-contrib/debian/TODO
trunk/ant-contrib/debian/patches/00list
trunk/ant-contrib/debian/patches/02_592182_fortask.dpatch
trunk/ant-contrib/debian/patches/debianize_build_xml.dpatch
Modified:
trunk/ant-contrib/debian/changelog
trunk/ant-contrib/debian/control
trunk/ant-contrib/debian/rules
Log:
* Removed Build-Depends-Indep on maven2: not required.
* Enabled test suite.
* Moved to source/format: 3.0 (quilt)
- removed dependency on dpatch.
- migrated patches from dpatch to quilt, updated headers.
- removed README.source - no longer required.
* Removed TODO - no longer relevant.
* Bumped Standards-Version to 3.9.2, no changes.
Deleted: trunk/ant-contrib/debian/README.source
===================================================================
--- trunk/ant-contrib/debian/README.source 2011-05-14 21:35:30 UTC (rev 13689)
+++ trunk/ant-contrib/debian/README.source 2011-05-16 11:33:10 UTC (rev 13690)
@@ -1,6 +0,0 @@
-This package uses dpatch to manage all modifications to the upstream
-source. Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-See /usr/share/doc/dpatch/README.source.gz for a detailed explanation.
-
Deleted: trunk/ant-contrib/debian/TODO
===================================================================
--- trunk/ant-contrib/debian/TODO 2011-05-14 21:35:30 UTC (rev 13689)
+++ trunk/ant-contrib/debian/TODO 2011-05-16 11:33:10 UTC (rev 13690)
@@ -1,2 +0,0 @@
-The package needs to be repacked by removing lib/. The +dfsg suffix then
-needs to be stripped in debian/rules.
Modified: trunk/ant-contrib/debian/changelog
===================================================================
--- trunk/ant-contrib/debian/changelog 2011-05-14 21:35:30 UTC (rev 13689)
+++ trunk/ant-contrib/debian/changelog 2011-05-16 11:33:10 UTC (rev 13690)
@@ -1,3 +1,16 @@
+ant-contrib (1.0~b3+svn177-3) unstable; urgency=low
+
+ * Removed Build-Depends-Indep on maven2: not required.
+ * Enabled test suite.
+ * Moved to source/format: 3.0 (quilt)
+ - removed dependency on dpatch.
+ - migrated patches from dpatch to quilt, updated headers.
+ - removed README.source - no longer required.
+ * Removed TODO - no longer relevant.
+ * Bumped Standards-Version to 3.9.2, no changes.
+
+ -- James Page <james.page at canonical.com> Mon, 16 May 2011 09:37:06 +0100
+
ant-contrib (1.0~b3+svn177-2) unstable; urgency=low
* Team upload
Modified: trunk/ant-contrib/debian/control
===================================================================
--- trunk/ant-contrib/debian/control 2011-05-14 21:35:30 UTC (rev 13689)
+++ trunk/ant-contrib/debian/control 2011-05-16 11:33:10 UTC (rev 13690)
@@ -2,12 +2,13 @@
Section: java
Priority: extra
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Daniel Leidert (dale) <daniel.leidert at wgdd.de>, Michael Koch <konqueror at gmx.de>
-Build-Depends: cdbs, debhelper (>= 7), dpatch, ant, default-jdk
-Build-Depends-Indep: ivy (>= 2), junit, libbcel-java,
+Uploaders: Daniel Leidert (dale) <daniel.leidert at wgdd.de>, Michael Koch <konqueror at gmx.de>,
+ James Page <james.page at canonical.com>
+Build-Depends: cdbs, debhelper (>= 7), ant, default-jdk
+Build-Depends-Indep: ant-optional, ivy (>= 2), junit, libbcel-java,
libcommons-cli-java, libcommons-codec-java, libcommons-httpclient-java,
- libcommons-logging-java, liboro-java, libxerces2-java, maven2
-Standards-Version: 3.8.3
+ libcommons-logging-java, liboro-java, libxerces2-java
+Standards-Version: 3.9.2
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/ant-contrib
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/ant-contrib
Homepage: http://ant-contrib.sourceforge.net
Deleted: trunk/ant-contrib/debian/patches/00list
===================================================================
--- trunk/ant-contrib/debian/patches/00list 2011-05-14 21:35:30 UTC (rev 13689)
+++ trunk/ant-contrib/debian/patches/00list 2011-05-16 11:33:10 UTC (rev 13690)
@@ -1,3 +0,0 @@
-debianize_build_xml
-#ivy_2
-02_592182_fortask
Added: trunk/ant-contrib/debian/patches/02_592182_fortask.diff
===================================================================
--- trunk/ant-contrib/debian/patches/02_592182_fortask.diff (rev 0)
+++ trunk/ant-contrib/debian/patches/02_592182_fortask.diff 2011-05-16 11:33:10 UTC (rev 13690)
@@ -0,0 +1,14 @@
+Description: Ensure 'for' task is specified correctly.
+Author: Michael Gilbert <michael.s.gilbert (at) gmail.com>
+Forwarded: not-needed
+
+--- ant-contrib-1.0~b3+svn177~/src/main/resources/net/sf/antcontrib/antcontrib.properties 2009-09-25 13:23:13.000000000 -0700
++++ ant-contrib-1.0~b3+svn177/src/main/resources/net/sf/antcontrib/antcontrib.properties 2010-08-08 09:21:30.000000000 -0700
+@@ -14,6 +14,7 @@
+
+ # Logic tasks
+ if=net.sf.antcontrib.logic.IfTask
++for=net.sf.antcontrib.logic.ForTask
+ foreach=net.sf.antcontrib.logic.ForEach
+ throw=net.sf.antcontrib.logic.Throw
+ trycatch=net.sf.antcontrib.logic.TryCatchTask
Deleted: trunk/ant-contrib/debian/patches/02_592182_fortask.dpatch
===================================================================
--- trunk/ant-contrib/debian/patches/02_592182_fortask.dpatch 2011-05-14 21:35:30 UTC (rev 13689)
+++ trunk/ant-contrib/debian/patches/02_592182_fortask.dpatch 2011-05-16 11:33:10 UTC (rev 13690)
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_592182_fortask.dpatch by Michael Gilbert <michael.s.gilbert (at) gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: add the ant for task to the antcontrib properties file
-
- at DPATCH@
-
---- ant-contrib-1.0~b3+svn177~/src/main/resources/net/sf/antcontrib/antcontrib.properties 2009-09-25 13:23:13.000000000 -0700
-+++ ant-contrib-1.0~b3+svn177/src/main/resources/net/sf/antcontrib/antcontrib.properties 2010-08-08 09:21:30.000000000 -0700
-@@ -14,6 +14,7 @@
-
- # Logic tasks
- if=net.sf.antcontrib.logic.IfTask
-+for=net.sf.antcontrib.logic.ForTask
- foreach=net.sf.antcontrib.logic.ForEach
- throw=net.sf.antcontrib.logic.Throw
- trycatch=net.sf.antcontrib.logic.TryCatchTask
Added: trunk/ant-contrib/debian/patches/debianize_build_xml.diff
===================================================================
--- trunk/ant-contrib/debian/patches/debianize_build_xml.diff (rev 0)
+++ trunk/ant-contrib/debian/patches/debianize_build_xml.diff 2011-05-16 11:33:10 UTC (rev 13690)
@@ -0,0 +1,66 @@
+Description: Debianize build.xml
+Author: Daniel Leidert (dale) <daniel.leidert at wgdd.de>
+Forwarded: not-needed
+
+diff -urNad pkg-ant-contrib~/build.xml pkg-ant-contrib/build.xml
+--- pkg-ant-contrib~/build.xml 2009-03-20 05:27:52.000000000 +0100
++++ pkg-ant-contrib/build.xml 2009-06-09 14:27:35.000000000 +0200
+@@ -49,16 +49,18 @@
+ <property name="junit.jar" value="${m2_repo}/junit/junit/${junit.version}/junit-${junit.version}.jar"/>
+ <property name="ant.jar.version" value="1.6.5"/>
+ <property name="ant.jar" value="${m2_repo}/ant/ant/${ant.jar.version}/ant-${ant.jar.version}.jar"/>
++
++ <property name="debian.java.dir" location="/usr/share/java" />
+
+
+ <target name="init" unless="no-ivy">
+ <path id="ivy.lib.path">
+- <fileset dir="lib/ivy/jars" includes="ivy-2.0.0.jar"/>
+- <fileset dir="lib/commons-cli/jars" includes="commons-cli-1.0.jar"/>
+- <fileset dir="lib/commons-codec/jars" includes="commons-codec-1.3.jar"/>
+- <fileset dir="lib/commons-httpclient/jars" includes="commons-httpclient-3.0.1.jar"/>
+- <fileset dir="lib/commons-logging/jars" includes="commons-logging-1.0.4.jar"/>
+- <fileset dir="lib/oro/jars" includes="oro-2.0.8.jar"/>
++ <fileset dir="${debian.java.dir}" includes="ivy.jar"/>
++ <fileset dir="${debian.java.dir}" includes="commons-cli.jar"/>
++ <fileset dir="${debian.java.dir}" includes="commons-codec.jar"/>
++ <fileset dir="${debian.java.dir}" includes="commons-httpclient.jar"/>
++ <fileset dir="${debian.java.dir}" includes="commons-logging.jar"/>
++ <fileset dir="${debian.java.dir}" includes="oro.jar"/>
+ </path>
+
+ <taskdef resource="org/apache/ivy/ant/antlib.xml"
+@@ -109,6 +111,7 @@
+ classpathref="compile.classpath"
+ source="${jdk.source}"
+ target="${jdk.target}"
++ excludes="**/Ivy14Adapter.java"
+ />
+
+ <copy todir="${target.classes.dir}">
+diff -urNad pkg-ant-contrib~/ivysettings.xml pkg-ant-contrib/ivysettings.xml
+--- pkg-ant-contrib~/ivysettings.xml 2009-03-20 05:27:52.000000000 +0100
++++ pkg-ant-contrib/ivysettings.xml 2009-06-09 14:27:35.000000000 +0200
+@@ -5,8 +5,8 @@
+
+ <resolvers>
+ <filesystem name="local">
+- <ivy pattern="${ivy.conf.dir}/lib/[module]/ivy-[revision].xml" />
+- <artifact pattern="${ivy.conf.dir}/lib/[module]/[ext]s/[artifact]-[revision].[ext]" />
++ <ivy pattern="${ivy.conf.dir}/ivy-[revision].xml" />
++ <artifact pattern="/usr/share/java/[artifact].[ext]" />
+ </filesystem>
+
+
+diff -urNad pkg-ant-contrib~/src/main/java/net/sf/antcontrib/net/URLImportTask.java pkg-ant-contrib/src/main/java/net/sf/antcontrib/net/URLImportTask.java
+--- pkg-ant-contrib~/src/main/java/net/sf/antcontrib/net/URLImportTask.java 2008-06-16 19:38:26.000000000 +0200
++++ pkg-ant-contrib/src/main/java/net/sf/antcontrib/net/URLImportTask.java 2009-06-09 14:27:35.000000000 +0200
+@@ -158,7 +158,7 @@
+ adapter = new Ivy20Adapter();
+ }
+ catch (ClassNotFoundException e) {
+- adapter = new Ivy14Adapter();
++ // adapter = new Ivy14Adapter();
+ }
+
+ String setId = org + "." + module + "." + rev + ".fileset";
Deleted: trunk/ant-contrib/debian/patches/debianize_build_xml.dpatch
===================================================================
--- trunk/ant-contrib/debian/patches/debianize_build_xml.dpatch 2011-05-14 21:35:30 UTC (rev 13689)
+++ trunk/ant-contrib/debian/patches/debianize_build_xml.dpatch 2011-05-16 11:33:10 UTC (rev 13690)
@@ -1,69 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## debianize_build_xml.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~/build.xml pkg-ant-contrib/build.xml
---- pkg-ant-contrib~/build.xml 2009-03-20 05:27:52.000000000 +0100
-+++ pkg-ant-contrib/build.xml 2009-06-09 14:27:35.000000000 +0200
-@@ -49,16 +49,18 @@
- <property name="junit.jar" value="${m2_repo}/junit/junit/${junit.version}/junit-${junit.version}.jar"/>
- <property name="ant.jar.version" value="1.6.5"/>
- <property name="ant.jar" value="${m2_repo}/ant/ant/${ant.jar.version}/ant-${ant.jar.version}.jar"/>
-+
-+ <property name="debian.java.dir" location="/usr/share/java" />
-
-
- <target name="init" unless="no-ivy">
- <path id="ivy.lib.path">
-- <fileset dir="lib/ivy/jars" includes="ivy-2.0.0.jar"/>
-- <fileset dir="lib/commons-cli/jars" includes="commons-cli-1.0.jar"/>
-- <fileset dir="lib/commons-codec/jars" includes="commons-codec-1.3.jar"/>
-- <fileset dir="lib/commons-httpclient/jars" includes="commons-httpclient-3.0.1.jar"/>
-- <fileset dir="lib/commons-logging/jars" includes="commons-logging-1.0.4.jar"/>
-- <fileset dir="lib/oro/jars" includes="oro-2.0.8.jar"/>
-+ <fileset dir="${debian.java.dir}" includes="ivy.jar"/>
-+ <fileset dir="${debian.java.dir}" includes="commons-cli.jar"/>
-+ <fileset dir="${debian.java.dir}" includes="commons-codec.jar"/>
-+ <fileset dir="${debian.java.dir}" includes="commons-httpclient.jar"/>
-+ <fileset dir="${debian.java.dir}" includes="commons-logging.jar"/>
-+ <fileset dir="${debian.java.dir}" includes="oro.jar"/>
- </path>
-
- <taskdef resource="org/apache/ivy/ant/antlib.xml"
-@@ -109,6 +111,7 @@
- classpathref="compile.classpath"
- source="${jdk.source}"
- target="${jdk.target}"
-+ excludes="**/Ivy14Adapter.java"
- />
-
- <copy todir="${target.classes.dir}">
-diff -urNad pkg-ant-contrib~/ivysettings.xml pkg-ant-contrib/ivysettings.xml
---- pkg-ant-contrib~/ivysettings.xml 2009-03-20 05:27:52.000000000 +0100
-+++ pkg-ant-contrib/ivysettings.xml 2009-06-09 14:27:35.000000000 +0200
-@@ -5,8 +5,8 @@
-
- <resolvers>
- <filesystem name="local">
-- <ivy pattern="${ivy.conf.dir}/lib/[module]/ivy-[revision].xml" />
-- <artifact pattern="${ivy.conf.dir}/lib/[module]/[ext]s/[artifact]-[revision].[ext]" />
-+ <ivy pattern="${ivy.conf.dir}/ivy-[revision].xml" />
-+ <artifact pattern="/usr/share/java/[artifact].[ext]" />
- </filesystem>
-
-
-diff -urNad pkg-ant-contrib~/src/main/java/net/sf/antcontrib/net/URLImportTask.java pkg-ant-contrib/src/main/java/net/sf/antcontrib/net/URLImportTask.java
---- pkg-ant-contrib~/src/main/java/net/sf/antcontrib/net/URLImportTask.java 2008-06-16 19:38:26.000000000 +0200
-+++ pkg-ant-contrib/src/main/java/net/sf/antcontrib/net/URLImportTask.java 2009-06-09 14:27:35.000000000 +0200
-@@ -158,7 +158,7 @@
- adapter = new Ivy20Adapter();
- }
- catch (ClassNotFoundException e) {
-- adapter = new Ivy14Adapter();
-+ // adapter = new Ivy14Adapter();
- }
-
- String setId = org + "." + module + "." + rev + ".fileset";
Added: trunk/ant-contrib/debian/patches/series
===================================================================
--- trunk/ant-contrib/debian/patches/series (rev 0)
+++ trunk/ant-contrib/debian/patches/series 2011-05-16 11:33:10 UTC (rev 13690)
@@ -0,0 +1,2 @@
+debianize_build_xml.diff
+02_592182_fortask.diff
Modified: trunk/ant-contrib/debian/rules
===================================================================
--- trunk/ant-contrib/debian/rules 2011-05-14 21:35:30 UTC (rev 13689)
+++ trunk/ant-contrib/debian/rules 2011-05-16 11:33:10 UTC (rev 13690)
@@ -2,7 +2,6 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
PACKAGE := ant-contrib
VERSION := 1.0b3
@@ -11,7 +10,9 @@
ANT_HOME := /usr/share/ant
ANT_ARGS += -Djar.name=$(PACKAGE)-$(VERSION).jar
DEB_ANT_BUILD_TARGET := jar
+DEB_ANT_CHECK_TARGET := test
DEB_JARS := \
+ ant-junit \
ivy \
commons-cli \
commons-codec \
Added: trunk/ant-contrib/debian/source/format
===================================================================
--- trunk/ant-contrib/debian/source/format (rev 0)
+++ trunk/ant-contrib/debian/source/format 2011-05-16 11:33:10 UTC (rev 13690)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the pkg-java-commits
mailing list