Jochen Sprickerhof pushed to branch master at Debian Java Maintainers / jameica
Commits: 394cc01d by Jochen Sprickerhof at 2020-05-12T13:16:05+02:00 Add missing mckoisqldb.jar for SynTAX Thanks: Florian Dohrmann - - - - - 09eb8269 by Jochen Sprickerhof at 2020-05-12T13:17:16+02:00 Update changelog for 2.8.6+dfsg-2 release - - - - - 5 changed files: - debian/changelog - debian/patches/0001-Update-locations-of-Java-libraries.patch - debian/patches/0002-Adopt-build.xml.patch - − debian/patches/0004-mariadb.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +jameica (2.8.6+dfsg-2) unstable; urgency=medium + + * add Salsa CI + * Add missing mckoisqldb.jar for SynTAX. + Thanks to Florian Dohrmann + + -- Jochen Sprickerhof <[email protected]> Tue, 12 May 2020 13:17:04 +0200 + jameica (2.8.6+dfsg-1) unstable; urgency=medium * simplify d/watch ===================================== debian/patches/0001-Update-locations-of-Java-libraries.patch ===================================== @@ -3,14 +3,14 @@ Date: Thu, 24 May 2018 23:24:12 +0200 Subject: Update locations of Java libraries --- - build/build.properties | 56 ++++++++++++++++++++++++-------------------------- - 1 file changed, 27 insertions(+), 29 deletions(-) + build/build.properties | 58 +++++++++++++++++++++++++------------------------- + 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/build/build.properties b/build/build.properties -index 1f46215..df2e10e 100644 +index 1f46215..a7f68a7 100644 --- a/build/build.properties +++ b/build/build.properties -@@ -16,35 +16,33 @@ define.jarfilename.linuxarm64 = ${define.projectname}-linuxarm64.jar +@@ -16,35 +16,35 @@ define.jarfilename.linuxarm64 = ${define.projectname}-linuxarm64.jar define.jarfilename.openbsd = ${define.projectname}-openbsd.jar define.srcfilename = ${define.projectname}-${system.version}.src.zip define.javadocfilename = ${define.projectname}.javadoc.zip @@ -70,6 +70,8 @@ index 1f46215..df2e10e 100644 + /usr/share/java/velocity.jar \ + /usr/share/java/oro.jar \ + /usr/share/java/h2.jar \ ++ /usr/share/java/mckoisqldb.jar \ ++ /usr/share/java/mariadb-java-client.jar \ img \ lang \ help ===================================== debian/patches/0002-Adopt-build.xml.patch ===================================== @@ -8,10 +8,10 @@ Subject: Adopt build.xml 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/build/build.properties b/build/build.properties -index df2e10e..2aa6f91 100644 +index a7f68a7..4d9a08e 100644 --- a/build/build.properties +++ b/build/build.properties -@@ -50,7 +50,7 @@ define.commonlibs = /usr/share/java/bcpkix.jar \ +@@ -52,7 +52,7 @@ define.commonlibs = /usr/share/java/bcpkix.jar \ define.package = de.willuhn.jameica project.nightly = releases/nightly @@ -20,7 +20,7 @@ index df2e10e..2aa6f91 100644 project.src = ${project.release}/src/classes project.tmp = ${project.release}/tmp project.javadoc = ${project.release}/javadoc -@@ -66,6 +66,7 @@ project.zipfilename.linuxarm64 = ${define.projectname}-linuxarm64-${system.vers +@@ -68,6 +68,7 @@ project.zipfilename.linuxarm64 = ${define.projectname}-linuxarm64-${system.vers project.zipfilename.macos64 = ${define.projectname}-macos64-${system.version}.zip project.zipfilename.openbsd = ${define.projectname}-openbsd-${system.version}.zip ===================================== debian/patches/0004-mariadb.patch deleted ===================================== @@ -1,20 +0,0 @@ -From: Jochen Sprickerhof <[email protected]> -Date: Fri, 14 Sep 2018 10:50:06 +0200 -Subject: mariadb - ---- - build/build.properties | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/build/build.properties b/build/build.properties -index 2aa6f91..c480287 100644 ---- a/build/build.properties -+++ b/build/build.properties -@@ -43,6 +43,7 @@ define.commonlibs = /usr/share/java/bcpkix.jar \ - /usr/share/java/velocity.jar \ - /usr/share/java/oro.jar \ - /usr/share/java/h2.jar \ -+ /usr/share/java/mariadb-java-client.jar \ - img \ - lang \ - help ===================================== debian/patches/series ===================================== @@ -1,4 +1,3 @@ 0001-Update-locations-of-Java-libraries.patch 0002-Adopt-build.xml.patch 0003-Adopt-jameica-executable.patch -0004-mariadb.patch View it on GitLab: https://salsa.debian.org/java-team/jameica/-/compare/9bf76c37c83e16b3ffc8566d045a42633b51e202...09eb826990c1bc83012aafc42d4fd66ba6261cbb -- View it on GitLab: https://salsa.debian.org/java-team/jameica/-/compare/9bf76c37c83e16b3ffc8566d045a42633b51e202...09eb826990c1bc83012aafc42d4fd66ba6261cbb You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
