[Git][java-team/jameica][master] 4 commits: Support MySQL

[Jochen Sprickerhof]

Jochen Sprickerhof pushed to branch master at Debian Java Maintainers / jameica


Commits:
7428c7b0 by Jochen Sprickerhof at 2018-09-14T08:52:41Z
Support MySQL

Closes: #908618

- - - - -
401ddf20 by Jochen Sprickerhof at 2018-09-14T08:55:32Z
Bump policy version (no changes)

- - - - -
24b6e671 by Jochen Sprickerhof at 2018-09-14T08:56:31Z
Exclude more files

- - - - -
1503c8aa by Jochen Sprickerhof at 2018-09-14T08:56:59Z
Update changelog for 2.8.1+dfsg-2 release

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/copyright
- + debian/patches/0004-Add-mysql-connector-java.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+jameica (2.8.1+dfsg-2) unstable; urgency=medium
+
+  * Revert "suggest libmckoisqldb-java as upstream provide it by default"
+  * Support MySQL (Closes: #908618)
+  * Bump policy version (no changes)
+  * Exclude more files
+
+ -- Jochen Sprickerhof <jspricke at debian.org>  Fri, 14 Sep 2018 10:56:51 +0200
+
 jameica (2.8.1+dfsg-1) unstable; urgency=medium
 
   * Add R³


=====================================
debian/control
=====================================
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Java maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Jochen Sprickerhof <jspricke at debian.org>
 Build-Depends: debhelper (>= 11), default-jdk, javahelper, ant, eclipse-platform-data, eclipse-rcp, libcommons-cli-java, libbcpkix-java, libjameica-datasource-java, libnanoxml2-java, libpaperclips-java, velocity
-Standards-Version: 4.2.0
+Standards-Version: 4.2.1
 Rules-Requires-Root: no
 Homepage: http://www.willuhn.de/products/jameica/
 Vcs-Git: https://salsa.debian.org/java-team/jameica.git
@@ -12,7 +12,7 @@ Vcs-Browser: https://salsa.debian.org/java-team/jameica
 
 Package: jameica
 Architecture: all
-Depends: eclipse-platform-data, eclipse-rcp, libbcpkix-java, libbcprov-java, libcommons-cli-java, libcommons-collections3-java, libcommons-lang-java, libequinox-osgi-java, libicu4j-49-java, libjameica-datasource-java, libjameica-util-java, libnanoxml2-java, libpaperclips-java, velocity, ${misc:Depends}, libcommons-logging-java, libswtcalendar-java, libh2-java, libswt-cairo-gtk-4-jni, libswt-gtk2-4-jni
+Depends: eclipse-platform-data, eclipse-rcp, libbcpkix-java, libbcprov-java, libcommons-cli-java, libcommons-collections3-java, libcommons-lang-java, libequinox-osgi-java, libicu4j-49-java, libjameica-datasource-java, libjameica-util-java, libnanoxml2-java, libpaperclips-java, velocity, ${misc:Depends}, libcommons-logging-java, libswtcalendar-java, libh2-java, libswt-cairo-gtk-4-jni, libswt-gtk2-4-jni, libmysql-java
 Recommends: ${java:Recommends}
 Description: Run-time system for Java applications
  runtime environment for Java applications, which are implemented as plugins.


=====================================
debian/copyright
=====================================
@@ -1,7 +1,7 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Jameica
 Source: https://github.com/willuhn/jameica
-Files-Excluded: lib lib.src
+Files-Excluded: lib lib.src build/jameica-win32.exe build/jameica-win64.exe
 Comment: binary libraries
 
 Files: *


=====================================
debian/patches/0004-Add-mysql-connector-java.patch
=====================================
@@ -0,0 +1,20 @@
+From: Jochen Sprickerhof <jspricke at debian.org>
+Date: Fri, 14 Sep 2018 10:50:06 +0200
+Subject: Add mysql-connector-java
+
+---
+ build/build.properties | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/build/build.properties b/build/build.properties
+index 7f98659..57a8092 100644
+--- a/build/build.properties
++++ b/build/build.properties
+@@ -36,6 +36,7 @@ define.commonlibs               = /usr/share/java/bcpkix.jar \
+                                   /usr/share/java/swtcalendar.jar \
+                                   /usr/share/java/velocity.jar \
+                                   /usr/share/java/h2.jar \
++                                  /usr/share/java/mysql-connector-java.jar \
+                                   img \
+                                   lang \
+                                   help


=====================================
debian/patches/series
=====================================
@@ -1,3 +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



View it on GitLab: https://salsa.debian.org/java-team/jameica/compare/6b72fb2dc227b513aad86a48032555569f6d2d7c...1503c8aa48238ffb9ee722202b80580e11e8c7b1

-- 
View it on GitLab: https://salsa.debian.org/java-team/jameica/compare/6b72fb2dc227b513aad86a48032555569f6d2d7c...1503c8aa48238ffb9ee722202b80580e11e8c7b1
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/20180914/30ea11ad/attachment.html>