[Git][java-team/jython][master] 3 commits: Switch from libmysql-java to libmariadb-java.

[Markus Koschany]

Markus Koschany pushed to branch master at Debian Java Maintainers / jython


Commits:
9e2418cd by Markus Koschany at 2018-11-09T15:49:42Z
Switch from libmysql-java to libmariadb-java.

- - - - -
c84c10b9 by Markus Koschany at 2018-11-09T16:01:03Z
Declare compliance with Debian Policy 4.2.1.

- - - - -
f320a736 by Markus Koschany at 2018-11-09T16:02:20Z
Update changelog

- - - - -


3 changed files:

- debian/changelog
- debian/control
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+jython (2.7.1+repack-6) 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:01:37 +0100
+
 jython (2.7.1+repack-5) unstable; urgency=medium
 
   * Workaround JAXB removal from Java 11 (closes: #912473):


=====================================
debian/control
=====================================
@@ -18,13 +18,13 @@ Build-Depends-Indep: default-jdk,
  libjnr-netdb-java,
  libjnr-posix-java (>= 3.0.10~),
  libjnr-x86asm-java,
- libmysql-java,
+ libmariadb-java,
  libpostgresql-jdbc-java,
  libservlet3.1-java,
  libcommons-compress-java,
  libicu4j-java,
  libnetty-java
-Standards-Version: 3.9.8
+Standards-Version: 4.2.1
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/jython.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jython.git
 Homepage: http://www.jython.org
@@ -34,7 +34,7 @@ Architecture: all
 Depends: ${misc:Depends}, ${perl:Depends}, ${python:Depends}, ${java:Depends},
  default-jre-headless | java5-runtime-headless,
 Recommends: default-jdk | java-compiler
-Suggests: jython-doc, libmysql-java, libpostgresql-jdbc-java
+Suggests: jython-doc, libmariadb-java, libpostgresql-jdbc-java
 Description: Python seamlessly integrated with Java
  Jython is an implementation of the high-level, dynamic, object-oriented
  language Python seamlessly integrated with the Java platform.  The


=====================================
debian/rules
=====================================
@@ -31,7 +31,7 @@ their_to_our = $(shell \
   sed -r 's/junit-.*\.jar/junit4.jar/' | \
   sed -r 's/(netty-.*)-.*\.jar/\1.jar/' | \
   sed -r 's/(servlet-api)-.*\.jar/\1-3.1.jar/' | \
-  sed -r 's/(mysql-connector-java)-.*\.jar/\1.jar/' | \
+  sed -r 's/(mysql-connector-java)-.*\.jar/mariadb-java-client.jar/' | \
   sed -r 's/(postgresql)-.*\.jar/\1.jar/' | \
   sed -r 's/(guava)-.*.jar/\1.jar/' | \
   sed -r '/netty|servlet-api/!s/(java\/.*)-[0-9\._]*\.jar/\1.jar/' | \
@@ -88,9 +88,9 @@ override_dh_auto_clean:
 override_jh_installlibs:
 	jh_installlibs --version-strip="[+].*"
 
-# libmysql-java and libpostgresql-jdbc-java are part of Suggests
+# libmariadb-java and libpostgresql-jdbc-java are part of Suggests
 override_jh_depends:
-	jh_depends -Xlibmysql-java -Xlibpostgresql-jdbc-java
+	jh_depends -Xlibmariadb-java -Xlibpostgresql-jdbc-java
 
 override_dh_python2:
 	# Make all modules with a shebang line executable



View it on GitLab: https://salsa.debian.org/java-team/jython/compare/1e7326e88f2d860e2fa7da60f920c1fc8ee2ac19...f320a736a7b1c48fcded0a998308df854c12a15a

-- 
View it on GitLab: https://salsa.debian.org/java-team/jython/compare/1e7326e88f2d860e2fa7da60f920c1fc8ee2ac19...f320a736a7b1c48fcded0a998308df854c12a15a
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/4967cce8/attachment.html>