Bas Couwenberg pushed to branch master at Debian GIS Project / osmosis
Commits: 05d16dc8 by Bas Couwenberg at 2018-11-09T15:12:41Z Apply patches by Markus Koschany to use libmariadb-java. (closes: #913307) - - - - - da1fe567 by Bas Couwenberg at 2018-11-09T15:14:45Z Set distribution to unstable. - - - - - 6 changed files: - debian/changelog - debian/control - debian/maven.rules - debian/patches/02-fix_plexus.patch - + debian/patches/mariadb.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +osmosis (0.47-3) unstable; urgency=medium + + * Apply patches by Markus Koschany to use libmariadb-java. + (closes: #913307) + + -- Bas Couwenberg <[email protected]> Fri, 09 Nov 2018 16:14:34 +0100 + osmosis (0.47-2) unstable; urgency=medium * Drop patches for protobuf 3.0.0. ===================================== debian/control ===================================== @@ -17,7 +17,7 @@ Build-Depends: debhelper (>= 9), libcommons-dbcp-java, libjdepend-java, libjpf-java, - libmysql-java, + libmariadb-java, # libnetty-3.9-java, libpostgis-java, libpostgresql-jdbc-java, @@ -47,7 +47,7 @@ Depends: default-jre-headless | java8-runtime-headless, libcommons-dbcp-java, libcommons-pool-java, libjpf-java, - libmysql-java, + libmariadb-java, # libnetty-3.9-java, libpostgis-java, libpostgresql-jdbc-java, ===================================== debian/maven.rules ===================================== @@ -5,3 +5,4 @@ org.springframework spring-jdbc * s/.*/debian/ * * #s/org.jboss.netty/io.netty/ netty * s/.*/debian/ * * s/org.postgis/net.postgis/ postgis-jdbc * s/.*/debian/ * * s/com.fasterxml.woodstox/org.codehaus.woodstox/ s/woodstox-core/woodstox-core-lgpl/ * s/.*/debian/ * * +s/mysql/org.mariadb.jdbc/ s/mysql-connector-java/mariadb-java-client/ * s/.*/debian/ * * ===================================== debian/patches/02-fix_plexus.patch ===================================== @@ -14,7 +14,7 @@ Forwarded: not-needed +load /usr/share/java/commons-compress.jar +load /usr/share/java/commons-codec.jar +load /usr/share/java/commons-dbcp.jar -+load /usr/share/java/mysql-connector-java.jar ++load /usr/share/java/mariadb-java-client.jar +load /usr/share/java/postgis-jdbc.jar +load /usr/share/java/postgresql.jar +load /usr/share/java/spring3-beans.jar ===================================== debian/patches/mariadb.patch ===================================== @@ -0,0 +1,16 @@ +Description: Use MariaDB driver class. +Author: Markus Koschany <[email protected]> +Bug-Debian: https://bugs.debian.org/913307 +Forwarded: not-needed + +--- a/osmosis-apidb/src/main/java/org/openstreetmap/osmosis/apidb/common/DataSourceFactory.java ++++ b/osmosis-apidb/src/main/java/org/openstreetmap/osmosis/apidb/common/DataSourceFactory.java +@@ -38,7 +38,7 @@ public final class DataSourceFactory { + /*+ "?loglevel=2"*/); + break; + case MYSQL: +- dataSource.setDriverClassName("com.mysql.jdbc.Driver"); ++ dataSource.setDriverClassName("org.mariadb.jdbc.Driver"); + dataSource.setUrl("jdbc:mysql://" + credentials.getHost() + "/" + credentials.getDatabase()); + break; + default: ===================================== debian/patches/series ===================================== @@ -2,3 +2,4 @@ 02-fix_plexus.patch 04-osmosis-version.patch disable-netty3.patch +mariadb.patch View it on GitLab: https://salsa.debian.org/debian-gis-team/osmosis/compare/d997918d6f6fad5b196eb154be26f5bcad6f7d7a...da1fe5675be6ccbb0fc4fa0b6551c76af9043d15 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/osmosis/compare/d997918d6f6fad5b196eb154be26f5bcad6f7d7a...da1fe5675be6ccbb0fc4fa0b6551c76af9043d15 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
