[pkg-java] r6797 - in trunk/liblogkit-java/debian: . patches

[doko at alioth.debian.org]

Author: doko
Date: 2008-07-30 18:30:55 +0000 (Wed, 30 Jul 2008)
New Revision: 6797

Added:
   trunk/liblogkit-java/debian/patches/
   trunk/liblogkit-java/debian/patches/defaultdatasource.diff
Modified:
   trunk/liblogkit-java/debian/changelog
   trunk/liblogkit-java/debian/control
   trunk/liblogkit-java/debian/rules
Log:
  * (Build-)depend on default-jre/-jdk.
  * org/apache/log/output/db/DefaultDataSource (unwrap, isWrapperFor):
    Implement, throw UnsupportedOperationException.


Modified: trunk/liblogkit-java/debian/changelog
===================================================================
--- trunk/liblogkit-java/debian/changelog	2008-07-30 17:57:08 UTC (rev 6796)
+++ trunk/liblogkit-java/debian/changelog	2008-07-30 18:30:55 UTC (rev 6797)
@@ -1,3 +1,11 @@
+liblogkit-java (1.2.2-10) UNRELEASED; urgency=low
+
+  * (Build-)depend on default-jre/-jdk.
+  * org/apache/log/output/db/DefaultDataSource (unwrap, isWrapperFor):
+    Implement, throw UnsupportedOperationException.
+
+ -- Matthias Klose <doko at debian.org>  Wed, 30 Jul 2008 17:57:28 +0000
+
 liblogkit-java (1.2.2-9) unstable; urgency=low
 
   * Use java-gcj-compat instead of kaffe.

Modified: trunk/liblogkit-java/debian/control
===================================================================
--- trunk/liblogkit-java/debian/control	2008-07-30 17:57:08 UTC (rev 6796)
+++ trunk/liblogkit-java/debian/control	2008-07-30 18:30:55 UTC (rev 6797)
@@ -3,12 +3,12 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 4.2.30), ant, ant-optional, java-gcj-compat-dev, liboro-java(>= 2.0.8), cdbs (>= 0.4.8), junit, libservlet2.3-java, libgnumail-java, libgnujaf-java
+Build-Depends: debhelper (>= 4.2.30), ant, ant-optional, default-jdk, liboro-java(>= 2.0.8), cdbs (>= 0.4.8), junit, libservlet2.3-java, libgnumail-java, libgnujaf-java
 Standards-Version: 3.7.2
 
 Package: liblogkit-java
 Architecture: all
-Depends: java-gcj-compat | java2-runtime | java1-runtime
+Depends: default-jre-headless | java2-runtime-headless | java1-runtime-headless
 Suggests: libservlet2.3-java, libgnumail-java
 Description: Lightweight and fast designed logging toolkit for Java
  LogKit is a logging toolkit designed for secure performance orientated

Added: trunk/liblogkit-java/debian/patches/defaultdatasource.diff
===================================================================
--- trunk/liblogkit-java/debian/patches/defaultdatasource.diff	                        (rev 0)
+++ trunk/liblogkit-java/debian/patches/defaultdatasource.diff	2008-07-30 18:30:55 UTC (rev 6797)
@@ -0,0 +1,17 @@
+--- liblogkit-java-1.2.2.orig/src/java/org/apache/log/output/db/DefaultDataSource.java
++++ liblogkit-java-1.2.2/src/java/org/apache/log/output/db/DefaultDataSource.java
+@@ -149,4 +149,14 @@
+     {
+         m_logWriter = logWriter;
+     }
++
++    public Object unwrap(Class iface) throws java.sql.SQLException
++    {
++	throw new UnsupportedOperationException();
++    }
++
++    public boolean isWrapperFor(Class iface) throws java.sql.SQLException
++    {
++	throw new UnsupportedOperationException();
++    }
+ }

Modified: trunk/liblogkit-java/debian/rules
===================================================================
--- trunk/liblogkit-java/debian/rules	2008-07-30 17:57:08 UTC (rev 6796)
+++ trunk/liblogkit-java/debian/rules	2008-07-30 18:30:55 UTC (rev 6797)
@@ -7,7 +7,7 @@
 
 export LANG=en_US.ISO-8859-1
 
-JAVA_HOME	 := /usr/lib/jvm/java-gcj
+JAVA_HOME	 := /usr/lib/jvm/default-java
 ANT_HOME	 := /usr/share/ant
 UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | cut -d- -f1)
 DEB_JARS 	 := $(ANT_HOME)/lib/ant-junit.jar junit servlet-2.3 gnumail activation