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 1b691a02ff6b2c6e108947fad1af35b5583a0cf1 Author: Kumar Appaiah <aku...@ee.iitm.ac.in> Date: Tue Sep 25 11:48:26 2007 +0000 + Build-Depend and Depend on libservlet2.3-java. * debian/patches/02_build_javadoc.patch: Added for building API docs through build.xml. --- debian/ant.properties | 1 + debian/changelog | 8 ++++-- debian/control | 4 +-- debian/docs | 2 +- debian/patches/02_build_javadoc.patch | 52 +++++++++++++++++++++++++++++++++++ debian/rules | 2 +- 6 files changed, 62 insertions(+), 7 deletions(-) diff --git a/debian/ant.properties b/debian/ant.properties index 2032481..9b939c6 100644 --- a/debian/ant.properties +++ b/debian/ant.properties @@ -3,4 +3,5 @@ log4j12.jar=/usr/share/java/log4j-1.2.jar logkit.jar=/usr/share/java/logkit.jar avalon-framework.jar=/usr/share/java/avalon-framework.jar junit.jar=/usr/share/java/junit.jar +servletapi.jar=/usr/share/java/servlet-2.3.jar test.failonerror=false diff --git a/debian/changelog b/debian/changelog index bc76a4e..030a37d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,17 +1,19 @@ -libcommons-logging-java (1.1-1) UNRELEASED; urgency=low +libcommons-logging-java (1.1-1) unstable; urgency=low * New upstream release. * debian/control: + Add Varun Hiremath and Kumar Appaiah as uploaders. + Add Homepage, XS-Vcs-Svn and XS-Vcs-Browser fields. + Move cdbs and debhelper to Build-Depends, rest to Build-Depends-Indep. + + Build-Depend and Depend on libservlet2.3-java. * debian/links: Removed, functionality in debian/rules. * debian/dirs: Removed, functionality in debian/rules. * debian/compat: Bump to 5. * 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 <aku...@ee.iitm.ac.in> Sat, 22 Sep 2007 01:45:56 +0530 + + -- Kumar Appaiah <aku...@ee.iitm.ac.in> Tue, 25 Sep 2007 17:23:33 +0530 libcommons-logging-java (1.0.4-6) unstable; urgency=low diff --git a/debian/control b/debian/control index 493f178..056ce9a 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Arnaud Vandyck <ab...@debian.org>, Michael Koch <konque...@gmx.de>, Kumar Appaiah <aku...@ee.iitm.ac.in>, Varun Hiremath <varunhirem...@gmail.com> Build-Depends: debhelper (>= 5), cdbs -Build-Depends-Indep: ant, ant-optional, liblogkit-java, liblog4j1.2-java, libavalon-framework-java, java-gcj-compat-dev, junit +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 @@ -12,7 +12,7 @@ Homepage: http://commons.apache.org/logging Package: libcommons-logging-java Architecture: all -Depends: java-gcj-compat | java1-runtime | java2-runtime +Depends: java-gcj-compat | java1-runtime | java2-runtime, libservlet2.3-java Suggests: liblog4j1.2-java, liblogkit-java, libavalon-framework-java Description: commmon wrapper interface for several logging APIs Provides a simple, component oriented interface together with wrappers for diff --git a/debian/docs b/debian/docs index 58ec8ed..2471b9b 100644 --- a/debian/docs +++ b/debian/docs @@ -1,2 +1,2 @@ STATUS.html -#dist/docs/api +dist/docs/api diff --git a/debian/patches/02_build_javadoc.patch b/debian/patches/02_build_javadoc.patch new file mode 100644 index 0000000..1e95664 --- /dev/null +++ b/debian/patches/02_build_javadoc.patch @@ -0,0 +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 --git a/debian/rules b/debian/rules index 315eb52..ec36816 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 +DEB_JARS := commons-logging log4j-1.2 logkit avalon-framework servlet-2.3 junit ant-junit servlet-2.3.jar 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 pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits