Author: onkarshinde-guest Date: 2011-06-01 06:07:30 +0000 (Wed, 01 Jun 2011) New Revision: 13735
Added: trunk/excalibur-logkit/debian/libexcalibur-logkit-java-doc.doc-base trunk/excalibur-logkit/debian/libexcalibur-logkit-java-doc.install trunk/excalibur-logkit/debian/libexcalibur-logkit-java.classpath Modified: trunk/excalibur-logkit/debian/changelog trunk/excalibur-logkit/debian/control trunk/excalibur-logkit/debian/patches/01_implement_abstract_methods.patch trunk/excalibur-logkit/debian/patches/02_fix_build_xml.patch trunk/excalibur-logkit/debian/patches/03_add_constructor.patch trunk/excalibur-logkit/debian/patches/04_disable_unit_test.patch trunk/excalibur-logkit/debian/rules Log: excalibur-logkit 2.0-5 Modified: trunk/excalibur-logkit/debian/changelog =================================================================== --- trunk/excalibur-logkit/debian/changelog 2011-05-31 16:55:09 UTC (rev 13734) +++ trunk/excalibur-logkit/debian/changelog 2011-06-01 06:07:30 UTC (rev 13735) @@ -1,3 +1,14 @@ +excalibur-logkit (2.0-5) unstable; urgency=low + + * Use libgeronimo-jms-1.1-spec-java instead of libjboss-j2ee-java as build + dependency. + * Use javahelper to set classpath and dependencies. + * Add -doc package containing API documentation. + * Add DEP-3 headers to all patches. + * Update standards version to 3.9.2. + + -- Onkar Shinde <onkarshi...@ubuntu.com> Sun, 29 May 2011 09:36:55 +0530 + excalibur-logkit (2.0-4) unstable; urgency=low * Servlet 2.5 transition: Also runtime-depend on libservlet2.5-java Modified: trunk/excalibur-logkit/debian/control =================================================================== --- trunk/excalibur-logkit/debian/control 2011-05-31 16:55:09 UTC (rev 13734) +++ trunk/excalibur-logkit/debian/control 2011-06-01 06:07:30 UTC (rev 13735) @@ -3,17 +3,31 @@ Priority: optional Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Onkar Shinde <onkarshi...@ubuntu.com> -Build-Depends: debhelper (>=5), cdbs, ant -Build-Depends-Indep: default-jdk, ant-optional, junit, libjboss-j2ee-java, libgnumail-java, liblog4j1.2-java, libservlet2.5-java -Standards-Version: 3.8.4 +Build-Depends: debhelper (>=5), cdbs, javahelper, ant +Build-Depends-Indep: default-jdk, default-jdk-doc, ant-optional, junit, libgeronimo-jms-1.1-spec-java, libgnumail-java, liblog4j1.2-java, libservlet2.5-java, libgnumail-java-doc, liblog4j1.2-java-doc, libservlet2.5-java-doc +Standards-Version: 3.9.2 Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/excalibur-logkit/ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/excalibur-logkit/ Homepage: http://excalibur.apache.org/ Package: libexcalibur-logkit-java Architecture: all -Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless, libgeronimo-jms-1.1-spec-java | libjboss-j2ee-java, libgnumail-java, liblog4j1.2-java, libservlet2.5-java +Depends: ${misc:Depends}, ${java:Depends} Description: Lightweight and fast designed logging toolkit for Java Excalibur Logkit (previously avalon logkit) is a lightweight, fast, securely designed logging toolkit. It is designed to integrate into existing applications. Logkit is more lightweight than Log4j. + . + This package contains the library jar. + +Package: libexcalibur-logkit-java-doc +Section: doc +Architecture: all +Depends: ${misc:Depends} +Recommends: ${java:Recommends} +Description: Lightweight and fast designed logging toolkit for Java (API docs) + Excalibur Logkit (previously avalon logkit) is a lightweight, fast, securely + designed logging toolkit. It is designed to integrate into existing + applications. Logkit is more lightweight than Log4j. + . + This package contains the API documentation. Added: trunk/excalibur-logkit/debian/libexcalibur-logkit-java-doc.doc-base =================================================================== --- trunk/excalibur-logkit/debian/libexcalibur-logkit-java-doc.doc-base (rev 0) +++ trunk/excalibur-logkit/debian/libexcalibur-logkit-java-doc.doc-base 2011-06-01 06:07:30 UTC (rev 13735) @@ -0,0 +1,7 @@ +Document: libexcalibur-logkit-java +Title: API documentation for libexcalibur-logkit-java +Section: Programming + +Format: HTML +Index: /usr/share/doc/libexcalibur-logkit-java/api/index.html +Files: /usr/share/doc/libexcalibur-logkit-java/api/*.html Added: trunk/excalibur-logkit/debian/libexcalibur-logkit-java-doc.install =================================================================== --- trunk/excalibur-logkit/debian/libexcalibur-logkit-java-doc.install (rev 0) +++ trunk/excalibur-logkit/debian/libexcalibur-logkit-java-doc.install 2011-06-01 06:07:30 UTC (rev 13735) @@ -0,0 +1 @@ +dist/docs/api usr/share/doc/libexcalibur-logkit-java/ Added: trunk/excalibur-logkit/debian/libexcalibur-logkit-java.classpath =================================================================== --- trunk/excalibur-logkit/debian/libexcalibur-logkit-java.classpath (rev 0) +++ trunk/excalibur-logkit/debian/libexcalibur-logkit-java.classpath 2011-06-01 06:07:30 UTC (rev 13735) @@ -0,0 +1 @@ +usr/share/java/excalibur-logkit.jar geronimo-jms-1.1-spec.jar gnumail.jar log4j-1.2.jar Modified: trunk/excalibur-logkit/debian/patches/01_implement_abstract_methods.patch =================================================================== --- trunk/excalibur-logkit/debian/patches/01_implement_abstract_methods.patch 2011-05-31 16:55:09 UTC (rev 13734) +++ trunk/excalibur-logkit/debian/patches/01_implement_abstract_methods.patch 2011-06-01 06:07:30 UTC (rev 13735) @@ -1,6 +1,8 @@ -diff -Nur -x '*.orig' -x '*~' excalibur-logkit-2.0/src/java/org/apache/log/output/db/DefaultDataSource.java excalibur-logkit-2.0.new/src/java/org/apache/log/output/db/DefaultDataSource.java ---- excalibur-logkit-2.0/src/java/org/apache/log/output/db/DefaultDataSource.java 2004-04-11 21:44:07.000000000 +0530 -+++ excalibur-logkit-2.0.new/src/java/org/apache/log/output/db/DefaultDataSource.java 2009-07-10 00:37:07.000000000 +0530 +Description: Add method stubs to build against current APIs. +Forwarded: not-needed +Author: Onkar Shinde <onshi...@ubuntu.com> +--- a/src/java/org/apache/log/output/db/DefaultDataSource.java 2011-05-29 14:56:35.000000000 +0530 ++++ b/src/java/org/apache/log/output/db/DefaultDataSource.java 2011-05-29 14:56:59.000000000 +0530 @@ -111,4 +111,14 @@ { m_logWriter = logWriter; Modified: trunk/excalibur-logkit/debian/patches/02_fix_build_xml.patch =================================================================== --- trunk/excalibur-logkit/debian/patches/02_fix_build_xml.patch 2011-05-31 16:55:09 UTC (rev 13734) +++ trunk/excalibur-logkit/debian/patches/02_fix_build_xml.patch 2011-06-01 06:07:30 UTC (rev 13735) @@ -1,6 +1,9 @@ -diff -Nur -x '*.orig' -x '*~' excalibur-logkit-2.0/build.xml excalibur-logkit-2.0.new/build.xml ---- excalibur-logkit-2.0/build.xml 2004-04-11 21:44:07.000000000 +0530 -+++ excalibur-logkit-2.0.new/build.xml 2009-07-10 01:06:21.000000000 +0530 +Description: Fix some problems in build.xml and link against system installed + javadocs. +Forwarded: not-needed +Author: Onkar Shinde <onshi...@ubuntu.com> +--- a/build.xml 2011-05-29 14:56:34.000000000 +0530 ++++ b/build.xml 2011-05-29 14:56:59.000000000 +0530 @@ -64,7 +64,7 @@ </fileset> </copy> @@ -25,7 +28,18 @@ </target> <target name="jar" description="o Create the jar" depends="compile,test"> <jar jarfile="target/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"> -@@ -228,4 +228,4 @@ +@@ -204,6 +204,10 @@ + <pathelement location="target/${final.name}.jar"> + </pathelement> + </classpath> ++ <link offline="true" packagelistLoc="/usr/share/doc/default-jdk-doc/api/" href="/usr/share/doc/default-jdk-doc/api/" /> ++ <link offline="true" packagelistLoc="/usr/share/doc/libgnumail-java/api/" href="/usr/share/doc/libgnumail-java/api/" /> ++ <link offline="true" packagelistLoc="/usr/share/doc/liblog4j1.2-java/api/" href="/usr/share/doc/liblog4j1.2-java/api/" /> ++ <link offline="true" packagelistLoc="/usr/share/doc/libservlet2.5-java/api/" href="/usr/share/doc/libservlet2.5-java/api/" /> + </javadoc> + </target> + <target name="get-deps" unless="noget" depends="init"> +@@ -228,4 +232,4 @@ <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar"> </unjar> </target> Modified: trunk/excalibur-logkit/debian/patches/03_add_constructor.patch =================================================================== --- trunk/excalibur-logkit/debian/patches/03_add_constructor.patch 2011-05-31 16:55:09 UTC (rev 13734) +++ trunk/excalibur-logkit/debian/patches/03_add_constructor.patch 2011-06-01 06:07:30 UTC (rev 13735) @@ -1,6 +1,9 @@ -diff -Nur -x '*.orig' -x '*~' excalibur-logkit-2.0/src/java/org/apache/log/output/net/SMTPOutputLogTarget.java excalibur-logkit-2.0.new/src/java/org/apache/log/output/net/SMTPOutputLogTarget.java ---- excalibur-logkit-2.0/src/java/org/apache/log/output/net/SMTPOutputLogTarget.java 2004-04-11 21:44:07.000000000 +0530 -+++ excalibur-logkit-2.0.new/src/java/org/apache/log/output/net/SMTPOutputLogTarget.java 2009-07-16 01:28:11.000000000 +0530 +Description: Patch from upstream CVS to fix building of excalibur-logger against + this package. +Forwarded: not-needed +Author: Onkar Shinde <onshi...@ubuntu.com> +--- a/src/java/org/apache/log/output/net/SMTPOutputLogTarget.java 2011-05-29 14:56:34.000000000 +0530 ++++ b/src/java/org/apache/log/output/net/SMTPOutputLogTarget.java 2011-05-29 14:56:59.000000000 +0530 @@ -58,6 +58,23 @@ // Buffer containing current mail Modified: trunk/excalibur-logkit/debian/patches/04_disable_unit_test.patch =================================================================== --- trunk/excalibur-logkit/debian/patches/04_disable_unit_test.patch 2011-05-31 16:55:09 UTC (rev 13734) +++ trunk/excalibur-logkit/debian/patches/04_disable_unit_test.patch 2011-06-01 06:07:30 UTC (rev 13735) @@ -1,6 +1,8 @@ -diff -Nur -x '*.orig' -x '*~' excalibur-logkit-2.0/src/test/org/apache/log/output/test/RevolvingFileStrategyTestCase.java excalibur-logkit-2.0.new/src/test/org/apache/log/output/test/RevolvingFileStrategyTestCase.java ---- excalibur-logkit-2.0/src/test/org/apache/log/output/test/RevolvingFileStrategyTestCase.java 2004-04-11 21:44:07.000000000 +0530 -+++ excalibur-logkit-2.0.new/src/test/org/apache/log/output/test/RevolvingFileStrategyTestCase.java 2009-08-12 01:32:56.000000000 +0530 +Description: Disable a junit test that fails randomly. +Forwarded: not-needed +Author: Onkar Shinde <onshi...@ubuntu.com> +--- a/src/test/org/apache/log/output/test/RevolvingFileStrategyTestCase.java 2011-05-29 14:53:26.000000000 +0530 ++++ b/src/test/org/apache/log/output/test/RevolvingFileStrategyTestCase.java 2011-05-29 14:56:26.000000000 +0530 @@ -152,6 +152,7 @@ assertEquals( "rotation", 5, strategy.getCurrentRotation() ); } Modified: trunk/excalibur-logkit/debian/rules =================================================================== --- trunk/excalibur-logkit/debian/rules 2011-05-31 16:55:09 UTC (rev 13734) +++ trunk/excalibur-logkit/debian/rules 2011-06-01 06:07:30 UTC (rev 13735) @@ -1,11 +1,13 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/javahelper.mk include /usr/share/cdbs/1/class/ant.mk -JAVA_HOME_DIRS := /usr/lib/jvm/default-java -DEB_JARS := ant-junit geronimo-jms-1.1-spec gnumail.jar jboss-j2ee junit log4j-1.2 servlet-api-2.5 -DEB_ANT_ARGS := -Dnoget=true -Dfinal.name=excalibur-logkit-${DEB_UPSTREAM_VERSION} -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4 +JAVA_HOME_DIRS := /usr/lib/jvm/default-java +DEB_JARS := ant-junit geronimo-jms-1.1-spec gnumail.jar junit log4j-1.2 servlet-api-2.5 +DEB_ANT_BUILD_TARGET := dist +DEB_ANT_ARGS := -Dnoget=true -Dfinal.name=excalibur-logkit-${DEB_UPSTREAM_VERSION} -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4 -Dlibdir=/usr/share/java install/libexcalibur-logkit-java:: dh_install target/excalibur-logkit-${DEB_UPSTREAM_VERSION}.jar usr/share/java/ _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
