[excalibur-logkit] 09/32: excalibur-logkit 2.0-5
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Mar 29 00:30:44 BST 2018
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository excalibur-logkit.
commit aec9dedc046da74f909b54dba5e6d8551f098388
Author: Onkar Shinde <onkarshinde at ubuntu.com>
Date: Wed Jun 1 06:07:30 2011 +0000
excalibur-logkit 2.0-5
---
debian/changelog | 11 +++++++++++
debian/control | 22 ++++++++++++++++++----
debian/libexcalibur-logkit-java-doc.doc-base | 7 +++++++
debian/libexcalibur-logkit-java-doc.install | 1 +
debian/libexcalibur-logkit-java.classpath | 1 +
debian/patches/01_implement_abstract_methods.patch | 8 +++++---
debian/patches/02_fix_build_xml.patch | 22 ++++++++++++++++++----
debian/patches/03_add_constructor.patch | 9 ++++++---
debian/patches/04_disable_unit_test.patch | 8 +++++---
debian/rules | 8 +++++---
10 files changed, 77 insertions(+), 20 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d08712d..3f80045 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 <onkarshinde at 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
diff --git a/debian/control b/debian/control
index 31ad89b..4e598fc 100644
--- a/debian/control
+++ b/debian/control
@@ -3,17 +3,31 @@ Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Onkar Shinde <onkarshinde at 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.
diff --git a/debian/libexcalibur-logkit-java-doc.doc-base b/debian/libexcalibur-logkit-java-doc.doc-base
new file mode 100644
index 0000000..0076524
--- /dev/null
+++ b/debian/libexcalibur-logkit-java-doc.doc-base
@@ -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
diff --git a/debian/libexcalibur-logkit-java-doc.install b/debian/libexcalibur-logkit-java-doc.install
new file mode 100644
index 0000000..6f8fd09
--- /dev/null
+++ b/debian/libexcalibur-logkit-java-doc.install
@@ -0,0 +1 @@
+dist/docs/api usr/share/doc/libexcalibur-logkit-java/
diff --git a/debian/libexcalibur-logkit-java.classpath b/debian/libexcalibur-logkit-java.classpath
new file mode 100644
index 0000000..c3ad65c
--- /dev/null
+++ b/debian/libexcalibur-logkit-java.classpath
@@ -0,0 +1 @@
+usr/share/java/excalibur-logkit.jar geronimo-jms-1.1-spec.jar gnumail.jar log4j-1.2.jar
diff --git a/debian/patches/01_implement_abstract_methods.patch b/debian/patches/01_implement_abstract_methods.patch
index 87cc383..c4fab07 100644
--- a/debian/patches/01_implement_abstract_methods.patch
+++ b/debian/patches/01_implement_abstract_methods.patch
@@ -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 <onshinde at 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;
diff --git a/debian/patches/02_fix_build_xml.patch b/debian/patches/02_fix_build_xml.patch
index 7c55057..d173e16 100644
--- a/debian/patches/02_fix_build_xml.patch
+++ b/debian/patches/02_fix_build_xml.patch
@@ -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 <onshinde at 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 @@ diff -Nur -x '*.orig' -x '*~' excalibur-logkit-2.0/build.xml excalibur-logkit-2.
</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>
diff --git a/debian/patches/03_add_constructor.patch b/debian/patches/03_add_constructor.patch
index 63e4cdf..20e2793 100644
--- a/debian/patches/03_add_constructor.patch
+++ b/debian/patches/03_add_constructor.patch
@@ -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 <onshinde at 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
diff --git a/debian/patches/04_disable_unit_test.patch b/debian/patches/04_disable_unit_test.patch
index dfdcf18..94c9905 100644
--- a/debian/patches/04_disable_unit_test.patch
+++ b/debian/patches/04_disable_unit_test.patch
@@ -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 <onshinde at 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() );
}
diff --git a/debian/rules b/debian/rules
index 95d8e1a..f27329d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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/
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/excalibur-logkit.git
More information about the pkg-java-commits
mailing list