[hsqldb] 20/26: hsqldb-utils: Fix all command line tools by providing

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository hsqldb.

commit 2db94d470f78179cfcf4122b4e982f35484e6c80
Author: Markus Koschany <apo at gambaru.de>
Date:   Thu Sep 17 20:03:06 2015 +0200

    hsqldb-utils: Fix all command line tools by providing
    
    the correct classpath. Drop querytool. It is gone.
    
    Thanks: Roland Hieber for the report and patch.
    Closes: #720142
---
 debian/bin/Makefile           | 12 ++++++------
 debian/bin/hsqldb.in          |  2 +-
 debian/man/hsqldb-querytool.1 | 34 ----------------------------------
 3 files changed, 7 insertions(+), 41 deletions(-)

diff --git a/debian/bin/Makefile b/debian/bin/Makefile
index a554d23..0eaac05 100644
--- a/debian/bin/Makefile
+++ b/debian/bin/Makefile
@@ -1,15 +1,15 @@
-scripts = $(addprefix hsqldb-,databasemanager databasemanagerswing transfer querytool sqltool)
+scripts = $(addprefix hsqldb-,databasemanager databasemanagerswing transfer sqltool)
 
 all: $(scripts)
 
-hsqldb-databasemanager: class=DatabaseManager
-hsqldb-databasemanagerswing: class=DatabaseManagerSwing
-hsqldb-transfer: class=Transfer
-hsqldb-querytool: class=QueryTool
-hsqldb-sqltool: class=SqlTool
+hsqldb-databasemanager: class=DatabaseManager path=util
+hsqldb-databasemanagerswing: class=DatabaseManagerSwing path=util
+hsqldb-transfer: class=Transfer path=util
+hsqldb-sqltool: class=SqlTool path=cmdline
 
 $(scripts): hsqldb.in
 	sed "s/@CLASS@/$(class)/g" $< >$@
+	sed "s/@PATH@/$(path)/g" $< >$@
 	chmod a+x $@
 
 clean:
diff --git a/debian/bin/hsqldb.in b/debian/bin/hsqldb.in
index df699b3..5451a23 100644
--- a/debian/bin/hsqldb.in
+++ b/debian/bin/hsqldb.in
@@ -2,4 +2,4 @@
 
 set -e
 
-exec java -cp $CLASSPATH:/usr/share/java/hsqldbutil1.9.jar:/usr/share/java/hsqldb1.9.jar:/usr/share/java/postgresql.jar:/usr/share/java/mysql.jar "org.hsqldb.util. at CLASS@" "$@"
+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. at CLASS@" "$@"
diff --git a/debian/man/hsqldb-querytool.1 b/debian/man/hsqldb-querytool.1
deleted file mode 100644
index d4e2cc9..0000000
--- a/debian/man/hsqldb-querytool.1
+++ /dev/null
@@ -1,34 +0,0 @@
-.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.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/hsqldb.git