[pkg-java] r17834 - trunk/sqlline/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-03-06 11:33:07 +0000 (Thu, 06 Mar 2014)
New Revision: 17834

Modified:
   trunk/sqlline/debian/changelog
   trunk/sqlline/debian/control
   trunk/sqlline/debian/sqlline.sh
Log:
Add the known JDBC drivers to the classpath instead of setting the java.ext.dirs system property



Modified: trunk/sqlline/debian/changelog
===================================================================
--- trunk/sqlline/debian/changelog	2014-03-06 10:59:02 UTC (rev 17833)
+++ trunk/sqlline/debian/changelog	2014-03-06 11:33:07 UTC (rev 17834)
@@ -1,6 +1,8 @@
 sqlline (1.0.2-5) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Add the known JDBC drivers to the classpath instead of setting
+    the java.ext.dirs system property (Closes: #705645)
   * Renamed the 'enum' variables to fix a build failure (Closes: #738425)
   * Updated the Lintian overrides to use capitalization-error-in-description
     instead of spelling-error-in-description

Modified: trunk/sqlline/debian/control
===================================================================
--- trunk/sqlline/debian/control	2014-03-06 10:59:02 UTC (rev 17833)
+++ trunk/sqlline/debian/control	2014-03-06 11:33:07 UTC (rev 17834)
@@ -13,7 +13,7 @@
 Package: sqlline
 Architecture: all
 Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless, libjline-java, java-wrappers
-Recommends: libhsqldb-java | libmysql-java | libpostgresql-jdbc-java
+Recommends: libhsqldb-java | libmysql-java | libpostgresql-jdbc-java | libjtds-java
 Description: JDBC command-line utility for issuing SQL
  SQLLine is a pure-Java console based utility for connecting to
  relational databases and executing SQL commands.

Modified: trunk/sqlline/debian/sqlline.sh
===================================================================
--- trunk/sqlline/debian/sqlline.sh	2014-03-06 10:59:02 UTC (rev 17833)
+++ trunk/sqlline/debian/sqlline.sh	2014-03-06 11:33:07 UTC (rev 17834)
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-JAVA_ARGS="-Djava.ext.dirs=/usr/share/java/:/usr/local/share/java/"
-
 # Include the wrappers utility script
 . /usr/lib/java-wrappers/java-wrappers.sh
 
@@ -9,8 +7,7 @@
 find_java_runtime all
 
 # Define our classpath
-find_jars jline sqlline
+find_jars jline sqlline postgresql-jdbc4 mysql-connector-java hsqldb jtds
 
 # Run SQLLine
 run_java sqlline.SqlLine $extra_args "$@"
-