Author: jamespage-guest Date: 2011-05-16 11:34:34 +0000 (Mon, 16 May 2011) New Revision: 13691
Added: tags/ant-contrib/1.0~b3+svn177-3/ tags/ant-contrib/1.0~b3+svn177-3/debian/changelog tags/ant-contrib/1.0~b3+svn177-3/debian/control tags/ant-contrib/1.0~b3+svn177-3/debian/patches/02_592182_fortask.diff tags/ant-contrib/1.0~b3+svn177-3/debian/patches/debianize_build_xml.diff tags/ant-contrib/1.0~b3+svn177-3/debian/patches/series tags/ant-contrib/1.0~b3+svn177-3/debian/rules tags/ant-contrib/1.0~b3+svn177-3/debian/source/ Removed: tags/ant-contrib/1.0~b3+svn177-3/debian/README.source tags/ant-contrib/1.0~b3+svn177-3/debian/TODO tags/ant-contrib/1.0~b3+svn177-3/debian/changelog tags/ant-contrib/1.0~b3+svn177-3/debian/control tags/ant-contrib/1.0~b3+svn177-3/debian/patches/00list tags/ant-contrib/1.0~b3+svn177-3/debian/patches/02_592182_fortask.dpatch tags/ant-contrib/1.0~b3+svn177-3/debian/patches/debianize_build_xml.dpatch tags/ant-contrib/1.0~b3+svn177-3/debian/rules Log: [svn-buildpackage] Tagging ant-contrib 1.0~b3+svn177-3 Deleted: tags/ant-contrib/1.0~b3+svn177-3/debian/README.source =================================================================== --- trunk/ant-contrib/debian/README.source 2011-05-14 21:35:30 UTC (rev 13689) +++ tags/ant-contrib/1.0~b3+svn177-3/debian/README.source 2011-05-16 11:34:34 UTC (rev 13691) @@ -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: tags/ant-contrib/1.0~b3+svn177-3/debian/TODO =================================================================== --- trunk/ant-contrib/debian/TODO 2011-05-14 21:35:30 UTC (rev 13689) +++ tags/ant-contrib/1.0~b3+svn177-3/debian/TODO 2011-05-16 11:34:34 UTC (rev 13691) @@ -1,2 +0,0 @@ -The package needs to be repacked by removing lib/. The +dfsg suffix then -needs to be stripped in debian/rules. Deleted: tags/ant-contrib/1.0~b3+svn177-3/debian/changelog =================================================================== --- trunk/ant-contrib/debian/changelog 2011-05-14 21:35:30 UTC (rev 13689) +++ tags/ant-contrib/1.0~b3+svn177-3/debian/changelog 2011-05-16 11:34:34 UTC (rev 13691) @@ -1,17 +0,0 @@ -ant-contrib (1.0~b3+svn177-2) unstable; urgency=low - - * Team upload - [ Michael Koch ] - * Fixed watch file to handle '+svnXXX' part. - - [ tony mancill ] - * Include dpatch for ant "for" task. (Closes: #592182) - - Thanks to Michael Gilbert. - - -- tony mancill <tmanc...@debian.org> Sun, 08 Aug 2010 21:30:03 -0700 - -ant-contrib (1.0~b3+svn177-1) unstable; urgency=low - - * Initial release (closes: #485708). - - -- Michael Koch <konque...@gmx.de> Sat, 26 Sep 2009 08:45:47 +0200 Copied: tags/ant-contrib/1.0~b3+svn177-3/debian/changelog (from rev 13690, trunk/ant-contrib/debian/changelog) =================================================================== --- tags/ant-contrib/1.0~b3+svn177-3/debian/changelog (rev 0) +++ tags/ant-contrib/1.0~b3+svn177-3/debian/changelog 2011-05-16 11:34:34 UTC (rev 13691) @@ -0,0 +1,30 @@ +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.p...@canonical.com> Mon, 16 May 2011 09:37:06 +0100 + +ant-contrib (1.0~b3+svn177-2) unstable; urgency=low + + * Team upload + [ Michael Koch ] + * Fixed watch file to handle '+svnXXX' part. + + [ tony mancill ] + * Include dpatch for ant "for" task. (Closes: #592182) + - Thanks to Michael Gilbert. + + -- tony mancill <tmanc...@debian.org> Sun, 08 Aug 2010 21:30:03 -0700 + +ant-contrib (1.0~b3+svn177-1) unstable; urgency=low + + * Initial release (closes: #485708). + + -- Michael Koch <konque...@gmx.de> Sat, 26 Sep 2009 08:45:47 +0200 Deleted: tags/ant-contrib/1.0~b3+svn177-3/debian/control =================================================================== --- trunk/ant-contrib/debian/control 2011-05-14 21:35:30 UTC (rev 13689) +++ tags/ant-contrib/1.0~b3+svn177-3/debian/control 2011-05-16 11:34:34 UTC (rev 13691) @@ -1,29 +0,0 @@ -Source: ant-contrib -Section: java -Priority: extra -Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> -Uploaders: Daniel Leidert (dale) <daniel.leid...@wgdd.de>, Michael Koch <konque...@gmx.de> -Build-Depends: cdbs, debhelper (>= 7), dpatch, ant, default-jdk -Build-Depends-Indep: 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 -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 -DM-Upload-Allowed: yes - -Package: ant-contrib -Architecture: all -Depends: default-jre-headless | java2-runtime-headless, ${misc:Depends} -Enhances: ant -Description: collection of tasks, types and other tools for Apache Ant - Extends ant and provides the following tasks: - . - * Logic Tasks - * Network Tasks - * Performance Monitoring and Tasks - * Platform Tasks - * Property Tasks - * Process Tasks - * Other (unstable) Tasks Copied: tags/ant-contrib/1.0~b3+svn177-3/debian/control (from rev 13690, trunk/ant-contrib/debian/control) =================================================================== --- tags/ant-contrib/1.0~b3+svn177-3/debian/control (rev 0) +++ tags/ant-contrib/1.0~b3+svn177-3/debian/control 2011-05-16 11:34:34 UTC (rev 13691) @@ -0,0 +1,30 @@ +Source: ant-contrib +Section: java +Priority: extra +Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> +Uploaders: Daniel Leidert (dale) <daniel.leid...@wgdd.de>, Michael Koch <konque...@gmx.de>, + James Page <james.p...@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 +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 +DM-Upload-Allowed: yes + +Package: ant-contrib +Architecture: all +Depends: default-jre-headless | java2-runtime-headless, ${misc:Depends} +Enhances: ant +Description: collection of tasks, types and other tools for Apache Ant + Extends ant and provides the following tasks: + . + * Logic Tasks + * Network Tasks + * Performance Monitoring and Tasks + * Platform Tasks + * Property Tasks + * Process Tasks + * Other (unstable) Tasks Deleted: tags/ant-contrib/1.0~b3+svn177-3/debian/patches/00list =================================================================== --- trunk/ant-contrib/debian/patches/00list 2011-05-14 21:35:30 UTC (rev 13689) +++ tags/ant-contrib/1.0~b3+svn177-3/debian/patches/00list 2011-05-16 11:34:34 UTC (rev 13691) @@ -1,3 +0,0 @@ -debianize_build_xml -#ivy_2 -02_592182_fortask Copied: tags/ant-contrib/1.0~b3+svn177-3/debian/patches/02_592182_fortask.diff (from rev 13690, trunk/ant-contrib/debian/patches/02_592182_fortask.diff) =================================================================== --- tags/ant-contrib/1.0~b3+svn177-3/debian/patches/02_592182_fortask.diff (rev 0) +++ tags/ant-contrib/1.0~b3+svn177-3/debian/patches/02_592182_fortask.diff 2011-05-16 11:34:34 UTC (rev 13691) @@ -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: tags/ant-contrib/1.0~b3+svn177-3/debian/patches/02_592182_fortask.dpatch =================================================================== --- trunk/ant-contrib/debian/patches/02_592182_fortask.dpatch 2011-05-14 21:35:30 UTC (rev 13689) +++ tags/ant-contrib/1.0~b3+svn177-3/debian/patches/02_592182_fortask.dpatch 2011-05-16 11:34:34 UTC (rev 13691) @@ -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 - -@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 Copied: tags/ant-contrib/1.0~b3+svn177-3/debian/patches/debianize_build_xml.diff (from rev 13690, trunk/ant-contrib/debian/patches/debianize_build_xml.diff) =================================================================== --- tags/ant-contrib/1.0~b3+svn177-3/debian/patches/debianize_build_xml.diff (rev 0) +++ tags/ant-contrib/1.0~b3+svn177-3/debian/patches/debianize_build_xml.diff 2011-05-16 11:34:34 UTC (rev 13691) @@ -0,0 +1,66 @@ +Description: Debianize build.xml +Author: Daniel Leidert (dale) <daniel.leid...@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: tags/ant-contrib/1.0~b3+svn177-3/debian/patches/debianize_build_xml.dpatch =================================================================== --- trunk/ant-contrib/debian/patches/debianize_build_xml.dpatch 2011-05-14 21:35:30 UTC (rev 13689) +++ tags/ant-contrib/1.0~b3+svn177-3/debian/patches/debianize_build_xml.dpatch 2011-05-16 11:34:34 UTC (rev 13691) @@ -1,69 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## debianize_build_xml.dpatch by Daniel Leidert (dale) <daniel.leid...@wgdd.de> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -@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"; Copied: tags/ant-contrib/1.0~b3+svn177-3/debian/patches/series (from rev 13690, trunk/ant-contrib/debian/patches/series) =================================================================== --- tags/ant-contrib/1.0~b3+svn177-3/debian/patches/series (rev 0) +++ tags/ant-contrib/1.0~b3+svn177-3/debian/patches/series 2011-05-16 11:34:34 UTC (rev 13691) @@ -0,0 +1,2 @@ +debianize_build_xml.diff +02_592182_fortask.diff Deleted: tags/ant-contrib/1.0~b3+svn177-3/debian/rules =================================================================== --- trunk/ant-contrib/debian/rules 2011-05-14 21:35:30 UTC (rev 13689) +++ tags/ant-contrib/1.0~b3+svn177-3/debian/rules 2011-05-16 11:34:34 UTC (rev 13691) @@ -1,24 +0,0 @@ -#!/usr/bin/make -f - -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 - -JAVA_HOME := /usr/lib/jvm/java-6-openjdk/ -ANT_HOME := /usr/share/ant -ANT_ARGS += -Djar.name=$(PACKAGE)-$(VERSION).jar -DEB_ANT_BUILD_TARGET := jar -DEB_JARS := \ - ivy \ - commons-cli \ - commons-codec \ - commons-httpclient \ - commons-logging \ - oro - -install/ant-contrib:: - dh_install target/$(PACKAGE)-$(VERSION).jar usr/share/java - dh_link usr/share/java/$(PACKAGE)-$(VERSION).jar usr/share/java/$(PACKAGE).jar Copied: tags/ant-contrib/1.0~b3+svn177-3/debian/rules (from rev 13690, trunk/ant-contrib/debian/rules) =================================================================== --- tags/ant-contrib/1.0~b3+svn177-3/debian/rules (rev 0) +++ tags/ant-contrib/1.0~b3+svn177-3/debian/rules 2011-05-16 11:34:34 UTC (rev 13691) @@ -0,0 +1,25 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/ant.mk + +PACKAGE := ant-contrib +VERSION := 1.0b3 + +JAVA_HOME := /usr/lib/jvm/java-6-openjdk/ +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 \ + commons-httpclient \ + commons-logging \ + oro + +install/ant-contrib:: + dh_install target/$(PACKAGE)-$(VERSION).jar usr/share/java + dh_link usr/share/java/$(PACKAGE)-$(VERSION).jar usr/share/java/$(PACKAGE).jar _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
