[Git][java-team/sqlline][master] 5 commits: Switch from libmysql-java to libmariadb-java.
Markus Koschany
gitlab at salsa.debian.org
Fri Nov 9 17:27:58 GMT 2018
Markus Koschany pushed to branch master at Debian Java Maintainers / sqlline
Commits:
bf71c710 by Markus Koschany at 2018-11-09T16:57:36Z
Switch from libmysql-java to libmariadb-java.
- - - - -
5d3cd9cd by Markus Koschany at 2018-11-09T16:57:56Z
Declare compliance with Debian Policy 4.2.1.
- - - - -
fa04e651 by Markus Koschany at 2018-11-09T16:58:57Z
Update changelog
- - - - -
e13e53cf by Markus Koschany at 2018-11-09T17:24:35Z
Add mariadb.patch
- - - - -
22e4874a by Markus Koschany at 2018-11-09T17:25:33Z
Update changelog
- - - - -
6 changed files:
- debian/README.Debian
- debian/changelog
- debian/control
- + debian/patches/mariadb.patch
- debian/patches/series
- debian/sqlline.sh
Changes:
=====================================
debian/README.Debian
=====================================
@@ -5,7 +5,7 @@ sqlline for Debian
driver to connect to a database.
For example, you can install the following drivers (debian package name):
- libhsqldb-java: JDBC driver for HSQLDB
- - libmysql-java: JDBC driver for mysql
+ - libmariadb-java: JDBC driver for MySQL/MariaDB
- libpg-java: JDBC driver for pgsql
* You can run SQLLine by using the /usr/bin/sqlline launcher which takes care of
=====================================
debian/changelog
=====================================
@@ -1,3 +1,18 @@
+sqlline (1.0.2-8) unstable; urgency=medium
+
+ * Team upload.
+ * Add mariadb.patch and register the correct MariaDB database driver.
+
+ -- Markus Koschany <apo at debian.org> Fri, 09 Nov 2018 18:25:10 +0100
+
+sqlline (1.0.2-7) unstable; urgency=medium
+
+ * Team upload.
+ * Switch from libmysql-java to libmariadb-java.
+ * Declare compliance with Debian Policy 4.2.1.
+
+ -- Markus Koschany <apo at debian.org> Fri, 09 Nov 2018 17:58:47 +0100
+
sqlline (1.0.2-6) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -8,7 +8,7 @@ Build-Depends:
debhelper (>= 11),
default-jdk,
libjline-java
-Standards-Version: 4.1.4
+Standards-Version: 4.2.1
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/sqlline.git
Vcs-Git: https://anonscm.debian.org/git/pkg-java/sqlline.git
Homepage: http://sqlline.sourceforge.net
@@ -20,7 +20,7 @@ Depends:
java-wrappers,
libjline-java,
${misc:Depends}
-Recommends: libhsqldb-java | libmysql-java | libpostgresql-jdbc-java | libjtds-java
+Recommends: libhsqldb-java | libmariadb-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.
=====================================
debian/patches/mariadb.patch
=====================================
@@ -0,0 +1,69 @@
+From: Markus Koschany <apo at debian.org>
+Date: Fri, 9 Nov 2018 18:06:53 +0100
+Subject: mariadb
+
+Forwarded: no
+---
+ src/sqlline/SqlLine.java | 8 ++++----
+ src/sqlline/drivers/com.mysql.jdbc.DatabaseMetaData.properties | 3 ++-
+ src/sqlline/drivers/com.mysql.jdbc.Driver.properties | 2 +-
+ .../drivers/com.mysql.jdbc.NonRegisteringDriver.properties | 2 +-
+ 4 files changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/src/sqlline/SqlLine.java b/src/sqlline/SqlLine.java
+index 67a16ad..c993818 100644
+--- a/src/sqlline/SqlLine.java
++++ b/src/sqlline/SqlLine.java
+@@ -230,10 +230,10 @@ public class SqlLine
+ "com.pointbase.jdbc.jdbcEmbeddedDriver",
+ "org.gjt.mm.mysql.Driver",
+ "org.postgresql.Driver",
+- "com.mysql.jdbc.Driver",
++ "org.mariadb.jdbc.Driver",
+ "oracle.jdbc.driver.OracleDriver",
+ "interbase.interclient.Driver",
+- "com.mysql.jdbc.NonRegisteringDriver",
++ "org.mariadb.jdbc.NonRegisteringDriver",
+ "com.merant.datadirect.jdbc.db2.DB2Driver",
+ "com.merant.datadirect.jdbc.sybase.SybaseDriver",
+ "com.internetcds.jdbc.tds.Driver",
+@@ -243,7 +243,7 @@ public class SqlLine
+ "in.co.daffodil.db.jdbc.DaffodilDBDriver",
+ "com.ddtek.jdbc.db2.DB2Driver",
+ "interbase.interclient.Driver",
+- "com.mysql.jdbc.Driver",
++ "org.mariadb.jdbc.Driver",
+ "com.ddtek.jdbc.oracle.OracleDriver",
+ "org.postgresql.Driver",
+ "com.pointbase.jdbc.jdbcUniversalDriver",
+@@ -278,7 +278,7 @@ public class SqlLine
+ "com.microsoft.jdbc.sqlserver.SQLServerDriver",
+ "com.thinweb.tds.Driver",
+ "weblogic.jdbc.mssqlserver4.Driver",
+- "com.mysql.jdbc.DatabaseMetaData",
++ "org.mariadb.jdbc.DatabaseMetaData",
+ "org.gjt.mm.mysql.Driver",
+ "com.sap.dbtech.jdbc.DriverSapDB",
+ "com.sybase.jdbc2.jdbc.SybDriver",
+diff --git a/src/sqlline/drivers/com.mysql.jdbc.DatabaseMetaData.properties b/src/sqlline/drivers/com.mysql.jdbc.DatabaseMetaData.properties
+index 2efd80f..327e81e 100644
+--- a/src/sqlline/drivers/com.mysql.jdbc.DatabaseMetaData.properties
++++ b/src/sqlline/drivers/com.mysql.jdbc.DatabaseMetaData.properties
+@@ -1 +1,2 @@
+-com.mysql.jdbc.DatabaseMetaData
++org.mariadb.jdbc.DatabaseMetaData
++
+diff --git a/src/sqlline/drivers/com.mysql.jdbc.Driver.properties b/src/sqlline/drivers/com.mysql.jdbc.Driver.properties
+index 86dd0f8..3f71fc6 100644
+--- a/src/sqlline/drivers/com.mysql.jdbc.Driver.properties
++++ b/src/sqlline/drivers/com.mysql.jdbc.Driver.properties
+@@ -1 +1 @@
+-com.mysql.jdbc.Driver
++org.mariadb.jdbc.Driver
+diff --git a/src/sqlline/drivers/com.mysql.jdbc.NonRegisteringDriver.properties b/src/sqlline/drivers/com.mysql.jdbc.NonRegisteringDriver.properties
+index 3cbcf3f..44df831 100644
+--- a/src/sqlline/drivers/com.mysql.jdbc.NonRegisteringDriver.properties
++++ b/src/sqlline/drivers/com.mysql.jdbc.NonRegisteringDriver.properties
+@@ -1 +1 @@
+-com.mysql.jdbc.NonRegisteringDriver
++org.mariadb.jdbc.NonRegisteringDriver
=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
01_build_lib_release.patch
02_rename_enum_variables.patch
+mariadb.patch
=====================================
debian/sqlline.sh
=====================================
@@ -7,7 +7,7 @@
find_java_runtime all
# Define our classpath
-find_jars jline sqlline postgresql-jdbc4 mysql-connector-java hsqldb jtds
+find_jars jline sqlline postgresql-jdbc4 mariadb-java-client hsqldb jtds
# Run SQLLine
run_java sqlline.SqlLine $extra_args "$@"
View it on GitLab: https://salsa.debian.org/java-team/sqlline/compare/5df235c49cb78d6944f1a6e86563abbb64e4bcac...22e4874a6c08f44c6ac279736cad1b215540d0cc
--
View it on GitLab: https://salsa.debian.org/java-team/sqlline/compare/5df235c49cb78d6944f1a6e86563abbb64e4bcac...22e4874a6c08f44c6ac279736cad1b215540d0cc
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20181109/ff8db394/attachment.html>
More information about the pkg-java-commits
mailing list