This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libcommons-logging-java.
commit 663f8de079728cdde016200c88352e26ab88d9c9 Author: Kumar Appaiah <[email protected]> Date: Mon Dec 10 03:31:13 2007 +0000 * New upstream release. * debian/patches: + Refresh 01_target13_BuildXml.patch and 02_build_javadoc.patch. * debian/control: + Make XS-Svn-* fields Svn-*, as dpkg supports them now. + Standards version is now 3.7.3. * debian/copyright: + Add copyright, upstream authors. + Add Debian packaging copyright. --- debian/changelog | 20 ++++-- debian/control | 8 +-- debian/copyright | 29 ++++++++- debian/patches/01_target13_BuildXml.patch | 8 +-- debian/patches/02_build_javadoc.patch | 104 +++++++++++++++--------------- debian/rules | 2 +- 6 files changed, 102 insertions(+), 69 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9ecfcd8..153a7f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,13 @@ -libcommons-logging-java (1.1-2) UNRELEASED; urgency=low +libcommons-logging-java (1.1.1-1) UNRELEASED; urgency=low - * NOT RELEASED YET - - -- Varun Hiremath <[email protected]> Mon, 08 Oct 2007 18:31:10 +0530 + * New upstream release. + * debian/patches: + + Refresh 01_target13_BuildXml.patch and 02_build_javadoc.patch. + * debian/control: + + Make XS-Svn-* fields Svn-*, as dpkg supports them now. + + Standards version is now 3.7.3. + + -- Kumar Appaiah <[email protected]> Mon, 10 Dec 2007 08:52:17 +0530 libcommons-logging-java (1.1-1) unstable; urgency=low @@ -18,8 +23,11 @@ libcommons-logging-java (1.1-1) unstable; urgency=low * debian/patches/01_target13_BuildXml.patch: updated for new upstream release. * debian/patches/02_build_javadoc.patch: Added for building API docs through build.xml. * debian/watch: Bump to version 3. - - -- Kumar Appaiah <[email protected]> Tue, 25 Sep 2007 17:23:33 +0530 + * debian/copyright: + + Add copyright, upstream authors. + + Add Debian packaging copyright. + + -- Kumar Appaiah <[email protected]> Wed, 26 Sep 2007 06:51:56 +0530 libcommons-logging-java (1.0.4-6) unstable; urgency=low diff --git a/debian/control b/debian/control index 056ce9a..ac8166f 100644 --- a/debian/control +++ b/debian/control @@ -4,10 +4,10 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Arnaud Vandyck <[email protected]>, Michael Koch <[email protected]>, Kumar Appaiah <[email protected]>, Varun Hiremath <[email protected]> Build-Depends: debhelper (>= 5), cdbs -Build-Depends-Indep: ant, ant-optional, liblogkit-java, liblog4j1.2-java, libavalon-framework-java, java-gcj-compat-dev, junit, libservlet2.3-java -Standards-Version: 3.7.2 -XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/commons-logging -XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/commons-logging +Build-Depends-Indep: ant-optional, liblogkit-java, liblog4j1.2-java, libavalon-framework-java, java-gcj-compat-dev, junit, libservlet2.3-java +Standards-Version: 3.7.3 +Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/commons-logging +Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/commons-logging Homepage: http://commons.apache.org/logging Package: libcommons-logging-java diff --git a/debian/copyright b/debian/copyright index b973330..b7400e7 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,8 +3,25 @@ Mon, 5 Nov 2001 08:15:04 +0900. It was downloaded from http://jakarta.apache.org/commons/ - -Copyright: +Authors: The Apache Commons Logging Developers + +Various parts of the source code written by: + Brian Stansberry + Costin Manolache + Craig R. McClanahan + Richard A. Sitze + Robert Burrell Donkin + Rod Waldhoff + Sean C. Sullivan + Berin Loritsch <[email protected]> + Peter Donald <[email protected]> + Neeme Praks <[email protected]> + Scott Sanders <[email protected]> + Vince Eagen <[email protected]> + +Copyright: 2001 - 2006, The Apache Software Foundation. + +License: Apache License Version 2.0, January 2004 @@ -207,3 +224,11 @@ Copyright: 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. + +Debian packaging: (C) 2001 - 2004, Takashi Okamoto <[email protected]> + (C) 2005 - 2007, Arnaud Vandyck <[email protected]>, Wolfgang Baer <[email protected]> + (C) 2007, Michael Koch, <[email protected]>, Varun Hiremath <[email protected]>, + Kumar Appaiah <[email protected]> + +The Debian packaging of this package is licensed under the Apache +Software License 2.0 (see above). diff --git a/debian/patches/01_target13_BuildXml.patch b/debian/patches/01_target13_BuildXml.patch index 139b3ad..bc730d6 100644 --- a/debian/patches/01_target13_BuildXml.patch +++ b/debian/patches/01_target13_BuildXml.patch @@ -1,7 +1,7 @@ -diff -Nur libcommons-logging-java-1.1/build.xml libcommons-logging-java-1.1.new/build.xml ---- libcommons-logging-java-1.1/build.xml 2006-05-10 03:15:08.000000000 +0530 -+++ libcommons-logging-java-1.1.new/build.xml 2007-09-22 01:08:23.000000000 +0530 -@@ -125,10 +125,10 @@ +diff -Nur libcommons-logging-java-1.1.1/build.xml libcommons-logging-java-1.1.1.new/build.xml +--- libcommons-logging-java-1.1.1/build.xml 2007-11-22 04:57:52.000000000 +0530 ++++ libcommons-logging-java-1.1.1.new/build.xml 2007-12-10 08:55:01.000000000 +0530 +@@ -127,10 +127,10 @@ <!-- ========== Compiler Defaults ========================================= --> <!-- Version of java class files to generate. --> diff --git a/debian/patches/02_build_javadoc.patch b/debian/patches/02_build_javadoc.patch index 1e95664..6b8e5e4 100644 --- a/debian/patches/02_build_javadoc.patch +++ b/debian/patches/02_build_javadoc.patch @@ -1,52 +1,52 @@ -diff -Nur libcommons-logging-java-1.1/build.xml libcommons-logging-java-1.1.new/build.xml ---- libcommons-logging-java-1.1/build.xml 2006-05-10 03:15:08.000000000 +0530 -+++ libcommons-logging-java-1.1.new/build.xml 2007-09-25 17:11:20.000000000 +0530 -@@ -613,7 +613,7 @@ - </target> - - -- <target name="all" depends="clean,compile,test" -+ <target name="all" depends="clean,compile,test,javadoc" - description="Clean and compile all components"/> - - -@@ -772,5 +772,39 @@ - One or more unit tests failed. - </fail> - </target> -+ <target name="javadoc" depends="compile" -+ description="Create component Javadoc documentation"> -+ <mkdir dir="${dist.home}"/> -+ <mkdir dir="${dist.home}/docs"/> -+ <mkdir dir="${dist.home}/docs/api"/> -+ <javadoc sourcepath="${source.home}" -+ destdir="${dist.home}/docs/api" -+ overview="${source.home}/overview.html" -+ packagenames="org.apache.commons.*" -+ author="true" -+ private="true" -+ version="true" -+ doctitle="<h1>${component.title} (Version -+ ${component.version})</h1>" -+ windowtitle="${component.title} (Version -+ ${component.version})" -+ bottom='Copyright 2002-2004 The Apache Software -+ Foundation.<!-- -+ -+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.-->'> -+ <classpath refid="test.classpath"/> -+ </javadoc> -+ </target> - - </project> +diff -Nur libcommons-logging-java-1.1.1/build.xml libcommons-logging-java-1.1.1.new/build.xml +--- libcommons-logging-java-1.1.1/build.xml 2007-12-10 08:55:12.000000000 +0530 ++++ libcommons-logging-java-1.1.1.new/build.xml 2007-12-10 08:55:55.000000000 +0530 +@@ -625,7 +625,7 @@ + </target> + + +- <target name="all" depends="clean,compile,test" ++ <target name="all" depends="clean,compile,test,javadoc" + description="Clean and compile all components"/> + + +@@ -784,5 +784,39 @@ + One or more unit tests failed. + </fail> + </target> ++ <target name="javadoc" depends="compile" ++ description="Create component Javadoc documentation"> ++ <mkdir dir="${dist.home}"/> ++ <mkdir dir="${dist.home}/docs"/> ++ <mkdir dir="${dist.home}/docs/api"/> ++ <javadoc sourcepath="${source.home}" ++ destdir="${dist.home}/docs/api" ++ overview="${source.home}/overview.html" ++ packagenames="org.apache.commons.*" ++ author="true" ++ private="true" ++ version="true" ++ doctitle="<h1>${component.title} (Version ++ ${component.version})</h1>" ++ windowtitle="${component.title} (Version ++ ${component.version})" ++ bottom='Copyright 2002-2004 The Apache Software ++ Foundation.<!-- ++ ++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.-->'> ++ <classpath refid="test.classpath"/> ++ </javadoc> ++ </target> + + </project> diff --git a/debian/rules b/debian/rules index ec36816..315eb52 100755 --- a/debian/rules +++ b/debian/rules @@ -8,7 +8,7 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk JAVA_HOME := /usr/lib/jvm/java-gcj ANT_HOME := /usr/share/ant -DEB_JARS := commons-logging log4j-1.2 logkit avalon-framework servlet-2.3 junit ant-junit servlet-2.3.jar +DEB_JARS := commons-logging log4j-1.2 logkit avalon-framework servlet-2.3 junit ant-junit DEB_ANT_BUILD_TARGET := dist -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libcommons-logging-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
