[pkg-java] r4260 - in trunk/commons-logging/debian: . patches

kumanna-guest at alioth.debian.org kumanna-guest at alioth.debian.org
Tue Sep 25 11:48:26 UTC 2007 

Author: kumanna-guest
Date: 2007-09-25 11:48:26 +0000 (Tue, 25 Sep 2007)
New Revision: 4260

Added:
   trunk/commons-logging/debian/patches/02_build_javadoc.patch
Modified:
   trunk/commons-logging/debian/ant.properties
   trunk/commons-logging/debian/changelog
   trunk/commons-logging/debian/control
   trunk/commons-logging/debian/docs
   trunk/commons-logging/debian/rules
Log:
  + Build-Depend and Depend on libservlet2.3-java.
* debian/patches/02_build_javadoc.patch: Added for building API docs through build.xml.

Modified: trunk/commons-logging/debian/ant.properties
===================================================================
--- trunk/commons-logging/debian/ant.properties	2007-09-25 07:22:48 UTC (rev 4259)
+++ trunk/commons-logging/debian/ant.properties	2007-09-25 11:48:26 UTC (rev 4260)
@@ -3,4 +3,5 @@
 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

Modified: trunk/commons-logging/debian/changelog
===================================================================
--- trunk/commons-logging/debian/changelog	2007-09-25 07:22:48 UTC (rev 4259)
+++ trunk/commons-logging/debian/changelog	2007-09-25 11:48:26 UTC (rev 4260)
@@ -1,18 +1,20 @@
-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 <akumar at ee.iitm.ac.in>  Sat, 22 Sep 2007 01:45:56 +0530
 
+ -- Kumar Appaiah <akumar at ee.iitm.ac.in>  Tue, 25 Sep 2007 17:23:33 +0530
+
 libcommons-logging-java (1.0.4-6) unstable; urgency=low
 
   * Use java-gcj-compat instead of kaffe.

Modified: trunk/commons-logging/debian/control
===================================================================
--- trunk/commons-logging/debian/control	2007-09-25 07:22:48 UTC (rev 4259)
+++ trunk/commons-logging/debian/control	2007-09-25 11:48:26 UTC (rev 4260)
@@ -4,7 +4,7 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <abdyk at debian.org>, Michael Koch <konqueror at gmx.de>, Kumar Appaiah <akumar at ee.iitm.ac.in>, Varun Hiremath <varunhiremath at 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 @@
 
 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 

Modified: trunk/commons-logging/debian/docs
===================================================================
--- trunk/commons-logging/debian/docs	2007-09-25 07:22:48 UTC (rev 4259)
+++ trunk/commons-logging/debian/docs	2007-09-25 11:48:26 UTC (rev 4260)
@@ -1,2 +1,2 @@
 STATUS.html
-#dist/docs/api
+dist/docs/api

Added: trunk/commons-logging/debian/patches/02_build_javadoc.patch
===================================================================
--- trunk/commons-logging/debian/patches/02_build_javadoc.patch	                        (rev 0)
+++ trunk/commons-logging/debian/patches/02_build_javadoc.patch	2007-09-25 11:48:26 UTC (rev 4260)
@@ -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="&lt;h1&gt;${component.title} (Version
++		       ${component.version})&lt;/h1&gt;"
++             windowtitle="${component.title} (Version
++			  ${component.version})"
++             bottom='Copyright 2002-2004 The Apache Software
++		     Foundation.&lt;!--
++
++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.--&gt;'>
++      <classpath refid="test.classpath"/>
++    </javadoc>
++  </target>
+ 
+ </project>

Modified: trunk/commons-logging/debian/rules
===================================================================
--- trunk/commons-logging/debian/rules	2007-09-25 07:22:48 UTC (rev 4259)
+++ trunk/commons-logging/debian/rules	2007-09-25 11:48:26 UTC (rev 4260)
@@ -8,7 +8,7 @@
 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

More information about the pkg-java-commits mailing list