Author: ludovicc-guest Date: 2009-08-02 23:24:38 +0000 (Sun, 02 Aug 2009) New Revision: 9515
Added: trunk/libcommons-codec-java/debian/patches/build.patch trunk/libcommons-codec-java/debian/patches/series Removed: trunk/libcommons-codec-java/debian/patches/01_build-xml-LICENSE.patch trunk/libcommons-codec-java/debian/patches/02_build-xml-tests.patch Modified: trunk/libcommons-codec-java/debian/changelog trunk/libcommons-codec-java/debian/control trunk/libcommons-codec-java/debian/rules Log: Add a quilt patch to ignore the LICENSE file not included in the source tarball, replace all previous simple patches by quilt Modified: trunk/libcommons-codec-java/debian/changelog =================================================================== --- trunk/libcommons-codec-java/debian/changelog 2009-08-02 23:23:43 UTC (rev 9514) +++ trunk/libcommons-codec-java/debian/changelog 2009-08-02 23:24:38 UTC (rev 9515) @@ -3,6 +3,8 @@ [Ludovic Claude] * Fix version for junit in the maven POM dependencies * Move api documentation to /usr/share/java/doc/libcommons-codec-java/api + * Add a quilt patch to ignore the LICENSE file not included in the + source tarball, replace all previous simple patches by quilt [Damien Raude-Morvan] * Build-Depends on default-jdk instead of default-jdk-builddep Modified: trunk/libcommons-codec-java/debian/control =================================================================== --- trunk/libcommons-codec-java/debian/control 2009-08-02 23:23:43 UTC (rev 9514) +++ trunk/libcommons-codec-java/debian/control 2009-08-02 23:24:38 UTC (rev 9515) @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Arnaud Vandyck <[email protected]>, Wolfgang Baer <[email protected]>, Damien Raude-Morvan <[email protected]> -Build-Depends: cdbs, debhelper (>= 5), ant, default-jdk +Build-Depends: cdbs, debhelper (>= 5), ant, default-jdk, quilt Build-Depends-Indep: maven-repo-helper, ant-optional, junit Standards-Version: 3.8.2 Homepage: http://commons.apache.org/codec/ Deleted: trunk/libcommons-codec-java/debian/patches/01_build-xml-LICENSE.patch =================================================================== --- trunk/libcommons-codec-java/debian/patches/01_build-xml-LICENSE.patch 2009-08-02 23:23:43 UTC (rev 9514) +++ trunk/libcommons-codec-java/debian/patches/01_build-xml-LICENSE.patch 2009-08-02 23:24:38 UTC (rev 9515) @@ -1,19 +0,0 @@ ---- build.xml.orig 2009-06-19 22:56:06.000000000 +0200 -+++ build.xml 2009-06-19 22:56:27.000000000 +0200 -@@ -90,14 +90,14 @@ - </target> - <target name="dist" depends="compile,javadoc" description="Create binary distribution"> - <mkdir dir="${dist.home}"/> -- <copy file="../LICENSE" todir="${dist.home}"/> -+ <copy file="LICENSE.txt" todir="${dist.home}"/> - <copy file="${basedir}/RELEASE-NOTES.txt" todir="${dist.home}"/> - <antcall target="jar"/> - </target> - <target name="jar" depends="compile" description="Create jar"> - <mkdir dir="${dist.home}"/> - <mkdir dir="${build.home}/classes/META-INF"/> -- <copy file="../LICENSE" tofile="${build.home}/classes/META-INF/LICENSE.txt"/> -+ <copy file="LICENSE.txt" tofile="${build.home}/classes/META-INF/LICENSE.txt"/> - <jar jarfile="${dist.home}/${final.name}.jar" basedir="${build.home}/classes" manifest="${build.home}/conf/MANIFEST.MF"/> - </target> - <target name="install-jar" depends="jar" description="--> Installs jar file in ${lib.repo}"> Deleted: trunk/libcommons-codec-java/debian/patches/02_build-xml-tests.patch =================================================================== --- trunk/libcommons-codec-java/debian/patches/02_build-xml-tests.patch 2009-08-02 23:23:43 UTC (rev 9514) +++ trunk/libcommons-codec-java/debian/patches/02_build-xml-tests.patch 2009-08-02 23:24:38 UTC (rev 9515) @@ -1,11 +0,0 @@ ---- build.xml.orig 2009-06-19 23:09:24.000000000 +0200 -+++ build.xml 2009-06-19 23:09:32.000000000 +0200 -@@ -177,7 +177,7 @@ - <!-- Run all the JUnit Tests --> - <target name="test" depends="compile.tests" description="Compiles and runs unit test cases"> - <record name="${build.home}/test-output.txt" append="no" action="start"/> -- <junit printsummary="yes" haltonfailure="yes"> -+ <junit printsummary="yes" haltonfailure="no"> - <classpath refid="test.classpath"/> - <formatter type="plain"/> - <batchtest fork="yes" todir="${build.home}/test-reports"> Added: trunk/libcommons-codec-java/debian/patches/build.patch =================================================================== --- trunk/libcommons-codec-java/debian/patches/build.patch (rev 0) +++ trunk/libcommons-codec-java/debian/patches/build.patch 2009-08-02 23:24:38 UTC (rev 9515) @@ -0,0 +1,34 @@ +--- a/build.xml ++++ b/build.xml +@@ -90,14 +90,12 @@ + </target> + <target name="dist" depends="compile,javadoc" description="Create binary distribution"> + <mkdir dir="${dist.home}"/> +- <copy file="../LICENSE" todir="${dist.home}"/> + <copy file="${basedir}/RELEASE-NOTES.txt" todir="${dist.home}"/> + <antcall target="jar"/> + </target> + <target name="jar" depends="compile" description="Create jar"> + <mkdir dir="${dist.home}"/> + <mkdir dir="${build.home}/classes/META-INF"/> +- <copy file="../LICENSE" tofile="${build.home}/classes/META-INF/LICENSE.txt"/> + <jar jarfile="${dist.home}/${final.name}.jar" basedir="${build.home}/classes" manifest="${build.home}/conf/MANIFEST.MF"/> + </target> + <target name="install-jar" depends="jar" description="--> Installs jar file in ${lib.repo}"> +@@ -145,7 +143,6 @@ + <zipfileset dir="." includes="build.xml" prefix="${final.name}/"/> + <zipfileset dir="." includes="checkstyle.xml" prefix="${final.name}/"/> + <zipfileset dir="." includes="default.properties" prefix="${final.name}/"/> +- <zipfileset dir="." includes="LICENSE.TXT" prefix="${final.name}/"/> + <zipfileset dir="." includes="maven.xml" prefix="${final.name}/"/> + <zipfileset dir="." includes="project.properties" prefix="${final.name}/"/> + <zipfileset dir="." includes="project.xml" prefix="${final.name}/"/> +@@ -177,7 +174,7 @@ + <!-- Run all the JUnit Tests --> + <target name="test" depends="compile.tests" description="Compiles and runs unit test cases"> + <record name="${build.home}/test-output.txt" append="no" action="start"/> +- <junit printsummary="yes" haltonfailure="yes"> ++ <junit printsummary="yes" haltonfailure="no"> + <classpath refid="test.classpath"/> + <formatter type="plain"/> + <batchtest fork="yes" todir="${build.home}/test-reports"> Added: trunk/libcommons-codec-java/debian/patches/series =================================================================== --- trunk/libcommons-codec-java/debian/patches/series (rev 0) +++ trunk/libcommons-codec-java/debian/patches/series 2009-08-02 23:24:38 UTC (rev 9515) @@ -0,0 +1 @@ +build.patch Modified: trunk/libcommons-codec-java/debian/rules =================================================================== --- trunk/libcommons-codec-java/debian/rules 2009-08-02 23:23:43 UTC (rev 9514) +++ trunk/libcommons-codec-java/debian/rules 2009-08-02 23:24:38 UTC (rev 9515) @@ -3,7 +3,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/ant.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk PACKAGE := $(DEB_SOURCE_PACKAGE) VERSION := $(DEB_UPSTREAM_VERSION) _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
