Author: mkoch Date: 2007-07-08 07:25:23 +0000 (Sun, 08 Jul 2007) New Revision: 3803
Added: trunk/ow-util-ant-tasks/debian/patches/05_MultipleCopy.dpatch Removed: trunk/ow-util-ant-tasks/debian/patches/03_upstream_add_javadoc_target.dpatch trunk/ow-util-ant-tasks/debian/patches/04_DirectoryScannerHelper.dpatch Modified: trunk/ow-util-ant-tasks/debian/README.Debian trunk/ow-util-ant-tasks/debian/README.Debian-source trunk/ow-util-ant-tasks/debian/changelog trunk/ow-util-ant-tasks/debian/control trunk/ow-util-ant-tasks/debian/patches/00list trunk/ow-util-ant-tasks/debian/patches/01_upstream_enhance_compile_target.dpatch trunk/ow-util-ant-tasks/debian/rules Log: ow-util-ant-tasks (1.3.2-1) unstable; urgency=low * New upstream version. * Depends on ant (>= 1.7). * Depend on java-gcj-compat instead of kaffe. * Removed Wolfgang and added myself to Uploaders. -- Michael Koch <[EMAIL PROTECTED]> Sat, 07 Jul 2007 13:49:32 -0100 Modified: trunk/ow-util-ant-tasks/debian/README.Debian =================================================================== --- trunk/ow-util-ant-tasks/debian/README.Debian 2007-07-08 07:24:47 UTC (rev 3802) +++ trunk/ow-util-ant-tasks/debian/README.Debian 2007-07-08 07:25:23 UTC (rev 3803) @@ -1,8 +1,8 @@ ow-util-ant-tasks for Debian ----------------------------- -The source for this package was downloaded from http://forge.objectweb.org/project/download.php?group_id=41&file_id=4049 +The source for this package was downloaded from http://forge.objectweb.org/project/download.php?group_id=41&file_id=5763 -The original source file is ow_util_ant_tasks_1.3.zip, and it was repackaged as described in README.Debian-source. +The original source file is ow_util_ant_tasks_1.3.2.zip, and it was repackaged as described in README.Debian-source. -- Barry Hawkins <[EMAIL PROTECTED]>, Wed, 05 Sep 2005 19:14:43 -0400 Modified: trunk/ow-util-ant-tasks/debian/README.Debian-source =================================================================== --- trunk/ow-util-ant-tasks/debian/README.Debian-source 2007-07-08 07:24:47 UTC (rev 3802) +++ trunk/ow-util-ant-tasks/debian/README.Debian-source 2007-07-08 07:25:23 UTC (rev 3803) @@ -4,76 +4,76 @@ The following steps were taken to repackage the original source for this library: -Downloaded ow_util_ant_tasks_1.3.zip from http://forge.objectweb.org/project/download.php?group_id=41&file_id=4049 +Downloaded ow_util_ant_tasks_1.3.2.zip from http://forge.objectweb.org/project/download.php?group_id=41&file_id=5763 -$ md5sum --binary ow_util_ant_tasks_1.3.zip -cfd7fde4b3269f359a3445fb5f8afcad *ow_util_ant_tasks_1.3.zip +$ md5sum --binary ow_util_ant_tasks_1.3.2.zip +cd602bf75a0feab480fa97739955b84e *ow_util_ant_tasks_1.3.2.zip -$ unzip ow_util_ant_tasks_1.3.zip -d ow-util-ant-tasks-1.3 -Archive: ow_util_ant_tasks_1.3.zip - creating: ow-util-ant-tasks-1.3/externals/ - creating: ow-util-ant-tasks-1.3/output/ - creating: ow-util-ant-tasks-1.3/output/build/ - creating: ow-util-ant-tasks-1.3/output/build/org/ - creating: ow-util-ant-tasks-1.3/output/build/org/objectweb/ - creating: ow-util-ant-tasks-1.3/output/build/org/objectweb/util/ - creating: ow-util-ant-tasks-1.3/output/build/org/objectweb/util/ant/ - creating: ow-util-ant-tasks-1.3/output/lib/ - creating: ow-util-ant-tasks-1.3/src/ - creating: ow-util-ant-tasks-1.3/src/org/ - creating: ow-util-ant-tasks-1.3/src/org/objectweb/ - creating: ow-util-ant-tasks-1.3/src/org/objectweb/util/ - creating: ow-util-ant-tasks-1.3/src/org/objectweb/util/ant/ - inflating: ow-util-ant-tasks-1.3/.classpath - inflating: ow-util-ant-tasks-1.3/.project - inflating: ow-util-ant-tasks-1.3/build.xml - inflating: ow-util-ant-tasks-1.3/externals/ant.jar - inflating: ow-util-ant-tasks-1.3/output/build/org/objectweb/util/ant/DirectoryScannerHelper.class - inflating: ow-util-ant-tasks-1.3/output/build/org/objectweb/util/ant/Jar2packageList.class - inflating: ow-util-ant-tasks-1.3/output/build/org/objectweb/util/ant/JavadocMultipleLink$FileFilter.class - inflating: ow-util-ant-tasks-1.3/output/build/org/objectweb/util/ant/JavadocMultipleLink.class - inflating: ow-util-ant-tasks-1.3/output/build/org/objectweb/util/ant/Ls.class - inflating: ow-util-ant-tasks-1.3/output/build/org/objectweb/util/ant/MultipleAnt.class - inflating: ow-util-ant-tasks-1.3/output/build/org/objectweb/util/ant/MultipleCopy.class - inflating: ow-util-ant-tasks-1.3/output/build/org/objectweb/util/ant/TokenizedAntCall.class - inflating: ow-util-ant-tasks-1.3/output/build/org/objectweb/util/ant/Xalan2Liaison.class - inflating: ow-util-ant-tasks-1.3/output/build/org/objectweb/util/ant/Zip$MyZipFileSet.class - inflating: ow-util-ant-tasks-1.3/output/build/org/objectweb/util/ant/Zip$ZipGroup$ZipEntries.class - inflating: ow-util-ant-tasks-1.3/output/build/org/objectweb/util/ant/Zip$ZipGroup.class - inflating: ow-util-ant-tasks-1.3/output/build/org/objectweb/util/ant/Zip.class - inflating: ow-util-ant-tasks-1.3/output/lib/ow_util_ant_tasks.jar - inflating: ow-util-ant-tasks-1.3/src/org/objectweb/util/ant/DirectoryScannerHelper.java - inflating: ow-util-ant-tasks-1.3/src/org/objectweb/util/ant/Jar2packageList.java - inflating: ow-util-ant-tasks-1.3/src/org/objectweb/util/ant/JavadocMultipleLink.java - inflating: ow-util-ant-tasks-1.3/src/org/objectweb/util/ant/Ls.java - inflating: ow-util-ant-tasks-1.3/src/org/objectweb/util/ant/MultipleAnt.java - inflating: ow-util-ant-tasks-1.3/src/org/objectweb/util/ant/MultipleCopy.java - inflating: ow-util-ant-tasks-1.3/src/org/objectweb/util/ant/TokenizedAntCall.java - inflating: ow-util-ant-tasks-1.3/src/org/objectweb/util/ant/Xalan2Liaison.java - inflating: ow-util-ant-tasks-1.3/src/org/objectweb/util/ant/Zip.java -$ rm ow-util-ant-tasks-1.3/.classpath -$ rm ow-util-ant-tasks-1.3/.project -$ rm -rf ow-util-ant-tasks-1.3/externals -$ rm -rf ow-util-ant-tasks-1.3/output -$ tar czvf ow-util-ant-tasks_1.3.orig.tar.gz ow-util-ant-tasks-1.3 -ow-util-ant-tasks-1.3/ -ow-util-ant-tasks-1.3/src/ -ow-util-ant-tasks-1.3/src/org/ -ow-util-ant-tasks-1.3/src/org/objectweb/ -ow-util-ant-tasks-1.3/src/org/objectweb/util/ -ow-util-ant-tasks-1.3/src/org/objectweb/util/ant/ -ow-util-ant-tasks-1.3/src/org/objectweb/util/ant/DirectoryScannerHelper.java -ow-util-ant-tasks-1.3/src/org/objectweb/util/ant/Jar2packageList.java -ow-util-ant-tasks-1.3/src/org/objectweb/util/ant/JavadocMultipleLink.java -ow-util-ant-tasks-1.3/src/org/objectweb/util/ant/Ls.java -ow-util-ant-tasks-1.3/src/org/objectweb/util/ant/MultipleAnt.java -ow-util-ant-tasks-1.3/src/org/objectweb/util/ant/MultipleCopy.java -ow-util-ant-tasks-1.3/src/org/objectweb/util/ant/TokenizedAntCall.java -ow-util-ant-tasks-1.3/src/org/objectweb/util/ant/Xalan2Liaison.java -ow-util-ant-tasks-1.3/src/org/objectweb/util/ant/Zip.java -ow-util-ant-tasks-1.3/build.xml +$ unzip ow_util_ant_tasks_1.3.2.zip -d ow-util-ant-tasks-1.3.2 +Archive: ow_util_ant_tasks_1.3.2.zip + creating: ow-util-ant-tasks-1.3.2/externals/ + creating: ow-util-ant-tasks-1.3.2/output/ + creating: ow-util-ant-tasks-1.3.2/output/build/ + creating: ow-util-ant-tasks-1.3.2/output/build/org/ + creating: ow-util-ant-tasks-1.3.2/output/build/org/objectweb/ + creating: ow-util-ant-tasks-1.3.2/output/build/org/objectweb/util/ + creating: ow-util-ant-tasks-1.3.2/output/build/org/objectweb/util/ant/ + creating: ow-util-ant-tasks-1.3.2/output/lib/ + creating: ow-util-ant-tasks-1.3.2/src/ + creating: ow-util-ant-tasks-1.3.2/src/org/ + creating: ow-util-ant-tasks-1.3.2/src/org/objectweb/ + creating: ow-util-ant-tasks-1.3.2/src/org/objectweb/util/ + creating: ow-util-ant-tasks-1.3.2/src/org/objectweb/util/ant/ + inflating: ow-util-ant-tasks-1.3.2/.classpath + inflating: ow-util-ant-tasks-1.3.2/.project + inflating: ow-util-ant-tasks-1.3.2/build.xml + inflating: ow-util-ant-tasks-1.3.2/externals/ant.jar + inflating: ow-util-ant-tasks-1.3.2/output/build/org/objectweb/util/ant/DirectoryScannerHelper.class + inflating: ow-util-ant-tasks-1.3.2/output/build/org/objectweb/util/ant/Jar2packageList.class + inflating: ow-util-ant-tasks-1.3.2/output/build/org/objectweb/util/ant/JavadocMultipleLink$FileFilter.class + inflating: ow-util-ant-tasks-1.3.2/output/build/org/objectweb/util/ant/JavadocMultipleLink.class + inflating: ow-util-ant-tasks-1.3.2/output/build/org/objectweb/util/ant/Ls.class + inflating: ow-util-ant-tasks-1.3.2/output/build/org/objectweb/util/ant/MultipleAnt.class + inflating: ow-util-ant-tasks-1.3.2/output/build/org/objectweb/util/ant/MultipleCopy.class + inflating: ow-util-ant-tasks-1.3.2/output/build/org/objectweb/util/ant/TokenizedAntCall.class + inflating: ow-util-ant-tasks-1.3.2/output/build/org/objectweb/util/ant/Xalan2Liaison.class + inflating: ow-util-ant-tasks-1.3.2/output/build/org/objectweb/util/ant/Zip$MyZipFileSet.class + inflating: ow-util-ant-tasks-1.3.2/output/build/org/objectweb/util/ant/Zip$ZipGroup$ZipEntries.class + inflating: ow-util-ant-tasks-1.3.2/output/build/org/objectweb/util/ant/Zip$ZipGroup.class + inflating: ow-util-ant-tasks-1.3.2/output/build/org/objectweb/util/ant/Zip.class + inflating: ow-util-ant-tasks-1.3.2/output/lib/ow_util_ant_tasks.jar + inflating: ow-util-ant-tasks-1.3.2/src/org/objectweb/util/ant/DirectoryScannerHelper.java + inflating: ow-util-ant-tasks-1.3.2/src/org/objectweb/util/ant/Jar2packageList.java + inflating: ow-util-ant-tasks-1.3.2/src/org/objectweb/util/ant/JavadocMultipleLink.java + inflating: ow-util-ant-tasks-1.3.2/src/org/objectweb/util/ant/Ls.java + inflating: ow-util-ant-tasks-1.3.2/src/org/objectweb/util/ant/MultipleAnt.java + inflating: ow-util-ant-tasks-1.3.2/src/org/objectweb/util/ant/MultipleCopy.java + inflating: ow-util-ant-tasks-1.3.2/src/org/objectweb/util/ant/TokenizedAntCall.java + inflating: ow-util-ant-tasks-1.3.2/src/org/objectweb/util/ant/Xalan2Liaison.java + inflating: ow-util-ant-tasks-1.3.2/src/org/objectweb/util/ant/Zip.java +$ rm ow-util-ant-tasks-1.3.2/.classpath +$ rm ow-util-ant-tasks-1.3.2/.project +$ rm -rf ow-util-ant-tasks-1.3.2/externals +$ rm -rf ow-util-ant-tasks-1.3.2/output +$ tar czvf ow-util-ant-tasks_1.3.2.orig.tar.gz ow-util-ant-tasks-1.3.2 +ow-util-ant-tasks-1.3.2/ +ow-util-ant-tasks-1.3.2/src/ +ow-util-ant-tasks-1.3.2/src/org/ +ow-util-ant-tasks-1.3.2/src/org/objectweb/ +ow-util-ant-tasks-1.3.2/src/org/objectweb/util/ +ow-util-ant-tasks-1.3.2/src/org/objectweb/util/ant/ +ow-util-ant-tasks-1.3.2/src/org/objectweb/util/ant/DirectoryScannerHelper.java +ow-util-ant-tasks-1.3.2/src/org/objectweb/util/ant/Jar2packageList.java +ow-util-ant-tasks-1.3.2/src/org/objectweb/util/ant/JavadocMultipleLink.java +ow-util-ant-tasks-1.3.2/src/org/objectweb/util/ant/Ls.java +ow-util-ant-tasks-1.3.2/src/org/objectweb/util/ant/MultipleAnt.java +ow-util-ant-tasks-1.3.2/src/org/objectweb/util/ant/MultipleCopy.java +ow-util-ant-tasks-1.3.2/src/org/objectweb/util/ant/TokenizedAntCall.java +ow-util-ant-tasks-1.3.2/src/org/objectweb/util/ant/Xalan2Liaison.java +ow-util-ant-tasks-1.3.2/src/org/objectweb/util/ant/Zip.java +ow-util-ant-tasks-1.3.2/build.xml -$ md5sum --binary ow-util-ant-tasks_1.3.orig.tar.gz -1ff171069446d4c24da62e747fbe9c78 *ow-util-ant-tasks_1.3.orig.tar.gz +$ md5sum --binary ow-util-ant-tasks_1.3.2.orig.tar.gz +890ea34ecc813b798673f88390ec8855 *ow-util-ant-tasks_1.3.2.orig.tar.gz - -- Barry Hawkins <[EMAIL PROTECTED]>, Mon, 05 Sep 2005 19:14:43 -0400 + -- Michael Koch <[EMAIL PROTECTED]>, Sat, 06 Jul 2007 20:45:43 -0200 Modified: trunk/ow-util-ant-tasks/debian/changelog =================================================================== --- trunk/ow-util-ant-tasks/debian/changelog 2007-07-08 07:24:47 UTC (rev 3802) +++ trunk/ow-util-ant-tasks/debian/changelog 2007-07-08 07:25:23 UTC (rev 3803) @@ -1,3 +1,12 @@ +ow-util-ant-tasks (1.3.2-1) unstable; urgency=low + + * New upstream version. + * Depends on ant (>= 1.7). + * Depend on java-gcj-compat instead of kaffe. + * Removed Wolfgang and added myself to Uploaders. + + -- Michael Koch <[EMAIL PROTECTED]> Sat, 07 Jul 2007 13:49:32 -0100 + ow-util-ant-tasks (1.3-4) unstable; urgency=low * Updated standards version and maintainer email Modified: trunk/ow-util-ant-tasks/debian/control =================================================================== --- trunk/ow-util-ant-tasks/debian/control 2007-07-08 07:24:47 UTC (rev 3802) +++ trunk/ow-util-ant-tasks/debian/control 2007-07-08 07:25:23 UTC (rev 3803) @@ -2,13 +2,13 @@ Section: libdevel Priority: optional Maintainer: Debian Java Maintainers <[EMAIL PROTECTED]> -Uploaders: Barry Hawkins <[EMAIL PROTECTED]>, Wolfgang Baer <[EMAIL PROTECTED]> -Build-Depends: debhelper (>= 4.0.0), dpatch (>= 2.0.14), kaffe (>= 2:1.1.5-3), ant (>= 1.6.5-1), junit, libxalan2-java +Uploaders: Barry Hawkins <[EMAIL PROTECTED]>, Michael Koch <[EMAIL PROTECTED]> +Build-Depends: debhelper (>= 4.0.0), dpatch (>= 2.0.14), java-gcj-compat-dev, ant (>= 1.7), junit, libxalan2-java Standards-Version: 3.7.2 Package: libow-util-ant-tasks-java Architecture: any -Depends: ant (>= 1.6.5-1), kaffe (>= 2:1.1.5-3) | java1-runtime | java2-runtime +Depends: ant (>= 1.7), java-gcj-compat | java1-runtime | java2-runtime Description: ObjectWeb utility Ant tasks library This library is used in the build process of several key frameworks developed by ObjectWeb, among them the ObjectWeb ASM bytecode manipulation Modified: trunk/ow-util-ant-tasks/debian/patches/00list =================================================================== --- trunk/ow-util-ant-tasks/debian/patches/00list 2007-07-08 07:24:47 UTC (rev 3802) +++ trunk/ow-util-ant-tasks/debian/patches/00list 2007-07-08 07:25:23 UTC (rev 3803) @@ -1,4 +1,3 @@ 01_upstream_enhance_compile_target 02_upstream_correct_manifest_description -03_upstream_add_javadoc_target -04_DirectoryScannerHelper +05_MultipleCopy Modified: trunk/ow-util-ant-tasks/debian/patches/01_upstream_enhance_compile_target.dpatch =================================================================== --- trunk/ow-util-ant-tasks/debian/patches/01_upstream_enhance_compile_target.dpatch 2007-07-08 07:24:47 UTC (rev 3802) +++ trunk/ow-util-ant-tasks/debian/patches/01_upstream_enhance_compile_target.dpatch 2007-07-08 07:25:23 UTC (rev 3803) @@ -8,17 +8,18 @@ @DPATCH@ diff -uNr ow-util-ant-tasks-1.3/build.xml build-01.xml ---- ow-util-ant-tasks-1.3/build.xml 2005-08-30 16:54:36.000000000 -0400 -+++ build-01.xml 2005-08-30 17:06:16.000000000 -0400 -@@ -11,7 +11,10 @@ +--- ow-util-ant-tasks-1.3.2/build.xml 2007-07-07 13:53:53.000000000 -0100 ++++ build.xml 2007-07-07 13:53:03.000000000 -0100 +@@ -12,7 +12,11 @@ + + <target name="compile"> <mkdir dir="${out.build}"/> - <javac srcdir="${prj.src}" destdir="${out.build}" - classpath="${prj.externals}/ant.jar" -- debug="on"/> +- <javac srcdir="${prj.src}" destdir="${out.build}" debug="on" ++ <javac srcdir="${prj.src}" destdir="${out.build}" + includes="${javac.includes}" + deprecation="${javac.deprecation}" + debug="${javac.debug}" -+ nowarn="${javac.nowarn}"/> - </target> - <target name="jar" depends="compile"> - <mkdir dir="${out.lib}"/> ++ nowarn="${javac.nowarn}" + target="${javac.target}" source="${javac.target}"> + <classpath> + <fileset dir="${prj.externals}" includes="**/*.jar"/> Deleted: trunk/ow-util-ant-tasks/debian/patches/03_upstream_add_javadoc_target.dpatch =================================================================== --- trunk/ow-util-ant-tasks/debian/patches/03_upstream_add_javadoc_target.dpatch 2007-07-08 07:24:47 UTC (rev 3802) +++ trunk/ow-util-ant-tasks/debian/patches/03_upstream_add_javadoc_target.dpatch 2007-07-08 07:25:23 UTC (rev 3803) @@ -1,49 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 03_upstream_add_javadoc_target.dpatch by Barry Hawkins <[EMAIL PROTECTED]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: The API Javadoc for this library is not being built by default; -## DP: this patch adds it to the build. - [EMAIL PROTECTED]@ - -diff -uNr ow-util-ant-tasks-1.3/build.xml build-03.xml ---- ow-util-ant-tasks-1.3/build.xml 2005-09-01 01:24:35.000000000 -0400 -+++ build-03.xml 2005-09-01 01:22:10.000000000 -0400 -@@ -6,6 +6,8 @@ - <property name="out.lib" value="${out}/lib"/> - <property name="out.zip" value="${out}/zip"/> - <property name="version" value="1.3"/> -+ <property name="javadoc.dir" value="${out}/docs/api"/> -+ <property name="javadoc.title" value="ObjectWeb Utility Ant Tasks"/> - - <target name="compile"> - <mkdir dir="${out.build}"/> -@@ -24,6 +26,20 @@ - </manifest> - </jar> - </target> -+ <target name="javadoc" depends="compile"> -+ <mkdir dir="${javadoc.dir}"/> -+ <javadoc destdir="${javadoc.dir}" -+ windowtitle="${javadoc.title}" -+ doctitle="${javadoc.title}"> -+ <package name="org.objectweb.util.ant.*"/> -+ <sourcepath location="${prj.src}"/> -+ <classpath location="${out.build}"/> -+ <header> -+ <![CDATA[ObjectWeb Documentation]]> -+ </header> -+ <group title="ObjectWeb Utility Ant Tasks" packages="org.objectweb.util.ant"/> -+ </javadoc> -+ </target> - <target name="zip" depends="jar"> - <mkdir dir="${out.zip}"/> - <zip destfile="${out.zip}/ow_util_ant_tasks_${version}.zip" -@@ -31,6 +47,7 @@ - </target> - <target name="clean"> - <delete dir="${out}"/> -+ <delete dir="${javadoc.dir}"/> - </target> - </project> Deleted: trunk/ow-util-ant-tasks/debian/patches/04_DirectoryScannerHelper.dpatch =================================================================== --- trunk/ow-util-ant-tasks/debian/patches/04_DirectoryScannerHelper.dpatch 2007-07-08 07:24:47 UTC (rev 3802) +++ trunk/ow-util-ant-tasks/debian/patches/04_DirectoryScannerHelper.dpatch 2007-07-08 07:25:23 UTC (rev 3803) @@ -1,37 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 04_DirectoryScannerHelper.dpatch by Wolfgang Baer <[EMAIL PROTECTED]> -## -## DP: Fixes a dump mistake introduced in upstream 1.3 - submitted upstream -## DP: watch out in new upstream releases if applied - -[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts -patch_opts="${patch_opts:--f --no-backup-if-mismatch ${2:+-d $2}}" - -if [ $# -lt 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) patch $patch_opts -p1 < $0;; - -unpatch) patch $patch_opts -p1 -R < $0;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1;; -esac - -exit 0 - [EMAIL PROTECTED]@ - -diff -u ow-util-ant-tasks-1.3/src/org/objectweb/util/ant/DirectoryScannerHelper.java DirectoryScannerHelper.java ---- ow-util-ant-tasks-1.3/src/org/objectweb/util/ant/DirectoryScannerHelper.java 2005-09-12 22:29:20.000000000 +0200 -+++ DirectoryScannerHelper.java 2005-09-12 22:21:34.000000000 +0200 -@@ -77,7 +77,7 @@ - * @return an array of String corresponding to selected directories - */ - public static String[] getSelectedDirectoriesAsString(DirectoryScanner ds, Project project) { -- return (String[]) getSelectedFiles(ds, project).toArray(new String[0]); -+ return (String[]) getSelectedDirectories(ds, project).toArray(new String[0]); - } - - } Added: trunk/ow-util-ant-tasks/debian/patches/05_MultipleCopy.dpatch =================================================================== --- trunk/ow-util-ant-tasks/debian/patches/05_MultipleCopy.dpatch (rev 0) +++ trunk/ow-util-ant-tasks/debian/patches/05_MultipleCopy.dpatch 2007-07-08 07:25:23 UTC (rev 3803) @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 05_MultipleCopy.dpatch by <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Build against Ant 1.7.0 + [EMAIL PROTECTED]@ + +--- ./src/org/objectweb/util/ant/MultipleCopy.java.orig 2007-07-07 13:23:10.000000000 -0100 ++++ ./src/org/objectweb/util/ant/MultipleCopy.java 2007-07-07 13:23:35.000000000 -0100 +@@ -101,8 +101,8 @@ + } + + // deal with the filesets +- for (int i = 0; i < filesets.size(); i++) { +- FileSet fs = (FileSet) filesets.elementAt(i); ++ for (int i = 0; i < rcs.size(); i++) { ++ FileSet fs = (FileSet) rcs.elementAt(i); + DirectoryScanner ds = fs.getDirectoryScanner(getProject()); + File fromDir = fs.getDir(getProject()); + Property changes on: trunk/ow-util-ant-tasks/debian/patches/05_MultipleCopy.dpatch ___________________________________________________________________ Name: svn:executable + * Modified: trunk/ow-util-ant-tasks/debian/rules =================================================================== --- trunk/ow-util-ant-tasks/debian/rules 2007-07-08 07:24:47 UTC (rev 3802) +++ trunk/ow-util-ant-tasks/debian/rules 2007-07-08 07:25:23 UTC (rev 3803) @@ -3,7 +3,7 @@ # debian/rules for ow-util-ant-tasks # Uncomment this to turn on verbose mode. -export DH_VERBOSE=1 +#export DH_VERBOSE=1 # Set a locale; currently using default export LANG=C @@ -14,7 +14,7 @@ TEMPDIR=debian/libow-util-ant-tasks-java # Set JAVA_HOME to be used for Java commands -JAVA_HOME=/usr/lib/kaffe +JAVA_HOME=/usr/lib/jvm/java-gcj # Set the invocation of the java command; JAVACMD=$(JAVA_HOME)/bin/java @@ -24,7 +24,7 @@ # class path) to ensure the same build results in all cases JAVA_LIB=/usr/share/java ANT_HOME=/usr/share/ant -ANT_CLASSPATH=$(JAVA_LIB)/gnujaxp.jar:$(ANT_HOME)/lib/ant.jar:$(ANT_HOME)/lib/ant-launcher.jar:$(ANT_HOME)/lib/ant-junit.jar:$(JAVA_LIB)/junit.jar:$(JAVA_LIB)/xalan2.jar +ANT_CLASSPATH=$(JAVA_LIB)/gnujaxp.jar:$(ANT_HOME)/lib/ant.jar:$(ANT_HOME)/lib/ant-launcher.jar:$(ANT_HOME)/lib/ant-junit.jar:$(JAVA_LIB)/junit.jar:$(JAVA_LIB)/xalan2.jar:$(JAVA_HOME)/lib/tools.jar # Set path to Ant properties file ANT_PROPS=debian/ant.properties @@ -40,7 +40,7 @@ build-stamp: patch-stamp dh_testdir $(ANT) jar - $(ANT) javadoc + $(ANT) jdoc touch build-stamp clean: unpatch @@ -61,7 +61,7 @@ install -m 644 output/lib/ow_util_ant_tasks.jar \ $(TEMPDIR)/usr/share/java - mv output/docs/api $(TEMPDIR)/usr/share/doc/libow-util-ant-tasks-java + mv output/jdoc $(TEMPDIR)/usr/share/doc/libow-util-ant-tasks-java/api # Build architecture-independent files here. _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
