Author: dleidert-guest Date: 2009-06-09 12:41:41 +0000 (Tue, 09 Jun 2009) New Revision: 8326
Added: trunk/ant-contrib/debian/TODO trunk/ant-contrib/debian/ant.properties trunk/ant-contrib/debian/copyright Removed: trunk/ant-contrib/debian/patches/ivy_2.dpatch Modified: trunk/ant-contrib/debian/changelog trunk/ant-contrib/debian/control trunk/ant-contrib/debian/patches/00list trunk/ant-contrib/debian/patches/debianize_build_xml.dpatch trunk/ant-contrib/debian/rules Log: More work on ant-contrib; now using the subversion version for Ivy 2. This one compiles and builds. TODO: lib/ probably needs to be removed. Added: trunk/ant-contrib/debian/TODO =================================================================== --- trunk/ant-contrib/debian/TODO (rev 0) +++ trunk/ant-contrib/debian/TODO 2009-06-09 12:41:41 UTC (rev 8326) @@ -0,0 +1,2 @@ +The package needs to be repacked by removing lib/. The +dfsg suffix then +needs to be stripped in debian/rules. Added: trunk/ant-contrib/debian/ant.properties =================================================================== --- trunk/ant-contrib/debian/ant.properties (rev 0) +++ trunk/ant-contrib/debian/ant.properties 2009-06-09 12:41:41 UTC (rev 8326) @@ -0,0 +1,5 @@ +ant.jar=/usr/share/java/ant.jar +bcel.jar=/usr/share/java/bcel.jar +httpclient.jar=/usr/share/java/httpclient.jar +ivy.jar=/usr/share/java/ivy.jar +junit.jar=/usr/share/java/junit.jar Modified: trunk/ant-contrib/debian/changelog =================================================================== --- trunk/ant-contrib/debian/changelog 2009-06-08 23:04:46 UTC (rev 8325) +++ trunk/ant-contrib/debian/changelog 2009-06-09 12:41:41 UTC (rev 8326) @@ -1,4 +1,4 @@ -ant-contrib (1.0~b3-1) UNRELEASED; urgency=low +ant-contrib (1.0~b3+svn177-1) UNRELEASED; urgency=low * Initial release (closes: #485708). Modified: trunk/ant-contrib/debian/control =================================================================== --- trunk/ant-contrib/debian/control 2009-06-08 23:04:46 UTC (rev 8325) +++ trunk/ant-contrib/debian/control 2009-06-09 12:41:41 UTC (rev 8326) @@ -4,9 +4,9 @@ Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Daniel Leidert (dale) <[email protected]> Build-Depends: cdbs, debhelper (>= 5), dpatch -Build-Depends-Indep: ant, ivy, junit, libbcel-java, libcommons-cli-java, - libcommons-codec-java, libcommons-httpclient-java, - libcommons-logging-java, liboro-java, libxerces2-java +Build-Depends-Indep: openjdk-6-jdk, ant, ivy, junit, libbcel-java, + libcommons-cli-java, libcommons-codec-java, libcommons-httpclient-java, + libcommons-logging-java, liboro-java, libxerces2-java, maven2 Standards-Version: 3.8.1 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/ant-contrib Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/ant-contrib @@ -15,7 +15,7 @@ Package: ant-contrib Architecture: all -Depends: java-gcj-compat | java1-runtime | java2-runtime +Depends: java-gcj-compat | java1-runtime | java2-runtime, ${misc:Depends} Enhances: ant Description: collection of tasks, types and other tools for Apache Ant Extends ant and provides the following tasks: Added: trunk/ant-contrib/debian/copyright =================================================================== --- trunk/ant-contrib/debian/copyright (rev 0) +++ trunk/ant-contrib/debian/copyright 2009-06-09 12:41:41 UTC (rev 8326) @@ -0,0 +1,31 @@ +This package was debianized by Daniel Leidert (dale) <[email protected]> on +Mon, 08 Jun 2009. + +It was downloaded from the Sourceforge.net download servers: + + http://downloads.sourceforge.net/ant-contrib/ + +Upstream Authors: + + The Ant-Contrib project. + +Copyright: + + Copyright (C) 2001-2007 Ant-Contrib project. + +License: ASL2 + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + On Debian systems the Apache License, Version 2.0 can be found in the + file `/usr/share/common-licenses/Apache-2.0'. Modified: trunk/ant-contrib/debian/patches/00list =================================================================== --- trunk/ant-contrib/debian/patches/00list 2009-06-08 23:04:46 UTC (rev 8325) +++ trunk/ant-contrib/debian/patches/00list 2009-06-09 12:41:41 UTC (rev 8326) @@ -1,2 +1,2 @@ debianize_build_xml -ivy_2 +#ivy_2 Modified: trunk/ant-contrib/debian/patches/debianize_build_xml.dpatch =================================================================== --- trunk/ant-contrib/debian/patches/debianize_build_xml.dpatch 2009-06-08 23:04:46 UTC (rev 8325) +++ trunk/ant-contrib/debian/patches/debianize_build_xml.dpatch 2009-06-09 12:41:41 UTC (rev 8326) @@ -6,53 +6,64 @@ @DPATCH@ diff -urNad pkg-ant-contrib~/build.xml pkg-ant-contrib/build.xml ---- pkg-ant-contrib~/build.xml 2006-11-02 17:44:02.000000000 +0100 -+++ pkg-ant-contrib/build.xml 2009-06-08 23:59:02.000000000 +0200 -@@ -19,15 +19,17 @@ - <property name="target.docs.dir" location="${target.dir}/docs" /> - <property name="dist.dir" location="dist" /> - <property name="target.stage.dir" location="${target.dir}/stage" /> -- +--- 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"> + + + <target name="init" unless="no-ivy"> <path id="ivy.lib.path"> -- <fileset dir="lib/ivy/jars" includes="ivy-1.3.1.jar"/> +- <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"/> ++ <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="fr/jayasoft/ivy/ant/antlib.xml" -diff -urNad pkg-ant-contrib~/ivy-conf.xml pkg-ant-contrib/ivy-conf.xml ---- pkg-ant-contrib~/ivy-conf.xml 2006-10-28 13:57:58.000000000 +0200 -+++ pkg-ant-contrib/ivy-conf.xml 2009-06-09 00:00:13.000000000 +0200 -@@ -6,10 +6,10 @@ - <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]" /> -+ <artifact pattern="/usr/share/java/[artifact].[ext]" /> - </filesystem> - -- <ivyrep name="ivyrep" /> -+ <ivyrep name="ivyrep" ivyroot="http://ivyrep.jayasoft.org/"; /> - - <chain name="default-resolver"> - <resolver ref="local" /> -@@ -17,4 +17,4 @@ - </chain> - </resolvers> - --</ivy-conf> -\ No newline at end of file -+</ivy-conf> + <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/ivy_2.dpatch =================================================================== --- trunk/ant-contrib/debian/patches/ivy_2.dpatch 2009-06-08 23:04:46 UTC (rev 8325) +++ trunk/ant-contrib/debian/patches/ivy_2.dpatch 2009-06-09 12:41:41 UTC (rev 8326) @@ -1,45 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## ivy_2.dpatch by Daniel Leidert (dale) <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: No description. - -...@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, Modified: trunk/ant-contrib/debian/rules =================================================================== --- trunk/ant-contrib/debian/rules 2009-06-08 23:04:46 UTC (rev 8325) +++ trunk/ant-contrib/debian/rules 2009-06-09 12:41:41 UTC (rev 8326) @@ -4,8 +4,12 @@ include /usr/share/cdbs/1/class/ant.mk include /usr/share/cdbs/1/rules/dpatch.mk -JAVA_HOME := /usr/lib/jvm/java-gcj +PACKAGE := ant-contrib + +JAVA_HOME := /usr/lib/jvm/java-6-openjdk/ ANT_HOME := /usr/share/ant +ANT_ARGS += -Djar.name=$(PACKAGE)-$(DEB_UPSTREAM_VERSION).jar +DEB_ANT_BUILD_TARGET := jar DEB_JARS := \ ivy \ commons-cli \ @@ -14,3 +18,6 @@ commons-logging \ oro +install/ant-contrib:: + dh_install target/$(PACKAGE)-$(DEB_UPSTREAM_VERSION).jar usr/share/java + dh_link usr/share/java/$(PACKAGE)-$(DEB_UPSTREAM_VERSION).jar usr/share/java/$(PACKAGE).jar _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
