--- hsqldb1.8.0-1.8.0.10+dfsg.orig/build/build.xml-old +++ hsqldb1.8.0-1.8.0.10+dfsg/build/build.xml-old @@ -0,0 +1,1233 @@ + + + + + + + + + + + + + + + + + + + + + + + + + jar filename build command explanation +-------------- ------------- ----------------------------------- +hsqldb.jar ant hsqldb Default distribution jar +hsqljdbc.jar ant hsqljdbc JDBC client only. (No direct urls + of form jdbc:hsqldb:mem/file/res:*) +hsqldbmain.jar ant hsqldbmain No utility programs +hsqldbutil.jar ant hsqldbutil Utility programs only. No JDBC + driver. (Includes SqlTool and + DatabaseManagers) +hsqldbmin.jar ant hsqldbmin No utility or server programs. + (Include JDBC driver, but no support + for urls of form jdbc:hsqldb:ht*...) +hsqldbtest.jar ant hsqldbtest All, including test classes +hsqldbz.jar ant hsqldbz Min jar plus necessary util classes + for Zaurus +hsqltool.jar ant hsqltool SqlTool client and JDBC driver. + (No direct urls of form + jdbc:hsqldb:mem/file/res:*) +transfer.jar ant transfer Transfer Tool classes only. + +jars built with JDK 1.2 OR 1.3 can now be used with JRE 1.1. + + + + + + + + + + + + + + + + + + + + + + + usage: + ant -help Display ant help screen + ant -projecthelp Display all invocable targets + ant explainjars List all targets which build jar files + ant ANYTHING ELSE Run 'ant -projecthelp' for details + + jars built with JDK 1.2 OR 1.3 can now be used with JRE 1.1 + +examples: + ant jar + ant clean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --- hsqldb1.8.0-1.8.0.10+dfsg.orig/debian/README.maintainer +++ hsqldb1.8.0-1.8.0.10+dfsg/debian/README.maintainer @@ -0,0 +1,7 @@ +Steps to produce a .orig tarball from the upstream distribution zips: + +unzip hsqldb_1_7_3_2.zip +rm hsqldb/lib/hsqldb.jar +rm hsqldb/lib/servlet.jar +tar -c -f hsqldb_1.7.3.2.orig.tar hsqldb/ +gzip --best hsqldb_1.7.3.2.orig.tar --- hsqldb1.8.0-1.8.0.10+dfsg.orig/debian/bin/Makefile +++ hsqldb1.8.0-1.8.0.10+dfsg/debian/bin/Makefile @@ -0,0 +1,16 @@ +scripts = $(addprefix hsqldb-,databasemanager databasemanagerswing transfer querytool sqltool) + +all: $(scripts) + +hsqldb-databasemanager: class=DatabaseManager +hsqldb-databasemanagerswing: class=DatabaseManagerSwing +hsqldb-transfer: class=Transfer +hsqldb-querytool: class=QueryTool +hsqldb-sqltool: class=SqlTool + +$(scripts): hsqldb.in + sed "s/@CLASS@/$(class)/g" $< >$@ + chmod a+x $@ + +clean: + rm -f $(scripts) --- hsqldb1.8.0-1.8.0.10+dfsg.orig/debian/bin/hsqldb.in +++ hsqldb1.8.0-1.8.0.10+dfsg/debian/bin/hsqldb.in @@ -0,0 +1,5 @@ +#! /bin/sh + +set -e + +exec java -cp $CLASSPATH:/usr/share/java/hsqldbutil.jar:/usr/share/java/hsqldb.jar:/usr/share/java/postgresql.jar:/usr/share/java/mysql.jar "org.hsqldb.util.@CLASS@" "$@" --- hsqldb1.8.0-1.8.0.10+dfsg.orig/debian/bin/hsqldb.xpm +++ hsqldb1.8.0-1.8.0.10+dfsg/debian/bin/hsqldb.xpm @@ -0,0 +1,193 @@ +/* XPM */ +static char *dummy[]={ +"32 32 158 2", +"Qt c #000000", +".v c #000101", +".C c #010102", +".N c #1a3040", +".D c #1a313f", +".# c #1b3242", +".w c #1c3444", +".l c #1d3748", +".c c #1d3749", +".9 c #1e3749", +"aB c #2d536d", +".a c #3c7094", +"ab c #3d7296", +".b c #3d7297", +"#v c #3e7296", +"a. c #3f7397", +"#z c #437598", +"#D c #447699", +"#. c #4f91bd", +"#e c #4f91be", +".3 c #4f92bf", +".O c #4f93c1", +".m c #5091bd", +".d c #5092bf", +".W c #5093c1", +".E c #5094c1", +".x c #5193c0", +".k c #549dcf", +".0 c #559dcf", +"#Z c #559ecf", +".t c #569ecf", +"#8 c #579ecf", +"#q c #589ed0", +"aj c #589fcf", +"#4 c #589fd0", +".R c #599fd0", +"#H c #59a0d0", +"#r c #5a9fd0", +"#1 c #5aa0d1", +".B c #5ba0d1", +"#Q c #5ba1d1", +".u c #5ca1d1", +"aA c #5ea2d1", +"#0 c #5ea2d2", +"#l c #5fa2d2", +"ax c #60a3d1", +"#c c #60a3d2", +"#W c #60a4d2", +".j c #61a3d2", +".S c #61a4d2", +"ah c #61a4d3", +"#y c #62a4d2", +"#P c #63a5d3", +".7 c #64a5d3", +"#m c #64a6d3", +".M c #65a5d4", +"#O c #65a6d3", +"#g c #65a6d4", +"#C c #66a6d4", +"#S c #66a7d4", +"#Y c #67a7d4", +"aw c #67a7d5", +"aa c #68a7d4", +".6 c #68a8d4", +".i c #68a8d5", +"#b c #69a9d4", +"#N c #6aa8d5", +"#K c #6aa9d5", +"#I c #6ba9d5", +"at c #6ba9d6", +"aq c #6caad6", +"#w c #6da9d6", +".H c #6daad6", +".s c #6eaad6", +"ai c #6eabd6", +"#L c #6fabd6", +"#k c #70acd7", +".h c #71acd7", +"an c #72acd8", +"am c #72add7", +"#6 c #72add8", +"#o c #73add8", +"ao c #73aed8", +".Z c #74aed8", +".I c #74aed9", +"#f c #75aed8", +".e c #76afd9", +".X c #76b0d9", +".4 c #77afd8", +"## c #77b0d9", +"a# c #78b0d9", +".1 c #79b0da", +".T c #79b1da", +"#E c #7ab1da", +"ap c #7ab2da", +"#u c #7bb1db", +".P c #7bb2da", +".n c #7cb2da", +"ak c #7cb2db", +"ae c #7cb3db", +"#9 c #7db3da", +".V c #7db3db", +".A c #7eb3db", +"#B c #7fb4db", +".2 c #7fb4dc", +"#U c #80b4db", +"#s c #80b4dc", +"af c #82b5dc", +"az c #82b6dd", +".g c #83b6dd", +"#j c #83b7dc", +"#h c #84b7dd", +".G c #85b7dd", +"ar c #86b7dd", +"#7 c #86b8dd", +".L c #87b8de", +"#x c #87b9de", +".f c #88b9de", +"#T c #89b9df", +"#i c #89badf", +"#G c #8abadf", +"#5 c #8bbadf", +"ac c #8bbbdf", +"#p c #8cbbdf", +"#X c #8cbbe0", +".Q c #8dbbe0", +".J c #8dbce0", +"#d c #8ebce0", +"ag c #8fbde0", +"#M c #8fbde1", +"#J c #90bde0", +"#R c #90bde1", +"au c #90bee1", +".r c #91bde1", +"av c #91bee1", +"#A c #92bee1", +".8 c #93bee1", +"#n c #93bfe1", +".F c #93bfe2", +".5 c #94bfe2", +"#2 c #94c0e2", +"ay c #95bfe2", +".U c #95c0e2", +"#V c #95c0e3", +"as c #96c0e3", +".K c #96c1e3", +"#a c #97c1e3", +".Y c #98c1e3", +"#3 c #98c2e3", +"#t c #98c2e4", +"al c #99c2e3", +".z c #99c2e4", +".o c #9ac2e4", +".y c #9ac3e4", +".q c #9bc3e4", +"#F c #9cc3e4", +"ad c #9cc4e4", +".p c #9cc4e5", +"QtQtQtQtQtQtQtQtQt.#.a.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b.b", +"QtQtQtQtQtQtQtQt.c.d.e.f.f.f.f.f.f.f.f.f.f.f.f.f.f.g.h.i.i.i.j.k", +"QtQtQtQtQtQtQt.l.m.n.o.p.p.p.p.p.p.p.p.p.p.p.p.p.p.q.r.s.t.k.u.k", +"QtQtQtQtQt.v.w.x.n.y.p.p.p.p.p.p.p.p.p.p.p.p.p.p.p.p.p.z.A.B.u.k", +"QtQtQtQt.C.D.E.n.y.p.p.p.y.F.G.e.h.H.I.A.J.K.q.p.p.p.p.p.q.L.M.k", +"QtQtQt.v.N.O.P.q.p.p.q.Q.s.R.k.k.k.k.k.k.k.S.T.U.q.p.p.p.p.p.V.k", +"QtQtQt.w.W.X.p.p.p.Y.Z.0.k.k.k.k.k.k.k.k.k.k.k.R.1.o.p.p.p.p.2.k", +"QtQt.l.3.4.y.p.p.5.6.k.k.k.k.k.k.k.k.k.k.k.k.k.k.0.7.8.p.p.p.2.k", +"Qt.9#.##.z.p.p#a#b.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k.k#c#d.p.p.2.k", +".##e##.z.p.p.q#f.0.k.k.k.k.t#g.T#h#i#j#k#l.0.k.k.k.k.k#m#n.p.2.k", +".a#o.z.p.p.p#p#q.k.k.k.k#r#s#t.p.p.p.p.p.F#u.u.k.k.k.k.k#k.z.2.k", +"#v.5.p.p.p.q#w.k.k.k.k#r#x.p.p.p.p.p.p.p.p.p.Q#y.k.k.k.k#q.L.2.k", +"#z#a.p.p.p#A.0.k.k.k.t#B.p.p.p.p.p.p.p.p.p.p.p#A.S.k.k.k.k#C.A.k", +"#D#a.p.p.p#E.k.k.k.k.6.y.p.p.p.p.p.p.p.p.p.p.p#F#G.0.k.k.k#H#k.k", +"#D#a.p.p.o#I.k.k.k.0.g.p.p.p.p#J#K.u#L#M.q.p.p.p.o#N.k.k.k.k#O.k", +"#D#a.p.p#a#P.k.k.k#Q#R.p.p.p.Y#S.k.k.k.B#T.q.p.p.p#U.k.k.k.k.S.k", +"#D#a.p.p#V.B.k.k.k#W.K.p.p.p#X.R.k.k.k.k#Y.Y.p.p.p#d#Z.k.k.k#c.k", +"#D#a.p.p.K#0.k.k.k#0.F.p.p.p#a#Y.k.k.k.k#1.F.p.p.p#2.t.k.k.k#c.k", +"#D#a.p.p#3#C.k.k.k#4#5.p.p.p.p#2#N.k.k.k#Q.5.p.p.p.F.t.k.k.k#c.k", +"#D#a.p.p.q.h.k.k.k.k#6.p.p.p.p.p.z#f.0.k#I.z.p.p.p.f.0.k.k.k#c.k", +"#D#a.p.p.p#7.k.k.k.k#8#B.p.p.p.p.p.z#9#1#5#F.p.p.q##.k.k.k.k#y.k", +"a..K.p.p.p#t.j.k.k.k.k.Ra##a.p.p.p.p#3#o.5.p.p.p#3.S.k.k.k.taa.k", +"abac.p.p.pad.g.t.k.k.k.k.k#Pae#G#Xaf.i.k#Yag.q.q#h.k.k.k.k.u.e.k", +"ab#L.y.p.p.p.q#o.0.k.k.k.k.k.k.k.k.k.k.k.k.Sac.Fah.k.k.k.kai.2.k", +"abajac.p.p.p.p.z.h.0.k.k.k.k.k.k.k.k.k.k.k.k#c.h.k.k.k.k#4#G.2.k", +"ab.k#Y#a.p.p.p.p.zak#4.k.k.k.k.k.k.k.k.k.k#4afalam.k.k.kan.q.2.k", +"ab.k.kao.z.p.p.p.p.q#R#k#H.k.k.k.k.k.k.t.Hag.q.p.y.P.t.j.5.p.2.k", +"ab.k.k.tap.z.p.p.p.p.p.y#2af#oaqaqai.Pag.o.p.p.p.p.qapar.q.p.2.k", +"ab.k.k.k#8#o#t.p.p.p.p.p.p.p.p.p.p.p.p.p.p.p.p.p.pas#Iaa.r.p.2.k", +"ab.k.k.k.k.katau.q.p.p.p.p.p.p.p.p.p.p.p.p.p.p.qavaw.k.k#P#p.A.k", +"abax.S.S.Sax.k.u.P.5asasasasasasasasasasasasayaz#0.k.k.k.kaA.s.k", +"aBababababababababababababababababababababababababababababababab"}; --- hsqldb1.8.0-1.8.0.10+dfsg.orig/debian/changelog +++ hsqldb1.8.0-1.8.0.10+dfsg/debian/changelog @@ -0,0 +1,336 @@ +hsqldb1.8.0 (1.8.0.10+dfsg-9) unstable; urgency=medium + + * fix override disparity + * declare that we support multiple ResultSets (used by LO) + * rm debian/watch, there will be no new upstream versions here anyway + + -- Rene Engelhard Sat, 03 Mar 2018 21:39:02 +0100 + +hsqldb1.8.0 (1.8.0.10+dfsg-8) unstable; urgency=medium + + * remove Implementation-{Vendor,Version} from MANIFEST.MK + and thus make it reproducible + + -- Rene Engelhard Wed, 16 Aug 2017 21:55:08 +0200 + +hsqldb1.8.0 (1.8.0.10+dfsg-7) unstable; urgency=medium + + * [77412fc] move Maintainer: to Debian LibreOffice Maintainers + (as we keep this for LO only anyway.) + + -- Rene Engelhard Wed, 07 Sep 2016 07:41:43 +0200 + +hsqldb1.8.0 (1.8.0.10+dfsg-6) unstable; urgency=medium + + * fix servlet depends (closes: #815562) + + -- Rene Engelhard Mon, 22 Feb 2016 19:52:14 +0100 + +hsqldb1.8.0 (1.8.0.10+dfsg-5) unstable; urgency=medium + + * also update jh_classpath call for servlet3.1 (closes: #804022) + + -- Rene Engelhard Sat, 07 Nov 2015 13:43:24 +0100 + +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 Sat, 31 Oct 2015 17:01:57 +0100 + +hsqldb1.8.0 (1.8.0.10+dfsg-3) unstable; urgency=low + + * upload to unstable + * actually move to oldlibs + * change Maintainer to debian-openoffice@lists.debian.org as we just keep + this for LO + + -- Rene Engelhard Fri, 19 Apr 2013 00:21:57 +0200 + +hsqldb1.8.0 (1.8.0.10+dfsg-2) experimental; urgency=low + + * reupload as hsqldb1.8.0 / libhsqldb1.8.0-java to make space + for non-ancient libhsqldb-java + * stop building -doc, -server, -utils + * move to oldlibs + * remove maven stuff, this here is just shipped for LO... + + -- Rene Engelhard Mon, 18 Mar 2013 23:40:35 +0100 + +hsqldb (1.8.0.10+dfsg-1) unstable; urgency=low + + * remove lib/servlet.jar and make the build actually use + /usr/share/java/servlet-api-2.5.jar... + + -- Rene Engelhard Mon, 18 Mar 2013 22:30:20 +0100 + +hsqldb (1.8.0.10-14) unstable; urgency=low + + * revert -13 changes, apply fix from upstream to fix preprocessing, + thanks Lionel Elie Mamane + + -- Rene Engelhard Tue, 17 Jul 2012 21:21:27 +0200 + +hsqldb (1.8.0.10-13) unstable; urgency=low + + * explicitly build with openjdk-7 as the Java7 patch doesn't + seem to be working with gcj (closes: #675834). Thus ... + * ... disable -gcj + + -- Rene Engelhard Wed, 20 Jun 2012 11:45:35 +0200 + +hsqldb (1.8.0.10-12) unstable; urgency=low + + * add patch to fix build with Java 7 + + -- Rene Engelhard Fri, 01 Jun 2012 19:41:24 +0200 + +hsqldb (1.8.0.10-11) unstable; urgency=low + + * add maven.publishedRules (patch by twerner, closes: #641691) + * stop building -gcj - except on kfreebsd-* + + -- Rene Engelhard Mon, 26 Sep 2011 16:14:57 +0000 + +hsqldb (1.8.0.10-10) unstable; urgency=low + + * fix builddep: s/default-jdk-builddep/default-jdk, gcj-native-helper/ + * libhsqldb-java-gcj: libs->java + * add missing run to mh_clean + * build-depend on javahelper and add Class-Path: to hsqldb-1.8.0.10.jar... + * stop depending on a jre on libhsqldb-java + + -- Rene Engelhard Fri, 19 Aug 2011 20:54:56 +0000 + +hsqldb (1.8.0.10-9) unstable; urgency=low + + * oops, readd lost changes of -6.1 and fix changelog snafu + + -- Rene Engelhard Mon, 21 Jun 2010 18:51:08 +0200 + +hsqldb (1.8.0.10-8) unstable; urgency=low + + * hardcode JAVA_EXECUTABLE to /usr/lib/jvm/java-gcj/bin/java + (closes: #579740) + * add $remote_fs to Required-Stop: + * build with libservlet2.5-java + + -- Rene Engelhard Mon, 21 Jun 2010 12:03:42 +0200 + +hsqldb (1.8.0.10-6.1) unstable; urgency=low + + * Non-maintainer upload. + * Install POM file for hsqldb.jar. (Closes: #581851) + + -- Torsten Werner Sun, 16 May 2010 23:08:11 +0200 + +hsqldb (1.8.0.10-6) unstable; urgency=low + + * split utilities (hsqldb-*) into hsqldb-utils to allow + co-installation of libraries of different versions + + -- Rene Engelhard Sun, 25 Oct 2009 02:19:13 +0200 + +hsqldb (1.8.0.10-5) unstable; urgency=low + + * add i104901.patch from OOo to fix autoincrement behaviour which + otherwise can cause db corruption + * bin/hsqldb: Provides: hsqldb-server, thanks lintian + + -- Rene Engelhard Sat, 19 Sep 2009 00:56:41 +0200 + +hsqldb (1.8.0.10-4) unstable; urgency=low + + * fix hsqldb-init-tempfile to actually be applied + * readd WebServer support + * use template for hsqldb.conf which has more info + * add SERVER_JVMARGS=-Dhsqldb.method_class_names=\"\" to hsqldb.conf to + disallow execution of Java code inside SQL per default + * import default server.properties and webserver.properties and + default sqltool.rc from Fedora + + -- Rene Engelhard Mon, 17 Aug 2009 22:33:02 +0200 + +hsqldb (1.8.0.10-3) unstable; urgency=medium + + * add patch from http://www.openoffice.org/issues/show_bug.cgi?id=103528 + to fix BITXOR + * build with target/source for 1.5 as default-jdk is now OpenJDK 1.6 + * remove old hsqldb-server.init. Use bin/hsqldb. Add /etc/hsqldb.conf. + Make it work. Finetuning probably still needed but it at least now + has working (re)start/stop/status. + (closes: #466421) + * move libhsqldb-java to java and hsqldb-server to databases + * fix doc-base section + + -- Rene Engelhard Mon, 17 Aug 2009 21:05:08 +0200 + +hsqldb (1.8.0.10-2) unstable; urgency=low + + * fix creation of .lock file for OOo (from OOo svn) + + -- Rene Engelhard Wed, 25 Feb 2009 13:44:50 +0100 + +hsqldb (1.8.0.10-1) unstable; urgency=low + + * New upstream release + + -- Rene Engelhard Tue, 12 Aug 2008 10:49:33 -0300 + +hsqldb (1.8.0.9-3) unstable; urgency=low + + * make myself Maintainer: and remove Peter, by Peterss request + * use default-jdk-builddep (closes: #477862) + + -- Rene Engelhard Sun, 27 Apr 2008 00:17:18 +0200 + +hsqldb (1.8.0.9-2) unstable; urgency=low + + * upload to unstable + * mention CVE-2007-4575 in previous release + + -- Rene Engelhard Tue, 27 Nov 2007 11:37:11 +0100 + +hsqldb (1.8.0.9-1) experimental; urgency=high + + * New upstream release + - fixes CVE-2007-4575 + + -- Rene Engelhard Sun, 04 Nov 2007 19:20:16 +0100 + +hsqldb (1.8.0.8.dfsg-2) unstable; urgency=low + + * get regression fix from upstream + * merge from Ubuntu: + - build -gcj subpackage (closes: #437629) + + -- Rene Engelhard Sun, 04 Nov 2007 19:03:03 +0100 + +hsqldb (1.8.0.8.dfsg-1) unstable; urgency=high + + * oops, we need to remove servlet.jar from the .orig + + -- Rene Engelhard Mon, 24 Sep 2007 10:26:49 +0200 + +hsqldb (1.8.0.8-1) unstable; urgency=low + + * New upstream release + - includes all Ooo 2.3 patches (closes: #437630) + * switch to java-gcj-compat-dev as jikes can't build us anymore but + ecj can + * add myself to Uploaders + * make hsqldb-server depend on libhsqldb-java (= ${binary:Version}) + as $|Source-Version} is deprecated + * Apps/Databases -> Applications/Data Management for the new menu policy + + -- Rene Engelhard Fri, 31 Aug 2007 11:30:39 +0200 + +hsqldb (1.8.0.7-3) unstable; urgency=low + + * Changed dependencies to libservlet2.4-java (closes: #422555) + + -- Peter Eisentraut Mon, 07 May 2007 16:03:36 +0200 + +hsqldb (1.8.0.7-2) unstable; urgency=low + + * Corrected URL in hsqldb-sqltool man page + * Added sqltool.rc example to installation + * Improved start order dependencies of init script + + -- Peter Eisentraut Fri, 13 Apr 2007 01:54:00 +0200 + +hsqldb (1.8.0.7-1) unstable; urgency=low + + * New upstream release + * Updated watch file + * Removed hsqldb-nio.patch, which is no longer needed + + -- Peter Eisentraut Fri, 27 Oct 2006 09:59:02 +0200 + +hsqldb (1.8.0.5-2) unstable; urgency=low + + * Fixed dependency information in init script LSB header + + -- Peter Eisentraut Wed, 13 Sep 2006 19:18:37 +0200 + +hsqldb (1.8.0.5-1) experimental; urgency=low + + * New upstream release + * Fixed Build-Depends vs. Build-Depends-Indep + * Updated standards version + * debian/rules simplifications facilitated by newer cdbs + * Removed outdated OpenOffice patches + * Create /var/run/hsqldb in the init script rather than in the package + * Changed to Debhelper level 5 + * Fixed su invocation in init script + + -- Peter Eisentraut Thu, 31 Aug 2006 12:57:30 +0200 + +hsqldb (1.8.0.2-2) unstable; urgency=low + + * Added hsqldbutil.jar to re-add Transfer and QueryTool tools, which + were removed from the main jar (closes: #341427) + * Do not allow tools to create prefs file automatically + + -- Peter Eisentraut Sun, 11 Dec 2005 14:43:02 +0100 + +hsqldb (1.8.0.2-1) unstable; urgency=low + + * New upstream release + * Updated hsqldb-gcj-access-problems.patch for new release + * Changed watch file to version 3 format + * Added dependency on adduser + * Changed init script to LSB style + * Changed build dependency to ant + + -- Peter Eisentraut Sat, 24 Sep 2005 23:07:44 +0200 + +hsqldb (1.8.0.0-2) experimental; urgency=low + + * Moved java-virtual-machine to a suggestion (closes: #316986) + * Made hsqldb-server depend on the library of the same version + (closes: #316987) + * Applied bug fix patch from OOo2 (hsqldb-ooo2.patch) (closes: #316937) + * Applied patch by Rene Engelhard to work with GCJ in OOo2 + (hsqldb-gcj-access-problems.patch) (closes: #316937) + * Now using simple-patchsys.mk for patches + + -- Peter Eisentraut Mon, 11 Jul 2005 22:40:39 +0200 + +hsqldb (1.8.0.0-1) experimental; urgency=low + + * New upstream release + * Updated standards version + + -- Peter Eisentraut Mon, 4 Jul 2005 18:03:23 +0200 + +hsqldb (1.7.3.3-3) unstable; urgency=low + + * Changed maintainer address + * Added server mode + + -- Peter Eisentraut Thu, 9 Jun 2005 16:02:21 +0200 + +hsqldb (1.7.3.3-2) experimental; urgency=low + + * Disabled use of NIO locking (doesn't work with kaffe) + * Changed run-time dependencies to kaffe + * Moved to main + * Added PostgreSQL and MySQL JDBC drivers to classpath of GUI applications + + -- Peter Eisentraut Fri, 6 May 2005 13:22:03 +0200 + +hsqldb (1.7.3.3-1) experimental; urgency=low + + * New upstream release + + -- Peter Eisentraut Wed, 30 Mar 2005 10:39:03 +0200 + +hsqldb (1.7.3.2-1) experimental; urgency=low + + * Initial release (closes: #121613) + + -- Peter Eisentraut Sun, 6 Feb 2005 13:05:40 +0100 --- hsqldb1.8.0-1.8.0.10+dfsg.orig/debian/compat +++ hsqldb1.8.0-1.8.0.10+dfsg/debian/compat @@ -0,0 +1 @@ +5 --- hsqldb1.8.0-1.8.0.10+dfsg.orig/debian/control +++ hsqldb1.8.0-1.8.0.10+dfsg/debian/control @@ -0,0 +1,24 @@ +Source: hsqldb1.8.0 +Section: oldlibs +Priority: optional +Maintainer: Debian LibreOffice Maintainers +Uploaders: Rene Engelhard +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 +Architecture: all +Depends: libservlet3.1-java, ${misc:Depends} +Suggests: java-virtual-machine, libhsqldb1.8.0-java-gcj +Conflicts: openoffice.org-base (<< 1:2.3.1~m8) +Description: Java SQL database engine + 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. + . + Web site: http://hsqldb.org/ + --- hsqldb1.8.0-1.8.0.10+dfsg.orig/debian/copyright +++ hsqldb1.8.0-1.8.0.10+dfsg/debian/copyright @@ -0,0 +1,72 @@ +This Debian package was created by Peter Eisentraut +on 5 Feb 2005. + +The source was downloaded from . The +hsqldb.xpm icon was created by Peter Eisentraut from the file logo.gif +available in the HSQLDB CVS repository. + +Upstream authors: Fred Toussi and others + +Copyright: + + Copyright (c) 2001-2004, The HSQL Development Group + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + + Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + Neither the name of the HSQL Development Group nor the names of its + contributors may be used to endorse or promote products derived from this + software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL HSQL DEVELOPMENT GROUP, HSQLDB.ORG, + OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + + Copyright (c) 1995-2000, The Hypersonic SQL Group. + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + + Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + Neither the name of the Hypersonic SQL Group nor the names of its + contributors may be used to endorse or promote products derived from this + software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE HYPERSONIC SQL GROUP, + OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + This software consists of voluntary contributions made by many individuals + on behalf of the Hypersonic SQL Group. --- hsqldb1.8.0-1.8.0.10+dfsg.orig/debian/etc/server.properties +++ hsqldb1.8.0-1.8.0.10+dfsg/debian/etc/server.properties @@ -0,0 +1,21 @@ +# Hsqldb Server cfg file. +# See the Advanced Topics chapter of the Hsqldb User Guide. + +server.database.0 file:data/db0 +server.dbname.0 firstdb +server.urlid.0 db0-url +server.silent true +server.trace false + +server.port 9001 +server.no_system_exit true + +# Until the following setting is changed, the HSQLDB service will not accept +# remote connections. Failing to set a value for server.address at all will +# result in the service binding itself to 0.0.0.0 and accepting remote +# connections. +# +# IT IS STRONGLY ADVISED that before doing this you alter the password of +# the default account (username "sa"). By default, no password is required +# to connect to HSQLDB with the "sa" account. +server.address localhost --- hsqldb1.8.0-1.8.0.10+dfsg.orig/debian/etc/sqltool.rc +++ hsqldb1.8.0-1.8.0.10+dfsg/debian/etc/sqltool.rc @@ -0,0 +1,97 @@ +# $Id: hsqldb-1.73.0-standard-sqltool.rc,v 1.1 2004/12/23 22:21:08 fnasser Exp $ +# This is a sample SqlTool configuration file, a.k.a. rc file. + +# You can run SqlTool right now by copying this file to your home directory +# and running +# java -jar /path/to/hsqldb.jar mem +# This will access the first urlid definition below in order to use a +# personal Memory-Only database. + +# If you have the least concerns about security, then secure access to +# your sqltool.rc file. +# See the documentation for SqlTool for various ways to use this file. + +# A personal Memory-Only database. +urlid mem +url jdbc:hsqldb:mem:memdbid +username sa +password + +# This is for a hsqldb Server running with default settings on your local +# computer (and for which you have not changed the password for "sa"). +urlid db0-url +url jdbc:hsqldb:hsql://localhost/firstdb +username sa +password + + +########################################################################### +# Template for a urlid for an Oracle database. +# You will need to put the oracle.jdbc.OracleDriver class into your +# classpath. +# In the great majority of cases, you want to use the file classes12.zip +# (which you can get from the directory $ORACLE_HOME/jdbc/lib of any +# Oracle installation compatible with your server). +# Since you need to add to the classpath, you can't invoke SqlTool with +# the jar switch, like "java -jar .../hsqldb.jar..." or +# "java -jar .../hsqlsqltool.jar...". +# Put both the HSQLDB jar and classes12.zip in your classpath (and export!) +# and run something like "java org.hsqldb.util.SqlTool...". + +#urlid cardiff2 +#url jdbc:oracle:thin:@aegir.admc.com:1522:TRAFFIC_SID +#username blaine +#password secretpassword +#driver oracle.jdbc.OracleDriver +########################################################################### + + +########################################################################### +# Template for a urlid for a Postgresql database. +# You will need to put the org.postgresql.Driver class into your +# classpath. +# The postgresql jar will be named postgresql.jar (if you built Postgresql +# from source), or something like pg73b1jdbc3.jar or jdbc7.2x-1.2.jar. +# You can obtain it from a client or server Postgresql installation, or +# download it from http://jdbc.postgresql.org/download.html. +# Notice that the jar file names (other than "postgresql.jar") contain both +# the target Postgresql server version and the client-side JDBC level (which +# is determined by your client-side Java version, as explained at +# http://jdbc.postgresql.org/download.html). +# I recommend the latest production version for your JDBC version. The +# later JDBC drivers work better even with older Postgresql servers. +# (E.g. \dt won't list owners with an older driver). +# N.b.: Suse Linux 9.1 users should download a new driver from the PG site, +# since Suse distributes the 7.3 drivers with Postgresql 7.4 (why???). +# Since you need to add to the classpath, you can't invoke SqlTool with +# the jar switch, like "java -jar .../hsqldb.jar..." or +# "java -jar .../hsqlsqltool.jar...". +# Put both the HSQLDB jar and the Postgresql jar in your classpath (and +# export!) and run something like "java org.hsqldb.util.SqlTool...". +# N.b.: I notice that Postgresql is unusual in that it does not do an +# implicit commit before DDL commands. If you get an error message +# "... cannot run inside a transaction block", just run "commit;" and retry. + +#urlid commerce +#url jdbc:postgresql://dbsvr2/commercedb +#username blaine +#password obscured +#driver org.postgresql.Driver +########################################################################### + + +########################################################################### +# Template for a TLS-encrypted HSQLDB Server. +# Remember that the hostname in hsqls (and https) JDBC URLs must match the +# CN of the server certificate (the port and instance alias that follows +# are not part of the certificate at all). +# You only need to set "truststore" if the server cert is not approved by +# your system default truststore (which a commercial certificate probably +# would be). + +#urlid tls +#url jdbc:hsqldb:hsqls://db.admc.com:9001/lm2 +#username blaine +#password asecret +#truststore /home/blaine/ca/db/db-trust.store +########################################################################### --- hsqldb1.8.0-1.8.0.10+dfsg.orig/debian/etc/webserver.properties +++ hsqldb1.8.0-1.8.0.10+dfsg/debian/etc/webserver.properties @@ -0,0 +1,13 @@ +# Hsqldb Server cfg file. +# See the Advanced Topics chapter of the Hsqldb User Guide. + +server.database.0 file:data/db0 +server.dbname.0 firstdb +server.urlid.0 db0-url +server.silent true +server.trace false + +server.port 80 +server.default_page index.html +server.root ./ +.html=text/html --- hsqldb1.8.0-1.8.0.10+dfsg.orig/debian/hsqldb-server.default +++ hsqldb1.8.0-1.8.0.10+dfsg/debian/hsqldb-server.default @@ -0,0 +1,5 @@ +# Set to 'WebServer' to start a HSQLDB WebServer instead of a Server. +# Defaults to 'Server'. +TARGET_CLASS=Server +#TARGET_CLASS=WebServer + --- hsqldb1.8.0-1.8.0.10+dfsg.orig/debian/hsqldb-server.dirs +++ hsqldb1.8.0-1.8.0.10+dfsg/debian/hsqldb-server.dirs @@ -0,0 +1 @@ +var/lib/hsqldb --- hsqldb1.8.0-1.8.0.10+dfsg.orig/debian/hsqldb-server.docs +++ hsqldb1.8.0-1.8.0.10+dfsg/debian/hsqldb-server.docs @@ -0,0 +1 @@ +NEWS --- hsqldb1.8.0-1.8.0.10+dfsg.orig/debian/hsqldb-server.install +++ hsqldb1.8.0-1.8.0.10+dfsg/debian/hsqldb-server.install @@ -0,0 +1,3 @@ +debian/etc/server.properties etc/hsqldb +debian/etc/webserver.properties etc/hsqldb +debian/etc/sqltool.rc etc/hsqldb --- hsqldb1.8.0-1.8.0.10+dfsg.orig/debian/hsqldb-server.links +++ hsqldb1.8.0-1.8.0.10+dfsg/debian/hsqldb-server.links @@ -0,0 +1,2 @@ +etc/hsqldb/server.properties var/lib/hsqldb/server.properties +etc/hsqldb/webserver.properties var/lib/hsqldb/webserver.properties --- hsqldb1.8.0-1.8.0.10+dfsg.orig/debian/hsqldb-server.postinst +++ hsqldb1.8.0-1.8.0.10+dfsg/debian/hsqldb-server.postinst @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +getent passwd hsqldb >/dev/null 2>&1 || + adduser --system --shell /bin/bash --no-create-home --home /var/lib/hsqldb --group --gecos "HSQLDB system user" hsqldb + +chown hsqldb:hsqldb /var/lib/hsqldb +chmod 600 /etc/hsqldb/sqltool.rc + +#DEBHELPER# --- hsqldb1.8.0-1.8.0.10+dfsg.orig/debian/hsqldb-utils.examples +++ hsqldb1.8.0-1.8.0.10+dfsg/debian/hsqldb-utils.examples @@ -0,0 +1 @@ +src/org/hsqldb/sample/sqltool.rc --- hsqldb1.8.0-1.8.0.10+dfsg.orig/debian/hsqldb-utils.manpages +++ hsqldb1.8.0-1.8.0.10+dfsg/debian/hsqldb-utils.manpages @@ -0,0 +1,5 @@ +debian/man/hsqldb-databasemanager.1 +debian/man/hsqldb-databasemanagerswing.1 +debian/man/hsqldb-querytool.1 +debian/man/hsqldb-sqltool.1 +debian/man/hsqldb-transfer.1 --- hsqldb1.8.0-1.8.0.10+dfsg.orig/debian/hsqldb-utils.menu +++ hsqldb1.8.0-1.8.0.10+dfsg/debian/hsqldb-utils.menu @@ -0,0 +1,31 @@ +?package(hsqldb-utils):\ + needs="X11"\ + section="Applications/Data Management"\ + title="HSQLDB Database Manager"\ + command="/usr/bin/hsqldb-databasemanager"\ + icon="/usr/share/pixmaps/hsqldb.xpm"\ + hints="HSQLDB" + +?package(hsqldb-utils):\ + needs="X11"\ + section="Applications/Data Management"\ + title="HSQLDB Database Manager (Swing)"\ + command="/usr/bin/hsqldb-databasemanagerswing"\ + icon="/usr/share/pixmaps/hsqldb.xpm"\ + hints="HSQLDB" + +?package(hsqldb-utils):\ + needs="X11"\ + section="Applications/Data Management"\ + title="HSQLDB Query Tool"\ + command="/usr/bin/hsqldb-querytool"\ + icon="/usr/share/pixmaps/hsqldb.xpm"\ + hints="HSQLDB" + +?package(hsqldb-utils):\ + needs="X11"\ + section="Applications/Data Management"\ + title="HSQLDB Transfer Tool"\ + command="/usr/bin/hsqldb-transfer"\ + icon="/usr/share/pixmaps/hsqldb.xpm"\ + hints="HSQLDB" --- hsqldb1.8.0-1.8.0.10+dfsg.orig/debian/hsqldb.conf +++ hsqldb1.8.0-1.8.0.10+dfsg/debian/hsqldb.conf @@ -0,0 +1,140 @@ +# $Id: sample-hsqldb.cfg,v 1.16 2005/07/24 18:33:13 unsaved Exp $ + +# Sample configuration file for HSQLDB database server. +# See the "UNIX Quick Start" chapter of the Hsqldb User Guide. + +# N.b.!!!! You must place this in the right location for your type of UNIX. +# See the init script "hsqldb" to see where this must be placed and +# what it should be renamed to. + +# This file is "sourced" by a Bourne shell, so use Bourne shell syntax. + +# This file WILL NOT WORK until you set (at least) the non-commented +# variables to the appropriate values for your system. +# Life will be easier if you avoid all filepaths with spaces or any other +# funny characters. Don't ask for support if you ignore this advice. + +# Thanks to Meikel Bisping for his contributions. -- Blaine + +JAVA_EXECUTABLE=/usr/bin/java + +# Unless you copied a hsqldb.jar file from another system, this typically +# resides at $HSQLDB_HOME/lib/hsqldb.jar, where $HSQLDB_HOME is your HSQLDB +# software base directory. +HSQLDB_JAR_PATH=/usr/share/java/hsqldb.jar + +# Where the file "server.properties" resides. +SERVER_HOME=/var/lib/hsqldb + +# What UNIX user the server will run as. +# (The shutdown client is always run as root or the invoker of the init script).# Runs as root by default, but you should take the time to set database file +# ownerships to another user and set that user name here. +HSQLDB_OWNER=hsqldb + +# The HSQLDB jar file specified in HSQLDB_JAR_PATH above will automatically +# be in the class path. This arg specifies additional classpath elements. +# To embed your own application, add your jar file(s) or class base +# directories here, and add your main class to the INVOC_ADDL_ARGS setting +# below. +#SERVER_ADDL_CLASSPATH=/usr/local/dist/currencybank.jar + +# We require all Server/WebServer instances to be accessible within +# $MAX_START_SECS from when the Server/WebServer is started. +# Defaults to 60. +# Raise this is you are running lots of DB instances or have a slow server. +#MAX_START_SECS=200 +# Time to allow for JVM to die after all HSQLDB instances stopped. +# Defaults to 1. +#MAX_TERMINATE_SECS=0 + +# These are "urlid" values from a SqlTool authentication file +# ** IN ADDITION TO THOSE IN YOUR server.properties OR webserver.properties ** +# file. All server.urlid.X values from your properties file will automatically +# be started/stopped/tested. $SHUTDOWN_URLIDS is for additional urlids which +# will stopped. (Therefore, most users will not set this at all). +# Separate multiple values with white space. NO OTHER SPECIAL CHARACTERS! +# Make sure to quote the entire value if it contains white space separator(s). +# Defaults to none (i.e., only urlids set in properties file will be stopped). +#SHUTDOWN_URLIDS='sa mygms' + +# SqlTool authentication file used only for shutdown. +# The default value will be sqltool.rc in root's home directory, since it is +# root who runs the init script. +# (See the SqlTool chapter of the HSQLDB User Guide if you don't understand +# this). +AUTH_FILE=/etc/hsqldb/sqltool.rc + +# Set this to either 'WebServer' or 'Server'. Defaults to Server. +# The JVM that is started can invoke many classes (see the following item +# about that), but this is the Server that is used (1) to check status, +# (2) to shut down the JVM, (3) to get urlids for #1 from the +# server's server/webserver.properties file. +#TARGET_CLASS=WebServer +# Note that you don't specify the org.hsqldb package, since you have no +# choice in the matter (you can only run org.hsqldb.Server or +# org.hsqldb.WebServer). If you specify additional classes with +# INVOC_ADDL_ARGS (described next), you do need to specify the +# full class name with package name. + +# This is where you specify exactly what your HSQLDB JVM will run. +# The class org.hsqldb.util.MainInvoker will run the TARGET_CLASS +# specified above with any arguments supplied here + any other classes +# and arguments. Every additional class (in addition to the TARGET_CLASS) +# must be preceded with an empty string, so that MainInvoker will know +# you are giving a class name. MainInvoker will invoke the normal +# static main(String[]) method of each such class. +# By default, MainInvoker will just run TARGET_CLASS with no args. +# Example that runs just the TARGET_CLASS with the specified arguments: +#INVOC_ADDL_ARGS='-silent false' +# Example that runs the TARGET_CLASS plus a WebServer: +#INVOC_ADDL_ARGS='"" org.hsqldb.WebServer' +# Note the empty string preceding the class name. +# Example that starts TARGET_CLASS with an argument + a WebServer + +# your own application with its args (i.e., the HSQLDB Servers are +# "embedded" in your application). (Set SERVER_ADDL_CLASSPATH too).: +#INVOC_ADDL_ARGS='-silent false "" org.hsqldb.WebServer "" com.acme.Stone --env prod localhost' +# Example to run a non-TLS server in same JVM with a TLS server. In this +# case, TARGET_CLASS is Server which will run in TLS mode by virtue of +# setting TLS_KEYSTORE and TLS_PASSWORD above. The "additional" Server +# here overrides the 'tls' and 'port' settings: +#INVOC_ADDL_ARGS="'' org.hsqldb.Server -port 9002 -tls false" +# Note that you use nested quotes to group arguments and to specify the +# empty-string delimiter. + +# For TLS encryption for your Server, set these two variables. +# N.b.: If you set these, then make this file unreadable to non-root users!!!! +# See the TLS chapter of the HSQLDB User Guide, paying attention to the +# security warning(s). +# If you are running with a private server cert, then you will also need to +# set "truststore" in the your SqlTool config file (location is set by the +# AUTH_FILE variable in this file, or it must be at the default location for +# HSQLDB_OWNER). +#TLS_KEYSTORE=/path/to/jks/server.store +#TLS_PASSWORD=password + +# Any JVM args for the invocation of the JDBC client used to verify DB +# instances and to shut them down (SqlToolSprayer). +# This example specifies the location of a private trust store for TLS +# encryption. +# For multiple args, put quotes around entire value. +#CLIENT_JVMARGS=-Djavax.net.debug=ssl + +# Any JVM args for the server. +# For multiple args, put quotes around entire value. +# +# N.B.! +# The default value of SERVER_JVMARGS sets the system property +# hsqldb.method_class_names to be empty. This is in order to lessen the +# security risk posed by HSQLDB allowing Java method calls in SQL statements. +# The implications of changing this value (as explained by the authors of +# HSQLDB) are as follows: +# If [it] is not set, then static methods of all available Java classes +# can be accessed as functions in HSQLDB. If the property is set, then +# only the list of semicolon seperated method names becomes accessible. +# An empty property value means no class is accessible. +# Regardless of the value of hsqldb.method_class_names, methods in +# org.hsqldb.Library will be accessible. +# Before making changes to the value below, please be advised of the possible +# dangers involved in allowing SQL queries to contain Java method calls. +SERVER_JVMARGS=-Dhsqldb.method_class_names=\"\" + --- hsqldb1.8.0-1.8.0.10+dfsg.orig/debian/libhsqldb-java-doc.doc-base +++ hsqldb1.8.0-1.8.0.10+dfsg/debian/libhsqldb-java-doc.doc-base @@ -0,0 +1,15 @@ +Document: hsqldb-guide +Title: Hsqldb User Guide +Author: The HSQLDB Development Group +Abstract: 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. +Section: Data Management + +Format: HTML +Index: /usr/share/doc/libhsqldb-java-doc/guide/index.html +Files: /usr/share/doc/libhsqldb-java-doc/guide/*.html --- hsqldb1.8.0-1.8.0.10+dfsg.orig/debian/libhsqldb-java-doc.docs +++ hsqldb1.8.0-1.8.0.10+dfsg/debian/libhsqldb-java-doc.docs @@ -0,0 +1,4 @@ +NEWS +doc/guide/ +doc/src/ +doc/databaseinjar.txt --- hsqldb1.8.0-1.8.0.10+dfsg.orig/debian/libhsqldb-java-doc.examples +++ hsqldb1.8.0-1.8.0.10+dfsg/debian/libhsqldb-java-doc.examples @@ -0,0 +1,4 @@ +demo/localhost_clientserver.html +demo/memorydbmanager.html +demo/memoryquery.html +demo/servletdemo.html --- hsqldb1.8.0-1.8.0.10+dfsg.orig/debian/libhsqldb-java-doc.links +++ hsqldb1.8.0-1.8.0.10+dfsg/debian/libhsqldb-java-doc.links @@ -0,0 +1 @@ +usr/share/java/hsqldb.jar usr/share/doc/libhsqldb-java-doc/examples/hsqldb.jar --- hsqldb1.8.0-1.8.0.10+dfsg.orig/debian/libhsqldb-java.docs +++ hsqldb1.8.0-1.8.0.10+dfsg/debian/libhsqldb-java.docs @@ -0,0 +1 @@ +NEWS --- hsqldb1.8.0-1.8.0.10+dfsg.orig/debian/man/hsqldb-databasemanager.1 +++ hsqldb1.8.0-1.8.0.10+dfsg/debian/man/hsqldb-databasemanager.1 @@ -0,0 +1,35 @@ +.TH HSQLDB-DATABASEMANAGER "1" "March 2005" "HSQLDB 1.7.3.3" +.SH NAME +hsqldb-databasemanager \- GUI database management tool +.SH SYNOPSIS +\fBhsqldb-databasemanager\fR [\fIoptions\fR] +.SH DESCRIPTION +\fBhsqldb-databasemanager\fR is a GUI tool to manage databases via +their JDBC interface. +.SH OPTIONS +.TP +\fB\-driver\fR \fIclassname\fR +JDBC driver class to use +.TP +\fB\-url\fR \fIurl\fR +JDBC URL to connect to +.TP +\fB\-user\fR \fIname\fR +user name used for connection +.TP +\fB\-password\fR \fIpassword\fR +password for this user +.TP +\fB\-dir\fR \fIpath\fR +default directory +.TP +\fB\-script\fR \fIfile\fR +reads from script file +.TP +\fB\-noexit\fR +do not call system.exit() +.TP +\fB\-?\fR +show a brief help +.SH AUTHOR +This manual page was written by Peter Eisentraut for the Debian project. --- hsqldb1.8.0-1.8.0.10+dfsg.orig/debian/man/hsqldb-databasemanagerswing.1 +++ hsqldb1.8.0-1.8.0.10+dfsg/debian/man/hsqldb-databasemanagerswing.1 @@ -0,0 +1,35 @@ +.TH HSQLDB-DATABASEMANAGERSWING "1" "March 2005" "HSQLDB 1.7.3.3" +.SH NAME +hsqldb-databasemanagerswing \- GUI database management tool +.SH SYNOPSIS +\fBhsqldb-databasemanagerswing\fR [\fIoptions\fR] +.SH DESCRIPTION +\fBhsqldb-databasemanagerswing\fR is a GUI tool to manage databases via +their JDBC interface. +.SH OPTIONS +.TP +\fB\-driver\fR \fIclassname\fR +JDBC driver class to use +.TP +\fB\-url\fR \fIurl\fR +JDBC URL to connect to +.TP +\fB\-user\fR \fIname\fR +user name used for connection +.TP +\fB\-password\fR \fIpassword\fR +password for this user +.TP +\fB\-dir\fR \fIpath\fR +default directory +.TP +\fB\-script\fR \fIfile\fR +reads from script file +.TP +\fB\-noexit\fR +do not call system.exit() +.TP +\fB\-?\fR +show a brief help +.SH AUTHOR +This manual page was written by Peter Eisentraut for the Debian project. --- hsqldb1.8.0-1.8.0.10+dfsg.orig/debian/man/hsqldb-querytool.1 +++ hsqldb1.8.0-1.8.0.10+dfsg/debian/man/hsqldb-querytool.1 @@ -0,0 +1,34 @@ +.TH HSQLDB-QUERYTOOL "1" "March 2005" "HSQLDB 1.7.3.3" +.SH NAME +hsqldb-querytool \- GUI database management tool +.SH SYNOPSIS +\fBhsqldb-querytool\fR [\fIoptions\fR] +.SH DESCRIPTION +\fBhsqldb-querytool\fR is a GUI tool to issue SQL statements via JDBC. +.SH OPTIONS +.TP +\fB\-driver\fR \fIclassname\fR +JDBC driver class to use +.TP +\fB\-url\fR \fIname\fR +first part of the JDBC URL to connect to +.TP +\fB\-database\fR \fIname\fR +second part of the JDBC URL to connect to +.TP +\fB\-user\fR \fIname\fR +user name used for connection +.TP +\fB\-password\fR \fIpassword\fR +password for this user +.TP +\fB\-test\fR [\fBtrue\fR|\fBfalse\fR] +insert test data +.TP +\fB\-log\fR [\fBtrue\fR|\fBfalse\fR] +write log to system out +.TP +\fB\-?\fR +show a brief help +.SH AUTHOR +This manual page was written by Peter Eisentraut for the Debian project. --- hsqldb1.8.0-1.8.0.10+dfsg.orig/debian/man/hsqldb-sqltool.1 +++ hsqldb1.8.0-1.8.0.10+dfsg/debian/man/hsqldb-sqltool.1 @@ -0,0 +1,20 @@ +.TH HSQLDB-SQLTOOL "1" "April 2007" "HSQLDB 1.8.0.7" +.SH NAME +hsqldb-sqltool \- JDBC database console frontend +.SH SYNOPSIS +\fBhsqldb-sqltool\fR [\fIoptions\fR] +.SH DESCRIPTION +The main purpose of \fBhsqldb-sqltool\fR is to read your SQL text file +or stdin, and execute the SQL commands therein against a JDBC database. +There are also a great number of features to facilitate both interactive +use (such as command-line editing and aliases) and automation (such as +scripting variables and SQL transaction control and error handling). +.P +Please see the documentation at +.I /usr/share/doc/libhsqldb-java-doc/guide/ch08.html +for more information. +.SH OPTIONS +\fB\-\-help\fR +show a brief help +.SH AUTHOR +This manual page was written by Peter Eisentraut for the Debian project. --- hsqldb1.8.0-1.8.0.10+dfsg.orig/debian/man/hsqldb-transfer.1 +++ hsqldb1.8.0-1.8.0.10+dfsg/debian/man/hsqldb-transfer.1 @@ -0,0 +1,10 @@ +.TH HSQLDB-TRANSFER "1" "March 2005" "HSQLDB 1.7.3.3" +.SH NAME +hsqldb-transfer \- transfers data from one JDBC database to another +.SH SYNOPSIS +\fBhsqldb-transfer\fR +.SH DESCRIPTION +\fBhsqldb-querytool\fR is a GUI tool to manage transferring data from +one JDBC database to another. +.SH AUTHOR +This manual page was written by Peter Eisentraut for the Debian project. --- hsqldb1.8.0-1.8.0.10+dfsg.orig/debian/patches/bitxor2.diff +++ hsqldb1.8.0-1.8.0.10+dfsg/debian/patches/bitxor2.diff @@ -0,0 +1,15 @@ +# This patch file was generated by NetBeans IDE +# This patch can be applied using context Tools: Apply Diff Patch action on respective folder. +# It uses platform neutral UTF-8 encoding. +# Above lines and this line are ignored by the patching process. +--- hsqldb/src/org/hsqldb/Library.java ++++ hsqldb/src/org/hsqldb/Library.java +@@ -1957,7 +1957,7 @@ + functionMap.put("bitand", bitand); + functionMap.put("bitlength", bitLength); + functionMap.put("bitor", bitor); +- functionMap.put("bitxor", bitor); ++ functionMap.put("bitxor", bitxor); + functionMap.put("character", character); + functionMap.put("concat", concat); + functionMap.put("cot", cot); --- hsqldb1.8.0-1.8.0.10+dfsg.orig/debian/patches/fix-lock.patch +++ hsqldb1.8.0-1.8.0.10+dfsg/debian/patches/fix-lock.patch @@ -0,0 +1,10 @@ +--- hsqldb/src/org/hsqldb/persist/HsqlDatabaseProperties.java 2008-03-17 17:05:41.000000000 +0100 ++++ hsqldb/src/org/hsqldb/persist/HsqlDatabaseProperties.java 2009-01-21 13:09:24.493470142 +0100 +@@ -429,6 +429,7 @@ + setProperty(hsqldb_log_size, 10); + setProperty(sql_enforce_strict_size, true); + setProperty(hsqldb_nio_data_file, false); ++ setProperty(hsqldb_lock_file, true); + } + + // OOo end --- hsqldb1.8.0-1.8.0.10+dfsg.orig/debian/patches/hsqldb-demos.patch +++ hsqldb1.8.0-1.8.0.10+dfsg/debian/patches/hsqldb-demos.patch @@ -0,0 +1,45 @@ +# Adjust the path to the hsqldb.jar file for the demo applications. +--- hsqldb-1.8.0.0.orig/demo/localhost_clientserver.html ++++ hsqldb-1.8.0.0/demo/localhost_clientserver.html +@@ -2,7 +2,7 @@ + HSQL Database Engine + +

