[hsqldb1.8.0] 04/08: Imported Debian patch 1.8.0.10+dfsg-4
Rene Engelhard
rene at moszumanska.debian.org
Thu Sep 8 20:10:47 UTC 2016
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository hsqldb1.8.0.
commit 4f58b43f534dcb7e47a1550916aadf195b080f49
Author: Rene Engelhard <rene at debian.org>
Date: Sat Oct 31 17:01:57 2015 +0100
Imported Debian patch 1.8.0.10+dfsg-4
---
debian/changelog | 9 +++++++++
debian/control | 18 +-----------------
debian/patches/use-system-servlet.jar.diff | 6 +++---
debian/rules | 4 ----
src/org/hsqldb/jdbc/jdbcBlob.java | 2 --
src/org/hsqldb/jdbc/jdbcCallableStatement.java | 4 ----
src/org/hsqldb/jdbc/jdbcClob.java | 2 --
src/org/hsqldb/jdbc/jdbcConnection.java | 4 ----
src/org/hsqldb/jdbc/jdbcDataSource.java | 2 --
src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java | 4 ----
src/org/hsqldb/jdbc/jdbcParameterMetaData.java | 2 --
src/org/hsqldb/jdbc/jdbcPreparedStatement.java | 4 ----
src/org/hsqldb/jdbc/jdbcResultSet.java | 4 ----
src/org/hsqldb/jdbc/jdbcResultSetMetaData.java | 2 --
src/org/hsqldb/jdbc/jdbcStatement.java | 2 --
15 files changed, 13 insertions(+), 56 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a779ce2..d6354c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+hsqldb1.8.0 (1.8.0.10+dfsg-4) unstable; urgency=medium
+
+ * remove last remains of -gcj package (on kfreebsd). kfreebsd
+ is supposed to use OpenJDK, too now
+
+ * update to libservlet3.1-java (closes: #801013)
+
+ -- Rene Engelhard <rene at debian.org> Sat, 31 Oct 2015 17:01:57 +0100
+
hsqldb1.8.0 (1.8.0.10+dfsg-3) unstable; urgency=low
* upload to unstable
diff --git a/debian/control b/debian/control
index afa372c..2c3a96b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: hsqldb1.8.0
Section: oldlibs
Priority: optional
Maintainer: Rene Engelhard <rene at debian.org>
-Build-Depends: cdbs (>= 0.4.39), debhelper (>= 5), default-jdk, gcj-native-helper [kfreebsd-i386 kfreebsd-amd64], ant (>= 1.7), libservlet2.5-java, maven-repo-helper, javahelper
+Build-Depends: cdbs (>= 0.4.39), debhelper (>= 5), default-jdk, ant (>= 1.7), libservlet3.1-java, maven-repo-helper, javahelper
Standards-Version: 3.7.2
Package: libhsqldb1.8.0-java
@@ -22,19 +22,3 @@ Description: Java SQL database engine
.
Web site: http://hsqldb.org/
-Package: libhsqldb1.8.0-java-gcj
-Section: java
-Architecture: kfreebsd-i386 kfreebsd-amd64
-Depends: libhsqldb1.8.0-java (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
-Suggests: java-virtual-machine
-Description: Java SQL database engine (native code)
- HSQLDB is an SQL relational database engine written in Java. It has a
- JDBC driver and supports a rich subset of SQL-92 (BNF tree format) plus
- SQL:1999 and SQL:2003 enhancements. It offers a small, fast database
- engine that offers both in-memory and disk-based tables. Embedded and
- server modes are available. Additionally, it includes tools such as a
- minimal web server, in-memory query and management tools (can be run as
- applets), and a number of demonstration examples.
- .
- This package contains the natively compiled code for use by gij.
-
diff --git a/debian/patches/use-system-servlet.jar.diff b/debian/patches/use-system-servlet.jar.diff
index edbc8e7..d515a58 100644
--- a/debian/patches/use-system-servlet.jar.diff
+++ b/debian/patches/use-system-servlet.jar.diff
@@ -5,7 +5,7 @@
>
<classpath>
- <pathelement location="lib/servlet.jar"/>
-+ <pathelement location="/usr/share/java/servlet-api-2.5.jar"/>
++ <pathelement location="/usr/share/java/servlet-api-3.1.jar"/>
</classpath>
<include name="*.java"/>
<include name="org/hsqldb/*.java"/>
@@ -14,7 +14,7 @@
${src}/org/hsqldb/util/SqlTool.java"
destdir="${basedir}/doc/src"
- classpath="${basedir}/lib/servlet.jar;${basedir}/lib/junit.jar"
-+ classpath="/usr/share/java/servlet-api-2.5.jar;${basedir}/lib/junit.jar"
++ classpath="/usr/share/java/servlet-api-3.1.jar;${basedir}/lib/junit.jar"
author="true"
version="false"
use="true"
@@ -23,7 +23,7 @@
sourcepath="${src}"
destdir="${basedir}/doc/src"
- classpath="${basedir}/lib/servlet.jar;${basedir}/lib/junit.jar"
-+ classpath="/usr/share/java/servlet-api-2.5.jar;${basedir}/lib/junit.jar"
++ classpath="/usr/share/java/servlet-api-3.1.jar;${basedir}/lib/junit.jar"
author="true"
version="false"
use="true"
diff --git a/debian/rules b/debian/rules
index 6b56e02..afafbd3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -57,7 +57,3 @@ clean::
rm -f changelog.combined NEWS
mh_clean
-ifneq (,$(findstring kfreebsd,$(DEB_BUILD_ARCH)))
-install/libhsqldb1.8.0-java-gcj:: install-indep
- dh_nativejava -plibhsqldb1.8.0-java-gcj
-endif
diff --git a/src/org/hsqldb/jdbc/jdbcBlob.java b/src/org/hsqldb/jdbc/jdbcBlob.java
index 59a2aa8..ee0488a 100644
--- a/src/org/hsqldb/jdbc/jdbcBlob.java
+++ b/src/org/hsqldb/jdbc/jdbcBlob.java
@@ -462,7 +462,6 @@ public class jdbcBlob implements Blob {
}
//#ifdef JAVA6
-/*
public void free() throws SQLException
{
throw new UnsupportedOperationException("Not supported yet.");
@@ -472,7 +471,6 @@ public class jdbcBlob implements Blob {
{
throw new UnsupportedOperationException("Not supported yet.");
}
-*/
//#endif JAVA6
diff --git a/src/org/hsqldb/jdbc/jdbcCallableStatement.java b/src/org/hsqldb/jdbc/jdbcCallableStatement.java
index 8323934..b846bb7 100644
--- a/src/org/hsqldb/jdbc/jdbcCallableStatement.java
+++ b/src/org/hsqldb/jdbc/jdbcCallableStatement.java
@@ -37,11 +37,9 @@ import java.math.BigDecimal;
import java.sql.CallableStatement;
import java.sql.Date;
//#ifdef JAVA6
-/*
import java.sql.NClob;
import java.sql.RowId;
import java.sql.SQLXML;
-*/
//#endif JAVA6
import java.sql.Time;
import java.sql.Timestamp;
@@ -3106,7 +3104,6 @@ implements CallableStatement {
//#endif JAVA4
//#ifdef JAVA6
-/*
public void setPoolable(boolean poolable) throws SQLException
{
throw new UnsupportedOperationException("Not supported yet.");
@@ -3376,7 +3373,6 @@ implements CallableStatement {
{
throw new UnsupportedOperationException("Not supported yet.");
}
-*/
//#endif JAVA6
}
diff --git a/src/org/hsqldb/jdbc/jdbcClob.java b/src/org/hsqldb/jdbc/jdbcClob.java
index a904e14..fe442d9 100644
--- a/src/org/hsqldb/jdbc/jdbcClob.java
+++ b/src/org/hsqldb/jdbc/jdbcClob.java
@@ -464,7 +464,6 @@ public final class jdbcClob implements Clob {
}
//#ifdef JAVA6
-/*
public void free() throws SQLException
{
throw new UnsupportedOperationException("Not supported yet.");
@@ -474,6 +473,5 @@ public final class jdbcClob implements Clob {
{
throw new UnsupportedOperationException("Not supported yet.");
}
-*/
//#endif JAVA6
}
diff --git a/src/org/hsqldb/jdbc/jdbcConnection.java b/src/org/hsqldb/jdbc/jdbcConnection.java
index 31dae8a..1545217 100644
--- a/src/org/hsqldb/jdbc/jdbcConnection.java
+++ b/src/org/hsqldb/jdbc/jdbcConnection.java
@@ -43,11 +43,9 @@ import java.sql.Connection;
import java.sql.DatabaseMetaData;
//#ifdef JAVA6
-/*
import java.sql.NClob;
import java.sql.SQLClientInfoException;
import java.sql.SQLXML;
-*/
//#endif JAVA6
import java.sql.PreparedStatement;
@@ -2729,7 +2727,6 @@ public class jdbcConnection implements Connection {
}
//#ifdef JAVA6
-/*
public Clob createClob() throws SQLException
{
throw new UnsupportedOperationException("Not supported yet.");
@@ -2794,7 +2791,6 @@ public class jdbcConnection implements Connection {
{
throw new UnsupportedOperationException("Not supported yet.");
}
-*/
//#endif JAVA6
}
diff --git a/src/org/hsqldb/jdbc/jdbcDataSource.java b/src/org/hsqldb/jdbc/jdbcDataSource.java
index 941e374..df28278 100644
--- a/src/org/hsqldb/jdbc/jdbcDataSource.java
+++ b/src/org/hsqldb/jdbc/jdbcDataSource.java
@@ -312,7 +312,6 @@ public class jdbcDataSource implements Serializable {
}
//#ifdef JAVA6
-/*
public <T> T unwrap(Class<T> iface) throws SQLException
{
throw new UnsupportedOperationException("Not supported yet.");
@@ -322,7 +321,6 @@ public class jdbcDataSource implements Serializable {
{
throw new UnsupportedOperationException("Not supported yet.");
}
-*/
//#endif JAVA6
}
diff --git a/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java b/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java
index d94c836..a7d7d34 100644
--- a/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java
+++ b/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java
@@ -37,9 +37,7 @@ import java.sql.ResultSet;
import java.sql.SQLException;
//#ifdef JAVA6
-/*
import java.sql.RowIdLifetime;
-*/
//#endif JAVA6
import org.hsqldb.Column;
@@ -5650,7 +5648,6 @@ public class jdbcDatabaseMetaData implements DatabaseMetaData {
}
//#ifdef JAVA6
-/*
public RowIdLifetime getRowIdLifetime() throws SQLException
{
throw new UnsupportedOperationException("Not supported yet.");
@@ -5694,7 +5691,6 @@ public class jdbcDatabaseMetaData implements DatabaseMetaData {
{
throw new UnsupportedOperationException("Not supported yet.");
}
-*/
//#endif JAVA6
}
diff --git a/src/org/hsqldb/jdbc/jdbcParameterMetaData.java b/src/org/hsqldb/jdbc/jdbcParameterMetaData.java
index 5887681..e1ca209 100644
--- a/src/org/hsqldb/jdbc/jdbcParameterMetaData.java
+++ b/src/org/hsqldb/jdbc/jdbcParameterMetaData.java
@@ -383,7 +383,6 @@ public class jdbcParameterMetaData implements ParameterMetaData {
}
//#ifdef JAVA6
-/*
public <T> T unwrap(Class<T> iface) throws SQLException
{
throw new UnsupportedOperationException("Not supported yet.");
@@ -393,7 +392,6 @@ public class jdbcParameterMetaData implements ParameterMetaData {
{
throw new UnsupportedOperationException("Not supported yet.");
}
-*/
//#endif JAVA6
}
diff --git a/src/org/hsqldb/jdbc/jdbcPreparedStatement.java b/src/org/hsqldb/jdbc/jdbcPreparedStatement.java
index 3e25390..748b6bc 100644
--- a/src/org/hsqldb/jdbc/jdbcPreparedStatement.java
+++ b/src/org/hsqldb/jdbc/jdbcPreparedStatement.java
@@ -39,11 +39,9 @@ import java.math.BigDecimal;
import java.sql.Date;
//#ifdef JAVA6
-/*
import java.sql.NClob;
import java.sql.RowId;
import java.sql.SQLXML;
-*/
//#endif JAVA6
import java.sql.PreparedStatement;
@@ -2293,7 +2291,6 @@ implements PreparedStatement {
}
//#ifdef JAVA6
-/*
public void setPoolable(boolean poolable) throws SQLException
{
throw new UnsupportedOperationException("Not supported yet.");
@@ -2403,7 +2400,6 @@ implements PreparedStatement {
{
throw new UnsupportedOperationException("Not supported yet.");
}
-*/
//#endif JAVA6
}
diff --git a/src/org/hsqldb/jdbc/jdbcResultSet.java b/src/org/hsqldb/jdbc/jdbcResultSet.java
index 0b25c17..e429e11 100644
--- a/src/org/hsqldb/jdbc/jdbcResultSet.java
+++ b/src/org/hsqldb/jdbc/jdbcResultSet.java
@@ -76,11 +76,9 @@ import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
//#ifdef JAVA6
-/*
import java.sql.RowId;
import java.sql.NClob;
import java.sql.SQLXML;
-*/
//#endif JAVA6
import java.sql.SQLException;
@@ -5075,7 +5073,6 @@ public class jdbcResultSet implements ResultSet {
}
//#ifdef JAVA6
-/*
public RowId getRowId(int columnIndex) throws SQLException
{
throw new UnsupportedOperationException("Not supported yet.");
@@ -5325,7 +5322,6 @@ public class jdbcResultSet implements ResultSet {
{
throw new UnsupportedOperationException("Not supported yet.");
}
-*/
//#endif JAVA6
}
diff --git a/src/org/hsqldb/jdbc/jdbcResultSetMetaData.java b/src/org/hsqldb/jdbc/jdbcResultSetMetaData.java
index 9ef2ca7..21c2e7b 100644
--- a/src/org/hsqldb/jdbc/jdbcResultSetMetaData.java
+++ b/src/org/hsqldb/jdbc/jdbcResultSetMetaData.java
@@ -1145,7 +1145,6 @@ public class jdbcResultSetMetaData implements ResultSetMetaData {
}
}
//#ifdef JAVA6
-/*
public <T> T unwrap(Class<T> iface) throws SQLException
{
throw new UnsupportedOperationException("Not supported yet.");
@@ -1155,6 +1154,5 @@ public class jdbcResultSetMetaData implements ResultSetMetaData {
{
throw new UnsupportedOperationException("Not supported yet.");
}
-*/
//#endif JAVA6
}
diff --git a/src/org/hsqldb/jdbc/jdbcStatement.java b/src/org/hsqldb/jdbc/jdbcStatement.java
index 68a9c98..c7d67c8 100644
--- a/src/org/hsqldb/jdbc/jdbcStatement.java
+++ b/src/org/hsqldb/jdbc/jdbcStatement.java
@@ -1588,7 +1588,6 @@ public class jdbcStatement implements Statement {
}
}
//#ifdef JAVA6
-/*
public void setPoolable(boolean poolable) throws SQLException
{
throw new UnsupportedOperationException("Not supported yet.");
@@ -1608,6 +1607,5 @@ public class jdbcStatement implements Statement {
{
throw new UnsupportedOperationException("Not supported yet.");
}
-*/
//#endif JAVA6
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/hsqldb1.8.0.git
More information about the Pkg-openoffice-commits
mailing list