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

[Markus Koschany]

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


Commits:
cd956753 by Markus Koschany at 2018-11-09T18:13:15Z
Switch from libmysql-java to libmariadb-java.

- - - - -
10775e1c by Markus Koschany at 2018-11-09T18:15:25Z
Update changelog

- - - - -


4 changed files:

- debian/changelog
- debian/control
- debian/patches/0004-Add-mysql-connector-java.patch → debian/patches/0004-mariadb.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+jameica (2.8.2+dfsg-4) unstable; urgency=medium
+
+  * Team upload.
+  * Switch from libmysql-java to libmariadb-java. See #912916 for more
+    information.
+
+ -- Markus Koschany <apo at debian.org>  Fri, 09 Nov 2018 19:13:25 +0100
+
 jameica (2.8.2+dfsg-3) unstable; urgency=medium
 
   * Add libjaxb-api-java build dependency (Closes: #912548)


=====================================
debian/control
=====================================
@@ -12,7 +12,7 @@ Vcs-Browser: https://salsa.debian.org/java-team/jameica
 
 Package: jameica
 Architecture: all
-Depends: ${misc:Depends}, libeclipse-core-runtime-java, libeclipse-core-commands-java, libequinox-common-java, libeclipse-jface-databinding-java, libeclipse-ui-forms-java, libbcpkix-java, libbcprov-java, libcommons-cli-java, libcommons-collections3-java, libcommons-lang-java, libeclipse-osgi-java, libicu4j-49-java, libjameica-datasource-java, libjameica-util-java, libnanoxml2-java, libpaperclips-java, velocity, libcommons-logging-java, libswtcalendar-java, libh2-java, libswt-cairo-gtk-4-jni, libswt-gtk2-4-jni, libmysql-java, libactivation-java, libjaxb-api-java, libjaxb-java, libgeronimo-annotation-1.3-spec-java, libistack-commons-java, libtxw2-java,
+Depends: ${misc:Depends}, libeclipse-core-runtime-java, libeclipse-core-commands-java, libequinox-common-java, libeclipse-jface-databinding-java, libeclipse-ui-forms-java, libbcpkix-java, libbcprov-java, libcommons-cli-java, libcommons-collections3-java, libcommons-lang-java, libeclipse-osgi-java, libicu4j-49-java, libjameica-datasource-java, libjameica-util-java, libnanoxml2-java, libpaperclips-java, velocity, libcommons-logging-java, libswtcalendar-java, libh2-java, libswt-cairo-gtk-4-jni, libswt-gtk2-4-jni, libmariadb-java, libactivation-java, libjaxb-api-java, libjaxb-java, libgeronimo-annotation-1.3-spec-java, libistack-commons-java, libtxw2-java,
 Recommends: ${java:Recommends}
 Description: Run-time system for Java applications
  runtime environment for Java applications, which are implemented as plugins.


=====================================
debian/patches/0004-Add-mysql-connector-java.patch → debian/patches/0004-mariadb.patch
=====================================
@@ -1,6 +1,6 @@
 From: Jochen Sprickerhof <jspricke at debian.org>
 Date: Fri, 14 Sep 2018 10:50:06 +0200
-Subject: Add mysql-connector-java
+Subject: mariadb
 
 ---
  build/build.properties | 1 +
@@ -14,7 +14,7 @@ index bed0ada..9055312 100644
                                    /usr/share/java/swtcalendar.jar \
                                    /usr/share/java/velocity.jar \
                                    /usr/share/java/h2.jar \
-+                                  /usr/share/java/mysql-connector-java.jar \
++                                  /usr/share/java/mariadb-java-client.jar \
                                    img \
                                    lang \
                                    help


=====================================
debian/patches/series
=====================================
@@ -1,4 +1,4 @@
 0001-Update-locations-of-Java-libraries.patch
 0002-Adopt-build.xml.patch
 0003-Adopt-jameica-executable.patch
-0004-Add-mysql-connector-java.patch
+0004-mariadb.patch



View it on GitLab: https://salsa.debian.org/java-team/jameica/compare/4df8c141ba8fb92a4758ac66b8abcbf8f7f5df7a...10775e1c870895e6e27e223a289d2bf9ab76c009

-- 
View it on GitLab: https://salsa.debian.org/java-team/jameica/compare/4df8c141ba8fb92a4758ac66b8abcbf8f7f5df7a...10775e1c870895e6e27e223a289d2bf9ab76c009
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/8d179010/attachment.html>