HSQL Database Engine Client/Server Demo

+- ++ + + + +--- hsqldb-1.8.0.0.orig/demo/memorydbmanager.html ++++ hsqldb-1.8.0.0/demo/memorydbmanager.html +@@ -2,7 +2,7 @@ + HSQL Database Engine + +

In-Memory Applet: Database Manager

+- ++ + + +

+--- hsqldb-1.8.0.0.orig/demo/memoryquery.html ++++ hsqldb-1.8.0.0/demo/memoryquery.html +@@ -2,7 +2,7 @@ + HSQL Database Engine + +

In-Memory Applet: QueryTool

+- ++ + + +

+--- hsqldb-1.8.0.0.orig/demo/servletdemo.html ++++ hsqldb-1.8.0.0/demo/servletdemo.html +@@ -2,7 +2,7 @@ + HSQL Database Engine + +

HSQL Database Engine Servlet Demo

+- ++ + + +

--- hsqldb1.8.0-1.8.0.10+dfsg.orig/debian/patches/hsqldb-init-provides.diff +++ hsqldb1.8.0-1.8.0.10+dfsg/debian/patches/hsqldb-init-provides.diff @@ -0,0 +1,11 @@ +--- bin/hsqldb-old 2009-09-19 00:53:21.000000000 +0200 ++++ bin/hsqldb 2009-09-19 00:53:40.000000000 +0200 +@@ -47,7 +47,7 @@ + # config: /etc/sysconfig/hsqldb + + ### BEGIN INIT INFO +-# Provides: HSQLDB-Server ++# Provides: hsqldb-server + # Required-Start: $syslog $remote_fs $network $named + # Required-Stop: + # Default-Start: 3 5 --- hsqldb1.8.0-1.8.0.10+dfsg.orig/debian/patches/hsqldb-init-restart.diff +++ hsqldb1.8.0-1.8.0.10+dfsg/debian/patches/hsqldb-init-restart.diff @@ -0,0 +1,17 @@ +--- hsqldb-1.8.0.10/bin/hsqldb-old 2009-08-17 21:03:33.000000000 +0200 ++++ hsqldb-1.8.0.10/bin/hsqldb 2009-08-17 21:04:14.000000000 +0200 +@@ -461,11 +461,11 @@ + echo "Successful shutdown ${SHUTDOWN_OPTION} (for the $TARGET_CLASS process)!" + exit 0 + ;; +- restart|restartcompacted) ++ restart|restartcompacted|force-reload) + STOP_COMMAND=stop + [ "$COMMAND" = restartcompacted ] && STOP_COMMAND=stopcompact +- "${INVOC_PATH}"hsqldb $STOP_COMMAND || exit $? +- exec "${INVOC_PATH}"/hsqldb start ++ $0 $STOP_COMMAND || exit $? ++ $0 start + ;; + *) + echo "$SYNTAX_MSG" 1>&2 --- hsqldb1.8.0-1.8.0.10+dfsg.orig/debian/patches/hsqldb-init-tempfile.diff +++ hsqldb1.8.0-1.8.0.10+dfsg/debian/patches/hsqldb-init-tempfile.diff @@ -0,0 +1,11 @@ +--- hsqldb-1.8.0.10.orig/bin/hsqldb ++++ hsqldb-1.8.0.10/bin/hsqldb +@@ -110,7 +110,7 @@ + SU_ECHO_SECS=1 + # File used as semaphore. If file is removed, a running pid checker + # process will exit. +-PIDCHECKER_FLAGFILE=/tmp/pidchecker.run ++PIDCHECKER_FLAGFILE=`mktemp /tmp/hsqldb.XXXXXXXX` + # The following settings get overridden by optional setting in the config file. + # Time to allow for JVM to die after all HSQLDB instances stopped. + MAX_TERMINATE_SECS=1 --- hsqldb1.8.0-1.8.0.10+dfsg.orig/debian/patches/hsqldb-prefs-file.patch +++ hsqldb1.8.0-1.8.0.10+dfsg/debian/patches/hsqldb-prefs-file.patch @@ -0,0 +1,12 @@ +diff -Nur hsqldb-1.8.0.2/src/org/hsqldb/util/ConnectionDialogCommon.java hsqldb-1.8.0.2.new/src/org/hsqldb/util/ConnectionDialogCommon.java +--- hsqldb-1.8.0.2/src/org/hsqldb/util/ConnectionDialogCommon.java 2005-12-11 14:47:11.000000000 +0100 ++++ hsqldb-1.8.0.2.new/src/org/hsqldb/util/ConnectionDialogCommon.java 2005-12-11 14:47:25.000000000 +0100 +@@ -178,7 +178,7 @@ + recentSettings = new File(homedir, fileName); + + if (!recentSettings.exists()) { +- JavaSystem.createNewFile(recentSettings); ++// JavaSystem.createNewFile(recentSettings); + + // Changed back to what I recived from you + // recentSettings.createNewFile(); --- hsqldb1.8.0-1.8.0.10+dfsg.orig/debian/patches/i104901.patch +++ hsqldb1.8.0-1.8.0.10+dfsg/debian/patches/i104901.patch @@ -0,0 +1,27 @@ +--- hsqldb/src/org/hsqldb/Table.java 2007-10-19 23:59:07.000000000 +0200 ++++ hsqldb/src/org/hsqldb/Table.java 2009-09-11 13:45:42.939231519 +0200 +@@ -149,10 +149,10 @@ + Constraint[] constraintList; // constrainst for the table + HsqlArrayList[] triggerLists; // array of trigger lists + private int[] colTypes; // fredt - types of columns +- private int[] colSizes; // fredt - copy of SIZE values for columns ++ int[] colSizes; // fredt - copy of SIZE values for columns + private int[] colScales; // fredt - copy of SCALE values for columns + private boolean[] colNullable; // fredt - modified copy of isNullable() values +- private Expression[] colDefaults; // fredt - expressions of DEFAULT values ++ Expression[] colDefaults; // fredt - expressions of DEFAULT values + private int[] defaultColumnMap; // fred - holding 0,1,2,3,... + private boolean hasDefaultValues; //fredt - shortcut for above + boolean sqlEnforceSize; // inherited from the database - +--- hsqldb/src/org/hsqldb/TableWorks.java 2007-01-14 06:48:16.000000000 +0100 ++++ hsqldb/src/org/hsqldb/TableWorks.java 2009-09-11 13:47:50.328667463 +0200 +@@ -670,7 +670,8 @@ + // default expressions can change + oldCol.setType(newCol); + oldCol.setDefaultExpression(newCol.getDefaultExpression()); +- table.setColumnTypeVars(colIndex); ++ table.colSizes[colIndex] = oldCol.getSize(); ++ table.colDefaults[colIndex] = oldCol.getDefaultExpression(); + table.resetDefaultsFlag(); + + return; --- hsqldb1.8.0-1.8.0.10+dfsg.orig/debian/patches/insserv-defaults.diff +++ hsqldb1.8.0-1.8.0.10+dfsg/debian/patches/insserv-defaults.diff @@ -0,0 +1,19 @@ +--- hsqldb-1.8.0.10.orig/bin/hsqldb ++++ hsqldb-1.8.0.10/bin/hsqldb +@@ -46,13 +46,12 @@ + # pidfile: /var/run/hsqldb.pid + # config: /etc/sysconfig/hsqldb + +-# This stuff for SuSE Linux. Contributed by M. Bisping. + ### BEGIN INIT INFO + # Provides: hsqldb-server + # Required-Start: $syslog $remote_fs $network $named +-# Required-Stop: ++# Required-Stop: $remote_fs +-# Default-Start: 3 5 +-# Default-Stop: 0 1 2 6 ++# Default-Start: 2 3 4 5 ++# Default-Stop: 0 1 6 + # Short-Description: HSQLDB-Server + # Description: Hsqldb, A High Performance Java Database Server + ### END INIT INFO --- hsqldb1.8.0-1.8.0.10+dfsg.orig/debian/patches/java7-jdbc-4.1.patch +++ hsqldb1.8.0-1.8.0.10+dfsg/debian/patches/java7-jdbc-4.1.patch @@ -0,0 +1,314 @@ +--- hsqldb/build/build.xml 2012-07-12 10:58:11.000000000 +0200 ++++ hsqldb/build/build.xml 2012-07-12 10:49:28.000000000 +0200 +@@ -98,16 +98,24 @@ + + + +- ++ ++ ++ ++ ++ ++ + ++ + + +- ++ + ++ + + +- ++ + ++ + + + +@@ -166,6 +174,7 @@ + + + ++ + + + +@@ -183,6 +192,7 @@ + + + ++ + + + +@@ -210,6 +220,7 @@ + + + ++ + + + +@@ -218,6 +229,7 @@ + + + ++ + + + +@@ -244,6 +256,7 @@ + + + ++ + + + +@@ -253,6 +266,43 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -279,10 +329,11 @@ + + + ++ + + + +- + T getObject(String columnLabel, Class type) throws SQLException ++ { ++ throw new UnsupportedOperationException("Not supported yet."); ++ } ++ ++ public T getObject(int ColumnIndex, Class type) throws SQLException ++ { ++ throw new UnsupportedOperationException("Not supported yet."); ++ } ++ ++ ++//#endif JAVA7 + } +--- hsqldb/src/org/hsqldb/jdbc/jdbcConnection.java 2012-02-08 15:14:42.802123563 +0000 ++++ hsqldb/src/org/hsqldb/jdbc/jdbcConnection.java 2012-02-08 15:47:35.851635628 +0000 +@@ -48,6 +48,12 @@ + import java.sql.SQLXML; + + //#endif JAVA6 ++ ++//#ifdef JAVA7 ++import java.util.concurrent.Executor; ++ ++//#endif JAVA7 ++ + import java.sql.PreparedStatement; + import java.sql.SQLException; + import java.sql.SQLWarning; +@@ -2793,4 +2799,31 @@ + } + + //#endif JAVA6 ++ ++//#ifdef JAVA7 ++ public int getNetworkTimeout() throws SQLException ++ { ++ throw new UnsupportedOperationException("Not supported yet."); ++ } ++ ++ public void setNetworkTimeout(Executor executor, int millis) throws SQLException ++ { ++ throw new UnsupportedOperationException("Not supported yet."); ++ } ++ ++ public void abort(Executor executor) throws SQLException ++ { ++ throw new UnsupportedOperationException("Not supported yet."); ++ } ++ ++ public String getSchema() throws SQLException ++ { ++ throw new UnsupportedOperationException("Not supported yet."); ++ } ++ ++ public void setSchema(String schema) throws SQLException ++ { ++ throw new UnsupportedOperationException("Not supported yet."); ++ } ++//#endif JAVA7 + } +--- hsqldb/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java 2012-02-08 15:14:42.802123563 +0000 ++++ hsqldb/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java 2012-02-08 15:47:35.835635654 +0000 +@@ -5693,4 +5693,21 @@ + } + + //#endif JAVA6 ++ ++ ++//#ifdef JAVA7 ++ public boolean generatedKeyAlwaysReturned() throws SQLException ++ { ++ throw new UnsupportedOperationException("Not supported yet."); ++ } ++ ++ public ResultSet getPseudoColumns(String catalog, String schemaPattern, ++ String tableNamePattern, String columnNamePattern) throws SQLException ++ { ++ throw new UnsupportedOperationException("Not supported yet."); ++ } ++ ++ ++//#endif JAVA7 ++ + } +--- hsqldb/src/org/hsqldb/jdbc/jdbcDataSource.java 2012-02-08 15:14:42.802123563 +0000 ++++ hsqldb/src/org/hsqldb/jdbc/jdbcDataSource.java 2012-02-08 15:47:35.836635653 +0000 +@@ -47,6 +47,11 @@ + //#endif JAVA4 + import org.hsqldb.jdbcDriver; + ++//#ifdef JAVA7 ++import java.sql.SQLFeatureNotSupportedException; ++import java.util.logging.Logger; ++//#endif JAVA7 ++ + // boucherb@users 20040411 - doc 1.7.2 - javadoc updates toward 1.7.2 final + + /** +@@ -323,4 +328,12 @@ + } + + //#endif JAVA6 ++ ++//#ifdef JAVA7 ++ public Logger getParentLogger() throws SQLFeatureNotSupportedException ++ { ++ throw new SQLFeatureNotSupportedException("Not supported yet."); ++ } ++ ++//#endif JAVA7 + } +--- hsqldb/src/org/hsqldb/jdbc/jdbcResultSet.java 2012-02-08 15:14:42.802123563 +0000 ++++ hsqldb/src/org/hsqldb/jdbc/jdbcResultSet.java 2012-02-08 15:47:35.866635606 +0000 +@@ -5324,4 +5324,19 @@ + } + + //#endif JAVA6 ++ ++//#ifdef JAVA7 ++ ++ public T getObject(String columnLabel, Class type) throws SQLException ++ { ++ throw new UnsupportedOperationException("Not supported yet."); ++ } ++ ++ public T getObject(int columnNum, Class type) throws SQLException ++ { ++ throw new UnsupportedOperationException("Not supported yet."); ++ } ++ ++//#endif JAVA7 ++ + } +--- hsqldb/src/org/hsqldb/jdbc/jdbcStatement.java 2012-02-08 15:14:42.802123563 +0000 ++++ hsqldb/src/org/hsqldb/jdbc/jdbcStatement.java 2012-02-08 15:47:35.872635595 +0000 +@@ -1608,4 +1608,16 @@ + throw new UnsupportedOperationException("Not supported yet."); + } + //#endif JAVA6 ++ ++//#ifdef JAVA7 ++ public boolean isCloseOnCompletion() throws SQLException ++ { ++ throw new UnsupportedOperationException("Not supported yet."); ++ } ++ ++ public void closeOnCompletion() throws SQLException ++ { ++ throw new UnsupportedOperationException("Not supported yet."); ++ } ++//#endif JAVA7 + } +--- hsqldb/src/org/hsqldb/jdbcDriver.java 2012-02-08 15:14:42.800123566 +0000 ++++ hsqldb/src/org/hsqldb/jdbcDriver.java 2012-02-08 15:47:35.826635667 +0000 +@@ -42,6 +42,11 @@ + import org.hsqldb.persist.HsqlDatabaseProperties; + import org.hsqldb.persist.HsqlProperties; + ++//#ifdef JAVA7 ++import java.sql.SQLFeatureNotSupportedException; ++import java.util.logging.Logger; ++//#endif JAVA7 ++ + // fredt@users 20011220 - patch 1.7.0 by fredt + // new version numbering scheme + // fredt@users 20020320 - patch 1.7.0 - JDBC 2 support and error trapping +@@ -321,4 +326,12 @@ + DriverManager.registerDriver(new jdbcDriver()); + } catch (Exception e) {} + } ++ ++//#ifdef JAVA7 ++ public Logger getParentLogger() throws SQLFeatureNotSupportedException ++ { ++ throw new SQLFeatureNotSupportedException("Not supported yet."); ++ } ++ ++//#endif JAVA7 + } --- hsqldb1.8.0-1.8.0.10+dfsg.orig/debian/patches/multipleResultSets.diff +++ hsqldb1.8.0-1.8.0.10+dfsg/debian/patches/multipleResultSets.diff @@ -0,0 +1,25 @@ +From 856159b3913976c68c8a04b7e939a6cc64477f6a Mon Sep 17 00:00:00 2001 +From: Julien Nabet +Date: Thu, 22 Feb 2018 21:33:20 +0100 +Subject: tdf#115828: hsqldb supports multiple resultSets + +Regression from 3c567e55e6aed9e0da892d8b9fc09f8a0c784fcc +Thank you to Lionel for this suggestion + +Change-Id: I5eeadc1968e57d586e55a7aa5488b2ab3ee43724 +Reviewed-on: https://gerrit.libreoffice.org/50202 +Reviewed-by: Lionel Elie Mamane +Tested-by: Jenkins + +--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java 2012-02-08 15:14:42.802123563 +0000 ++++ misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcDatabaseMetaData.java 2012-02-08 15:47:35.835635654 +0000 +@@ -1347,7 +1347,7 @@ + * @exception SQLException if a database access error occurs + */ + public boolean supportsMultipleResultSets() throws SQLException { +- return false; ++ return true; + } + + /** + --- hsqldb1.8.0-1.8.0.10+dfsg.orig/debian/patches/no-implementation-vendor-and-version.diff +++ hsqldb1.8.0-1.8.0.10+dfsg/debian/patches/no-implementation-vendor-and-version.diff @@ -0,0 +1,91 @@ +--- a/build/build.xml-old 2017-08-16 20:19:37.151003005 +0000 ++++ b/build/build.xml 2017-08-16 20:20:02.071356282 +0000 +@@ -21,8 +21,6 @@ + locale="en"/> + + +- +- + + + +@@ -481,8 +479,6 @@ + + +- +- + + + +@@ -528,8 +524,6 @@ + + +- +- + + + +@@ -553,8 +547,6 @@ + + +- +- + + + +@@ -580,8 +572,6 @@ + + +- +- + + + +@@ -629,8 +619,6 @@ + + +- +- + + +@@ -740,8 +728,6 @@ + + +- +- + + + +@@ -756,8 +742,6 @@ + + +- +- + + + +@@ -776,7 +760,6 @@ + + +- + + + --- hsqldb1.8.0-1.8.0.10+dfsg.orig/debian/patches/use-system-servlet.jar.diff +++ hsqldb1.8.0-1.8.0.10+dfsg/debian/patches/use-system-servlet.jar.diff @@ -0,0 +1,29 @@ +--- hsqldb-1.8.0.10+dfsg.orig/build/build.xml ++++ hsqldb-1.8.0.10+dfsg/build/build.xml +@@ -313,7 +313,7 @@ + optimize="${build.optimize}" + > + +- ++ + + + +@@ -775,7 +775,7 @@ + ${src}/org/hsqldb/util/RCData.java, + ${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-3.1.jar;${basedir}/lib/junit.jar" + author="true" + version="false" + use="true" +@@ -796,7 +796,7 @@ +