Author: drazzib-guest Date: 2009-06-19 22:04:53 +0000 (Fri, 19 Jun 2009) New Revision: 8544
Added: trunk/libcommons-codec-java/debian/libcommons-codec-java-doc.doc-base trunk/libcommons-codec-java/debian/libcommons-codec-java-doc.docs trunk/libcommons-codec-java/debian/patches/02_build-xml-tests.patch Modified: trunk/libcommons-codec-java/debian/changelog trunk/libcommons-codec-java/debian/compat trunk/libcommons-codec-java/debian/control trunk/libcommons-codec-java/debian/copyright trunk/libcommons-codec-java/debian/patches/01_build-xml-LICENSE.patch trunk/libcommons-codec-java/debian/rules Log: [libcommons-codec-java] * Apply patch from Chris Cheney <[email protected]> (Closes: #508967) - Use default-jdk-builddep in Build-Depends - /usr/lib/jvm/default-java as JAVA_HOME - Add ${misc:Depends} in Depends * Add myself to Uploaders * Bump Standards-Version to 3.8.2 - Move to "java" section - Add Vcs-* fields - Add Homepage in debian/control - Add a get-orig-source target * Use debhelper 5 - Bump debian/compat to 5 - Build-Depends on debhelper >= 5 * Update the license to Apache License 2.0 (Closes: #532884) * Split API Javadoc into libcommons-codec-java-doc package (Closes: #506360) Modified: trunk/libcommons-codec-java/debian/changelog =================================================================== --- trunk/libcommons-codec-java/debian/changelog 2009-06-19 22:03:48 UTC (rev 8543) +++ trunk/libcommons-codec-java/debian/changelog 2009-06-19 22:04:53 UTC (rev 8544) @@ -1,13 +1,28 @@ -libcommons-codec-java (1.3-4.1) UNRELEASED; urgency=low +libcommons-codec-java (1.3-5) UNRELEASED; urgency=low - * Non-maintainer upload. - [ Emmanuel Bourg ] * Update of the URLs * Rename Jakarta Commons to Apache Commons - -- Sylvestre Ledru <[email protected]> Wed, 17 Jun 2009 10:49:13 +0200 + [ Damien Raude-Morvan ] + * Apply patch from Chris Cheney <[email protected]> (Closes: #508967) + - Use default-jdk-builddep in Build-Depends + - /usr/lib/jvm/default-java as JAVA_HOME + - Add ${misc:Depends} in Depends + * Add myself to Uploaders + * Bump Standards-Version to 3.8.2 + - Move to "java" section + - Add Vcs-* fields + - Add Homepage in debian/control + - Add a get-orig-source target + * Use debhelper 5 + - Bump debian/compat to 5 + - Build-Depends on debhelper >= 5 + * Update the license to Apache License 2.0 (Closes: #532884) + * Split API Javadoc into libcommons-codec-java-doc package (Closes: #506360) + -- Damien Raude-Morvan <[email protected]> Sat, 20 Jun 2009 00:02:17 +0200 + libcommons-codec-java (1.3-4) unstable; urgency=low * Removed explicit usage of jikes build compiler property Modified: trunk/libcommons-codec-java/debian/compat =================================================================== --- trunk/libcommons-codec-java/debian/compat 2009-06-19 22:03:48 UTC (rev 8543) +++ trunk/libcommons-codec-java/debian/compat 2009-06-19 22:04:53 UTC (rev 8544) @@ -1 +1 @@ -4 +5 Modified: trunk/libcommons-codec-java/debian/control =================================================================== --- trunk/libcommons-codec-java/debian/control 2009-06-19 22:03:48 UTC (rev 8543) +++ trunk/libcommons-codec-java/debian/control 2009-06-19 22:04:53 UTC (rev 8544) @@ -1,14 +1,18 @@ Source: libcommons-codec-java -Section: libs +Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Arnaud Vandyck <[email protected]>, Wolfgang Baer <[email protected]> -Build-Depends-Indep: debhelper (>= 4.2.30), kaffe (>= 2:1.1.4), junit, cdbs, ant -Standards-Version: 3.6.2 +Uploaders: Arnaud Vandyck <[email protected]>, Wolfgang Baer <[email protected]>, Damien Raude-Morvan <[email protected]> +Build-Depends: cdbs, debhelper (>= 5), ant, default-jdk-builddep +Build-Depends-Indep: ant-optional, junit +Standards-Version: 3.8.2 +Homepage: http://commons.apache.org/codec/ +Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-codec-java +Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-codec-java Package: libcommons-codec-java Architecture: all -Depends: kaffe (>= 2:1.1.5-3) | java1-runtime | java2-runtime +Depends: default-jre-headless | java2-runtime-headless, ${misc:Depends} Description: encoder and decoders such as Base64 and hexadecimal codec The codec package contains simple encoder and decoders for various formats such as Base64 and Hexadecimal. In addition to these widely @@ -16,4 +20,19 @@ collection of phonetic encoding utilities. . This is a part of the Apache Commons Project. - Home: <http://commons.apache.org/codec/> + + +Package: libcommons-codec-java-doc +Architecture: all +Section: doc +Depends: ${misc:Depends} +Suggests: libcommons-codec-java +Description: encoder and decoders such as Base64 and hexadecimal codec - documentation + The codec package contains simple encoder and decoders for various + formats such as Base64 and Hexadecimal. In addition to these widely + used encoders and decoders, the codec package also maintains a + collection of phonetic encoding utilities. + . + This is a part of the Apache Commons Project. + . + This package contains API Javadoc of Apache Commons Project Modified: trunk/libcommons-codec-java/debian/copyright =================================================================== --- trunk/libcommons-codec-java/debian/copyright 2009-06-19 22:03:48 UTC (rev 8543) +++ trunk/libcommons-codec-java/debian/copyright 2009-06-19 22:04:53 UTC (rev 8544) @@ -3,6 +3,8 @@ It was downloaded from http://commons.apache.org/codec/ +Copyright 2001-2008 The Apache Software Foundation + Upstream Authors: Henri Yandell <[email protected]>, Tim OBrien <[email protected]>, Scott Sanders <[email protected]>, Rodney Waldhoff @@ -20,60 +22,26 @@ http://commons.apache.org/codec/team-list.html Copyright: + 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 -/* - * ==================================================================== - * - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2001-2003 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgement: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgement may appear in the software itself, - * if and wherever such third-party acknowledgements normally appear. - * - * 4. The names "Apache", "The Jakarta Project", "Commons", and "Apache Software - * Foundation" must not be used to endorse or promote products derived - * from this software without prior written permission. For written - * permission, please contact [email protected]. - * - * 5. Products derived from this software may not be called "Apache", - * "Apache" nor may "Apache" appear in their name without prior - * written permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * <http://www.apache.org/>. - * - */ + 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 full text of the Apache License can be found + in the `/usr/share/common-licenses/Apache-2.0' file. + +-------------------------------------------------------------------------------- +src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java contains +test data from http://aspell.sourceforge.net/test/batch0.tab. + +Copyright (C) 2002 Kevin Atkinson ([email protected]). Verbatim copying +and distribution of this entire article is permitted in any medium, +provided this notice is preserved. +-------------------------------------------------------------------------------- Added: trunk/libcommons-codec-java/debian/libcommons-codec-java-doc.doc-base =================================================================== --- trunk/libcommons-codec-java/debian/libcommons-codec-java-doc.doc-base (rev 0) +++ trunk/libcommons-codec-java/debian/libcommons-codec-java-doc.doc-base 2009-06-19 22:04:53 UTC (rev 8544) @@ -0,0 +1,10 @@ +Document: libcommons-codec-java-doc +Title: API Javadoc for Apache Commons Codec +Author: Apache Software Foundation +Abstract: This is the API Javadoc provided by the Apache Commons Codec library. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libcommons-codec-java-doc/api/index.html +Files: /usr/share/doc/libcommons-codec-java-doc/api/* + Added: trunk/libcommons-codec-java/debian/libcommons-codec-java-doc.docs =================================================================== --- trunk/libcommons-codec-java/debian/libcommons-codec-java-doc.docs (rev 0) +++ trunk/libcommons-codec-java/debian/libcommons-codec-java-doc.docs 2009-06-19 22:04:53 UTC (rev 8544) @@ -0,0 +1 @@ +dist/docs/api Modified: trunk/libcommons-codec-java/debian/patches/01_build-xml-LICENSE.patch =================================================================== --- trunk/libcommons-codec-java/debian/patches/01_build-xml-LICENSE.patch 2009-06-19 22:03:48 UTC (rev 8543) +++ trunk/libcommons-codec-java/debian/patches/01_build-xml-LICENSE.patch 2009-06-19 22:04:53 UTC (rev 8544) @@ -1,19 +1,19 @@ ---- build.xml.orig 2004-08-19 13:28:27.615007848 +0200 -+++ build.xml 2004-08-19 13:28:58.394328680 +0200 +--- 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}"> + </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}"> Property changes on: trunk/libcommons-codec-java/debian/patches/01_build-xml-LICENSE.patch ___________________________________________________________________ Deleted: svn:eol-style - native Added: trunk/libcommons-codec-java/debian/patches/02_build-xml-tests.patch =================================================================== --- trunk/libcommons-codec-java/debian/patches/02_build-xml-tests.patch (rev 0) +++ trunk/libcommons-codec-java/debian/patches/02_build-xml-tests.patch 2009-06-19 22:04:53 UTC (rev 8544) @@ -0,0 +1,11 @@ +--- 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"> Modified: trunk/libcommons-codec-java/debian/rules =================================================================== --- trunk/libcommons-codec-java/debian/rules 2009-06-19 22:03:48 UTC (rev 8543) +++ trunk/libcommons-codec-java/debian/rules 2009-06-19 22:04:53 UTC (rev 8544) @@ -1,20 +1,14 @@ #!/usr/bin/make -f # debian/rules for libcommons-codec-java -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -# This is the debhelper compatibility version to use. -#export DH_COMPAT=4 - 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 -JAVA_HOME_DIRS := /usr/lib/kaffe -ANT_HOME := /usr/share/ant -DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar +JAVA_HOME := /usr/lib/jvm/default-java +DEB_JARS := junit ant-junit DEB_ANT_BUILD_TARGET := dist +DEB_ANT_CHECK_TARGET := test -LIBRARY=commons-codec -VERSION=1.3 +get-orig-source: + uscan --force-download --rename _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
