Author: drazzib Date: 2010-02-27 13:31:14 +0000 (Sat, 27 Feb 2010) New Revision: 11733
Added: trunk/aspectj/debian/patches/ant_0_8_fix.diff trunk/aspectj/debian/source/ trunk/aspectj/debian/source/format Modified: trunk/aspectj/debian/changelog trunk/aspectj/debian/control trunk/aspectj/debian/patches/series trunk/aspectj/debian/rules Log: * Fix FTBFS (fix ant.lib.path declaration): - New ant_0_8_fix.diff patch (Closes: #571341). * Updated Standards-Version to 3.8.4 (no changes needed). * Use 3.0 (quilt) source format. Modified: trunk/aspectj/debian/changelog =================================================================== --- trunk/aspectj/debian/changelog 2010-02-27 01:02:57 UTC (rev 11732) +++ trunk/aspectj/debian/changelog 2010-02-27 13:31:14 UTC (rev 11733) @@ -1,3 +1,12 @@ +aspectj (1.6.6+dfsg-2) unstable; urgency=low + + * Fix FTBFS (fix ant.lib.path declaration): + - New ant_0_8_fix.diff patch (Closes: #571341). + * Updated Standards-Version to 3.8.4 (no changes needed). + * Use 3.0 (quilt) source format. + + -- Damien Raude-Morvan <[email protected]> Sat, 27 Feb 2010 14:24:57 +0100 + aspectj (1.6.6+dfsg-1) unstable; urgency=low * New upstream release. Modified: trunk/aspectj/debian/control =================================================================== --- trunk/aspectj/debian/control 2010-02-27 01:02:57 UTC (rev 11732) +++ trunk/aspectj/debian/control 2010-02-27 13:31:14 UTC (rev 11733) @@ -3,10 +3,10 @@ Priority: optional Maintainer: Debian Java maintainers <[email protected]> Uploaders: Thomas Girard <[email protected]>, Michael Koch <[email protected]>, Damien Raude-Morvan <[email protected]> -Build-Depends: debhelper (>= 7), default-jdk, ant, ant-optional, cdbs, quilt +Build-Depends: debhelper (>= 7), default-jdk, ant, ant-optional, cdbs Build-Depends-Indep: libxalan2-java, libcommons-logging-java, libregexp-java, docbook-xml, docbook-xsl, xsltproc, docbook-to-man, junit (>= 3.8.1), libasm3-java, eclipse-platform (>= 3.4.1), aspectj, gjdoc, html2text -Standards-Version: 3.8.3 +Standards-Version: 3.8.4 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/aspectj/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/aspectj/ Homepage: http://www.eclipse.org/aspectj Added: trunk/aspectj/debian/patches/ant_0_8_fix.diff =================================================================== --- trunk/aspectj/debian/patches/ant_0_8_fix.diff (rev 0) +++ trunk/aspectj/debian/patches/ant_0_8_fix.diff 2010-02-27 13:31:14 UTC (rev 11733) @@ -0,0 +1,37 @@ +Description: Don't use ant.lib.path (tasks are included + in global classpath) +Forwarded: no +Author: Damien Raude-Morvan <[email protected]> +Last-Update: 2010-02-27 +--- a/org.aspectj/modules/build/build-properties.xml ++++ b/org.aspectj/modules/build/build-properties.xml +@@ -150,18 +150,11 @@ + location="${aspectj.modules.lib.dir}/ant/lib/ant.jar"/> + <taskdef resource="org/aspectj/internal/tools/ant/taskdefs/taskdefs.properties" + classpath="${aspectj.build.jar}"/> +- <path id="ant.lib.path"> +- <fileset dir="${aspectj.modules.lib.dir}/ant/lib"> +- <include name="**/*.jar"/> +- </fileset> +- </path> + <taskdef name="junit" +- classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask" +- classpathref="ant.lib.path"/> ++ classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask"/> + <available classname="org.apache.xalan.processor.TransformerFactoryImpl" + property="xalan.available" + value="true"> +- <classpath refid="ant.lib.path"/> + </available> + <condition property="junitreport.available" value="true"> + <istrue value="${xalan.available}"/> +@@ -173,8 +166,7 @@ + <target name="init-junitreport" depends="init-properties" + if="xalan.available"> + <taskdef name="junitreport" +- classname="org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator" +- classpathref="ant.lib.path"/> ++ classname="org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator" /> + </target> + + <target name="init-directories" Modified: trunk/aspectj/debian/patches/series =================================================================== --- trunk/aspectj/debian/patches/series 2010-02-27 01:02:57 UTC (rev 11732) +++ trunk/aspectj/debian/patches/series 2010-02-27 13:31:14 UTC (rev 11733) @@ -3,3 +3,4 @@ 03_use_system_docbook.diff 04_use_xsltproc_for_doc.diff 05_build_classpath.diff +ant_0_8_fix.diff Modified: trunk/aspectj/debian/rules =================================================================== --- trunk/aspectj/debian/rules 2010-02-27 01:02:57 UTC (rev 11732) +++ trunk/aspectj/debian/rules 2010-02-27 13:31:14 UTC (rev 11733) @@ -1,7 +1,6 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/class/ant.mk JAVA_HOME := /usr/lib/jvm/default-java Added: trunk/aspectj/debian/source/format =================================================================== --- trunk/aspectj/debian/source/format (rev 0) +++ trunk/aspectj/debian/source/format 2010-02-27 13:31:14 UTC (rev 11733) @@ -0,0 +1 @@ +3.0 (quilt) _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
