Markus Koschany pushed to branch master at Debian Java Maintainers / syncany
Commits: 98e40ee4 by Markus Koschany at 2018-12-16T22:45:37Z Depend on libtomcat9-java and fix the broken symlinks. Thanks: Andreas Beckmann for the report. Closes: #916609 - - - - - 034dd1b1 by Markus Koschany at 2018-12-16T22:46:58Z Update changelog - - - - - 75c6bfca by Markus Koschany at 2018-12-16T23:06:50Z Add javax.servlet javax.servlet-api * s/.*/3.1/ * * - - - - - 98604b3d by Markus Koschany at 2018-12-16T23:10:02Z Add maven rule for javax.websocket-api. - - - - - 8e888fdf by Markus Koschany at 2018-12-16T23:19:58Z Build-depend on libjaxb-api-java to prevent a FTBFS. - - - - - 3a119a2b by Markus Koschany at 2018-12-16T23:27:55Z Add javax.xml.bind.patch. - - - - - 27423dda by Markus Koschany at 2018-12-16T23:34:03Z Update copyright years. - - - - - 5d92e990 by Markus Koschany at 2018-12-16T23:37:10Z Also depend on libjaxb-api-java. - - - - - 6aae675c by Markus Koschany at 2018-12-16T23:45:15Z Upload to experimental - - - - - 8 changed files: - debian/changelog - debian/control - debian/copyright - debian/links - debian/maven.rules - + debian/patches/javax.xml.bind.patch - debian/patches/series - debian/patches/startup-script.patch Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,12 @@ +syncany (0.4.9~alpha-3) experimental; urgency=medium + + * Depend on libtomcat9-java and fix the broken symlinks. + Thanks to Andreas Beckmann for the report. (Closes: #916609) + * Build-depend an depend on libjaxb-api-java to prevent a FTBFS and runtime + error. + + -- Markus Koschany <[email protected]> Sun, 16 Dec 2018 23:46:41 +0100 + syncany (0.4.9~alpha-2) experimental; urgency=medium * Switch to compat level 11. ===================================== debian/control ===================================== @@ -17,11 +17,13 @@ Build-Depends: libguava-java, libhsqldb-java, libhttpclient-java, + libjaxb-api-java, libjoptsimple-java, libjpathwatch-java (>= 0.95-2), libsemver-java, libsimple-xml-java, libstax-java, + libtomcat9-java, libundertow-java Standards-Version: 4.2.1 Vcs-Git: https://anonscm.debian.org/git/pkg-java/syncany.git @@ -40,11 +42,13 @@ Depends: libguava-java, libhsqldb-java, libhttpclient-java, + libjaxb-api-java, libjoptsimple-java, libjpathwatch-java (>= 0.95-2), libsemver-java, libsimple-xml-java, libstax-java, + libtomcat9-java, libundertow-java, ${misc:Depends} Suggests: ===================================== debian/copyright ===================================== @@ -20,7 +20,7 @@ Copyright: Jared Breland <[email protected]> License: LGPL-3 Files: debian/* -Copyright: 2015-2017, Markus Koschany <[email protected]> +Copyright: 2015-2018, Markus Koschany <[email protected]> License: GPL-3+ License: GPL-3+ ===================================== debian/links ===================================== @@ -14,9 +14,9 @@ usr/share/java/jpathwatch.jar usr/share/syncany/lib/jpathwatch.jar usr/share/java/simple-xml.jar usr/share/syncany/lib/simple-xml.jar usr/share/java/stax-api.jar usr/share/syncany/lib/stax-api.jar usr/share/java/stax.jar usr/share/syncany/lib/stax.jar -usr/share/java/tomcat8-annotations-api.jar usr/share/syncany/lib/tomcat8-annotations-api.jar -usr/share/java/tomcat8-servlet-api.jar usr/share/syncany/lib/tomcat8-servlet-api.jar -usr/share/java/tomcat8-websocket-api.jar usr/share/syncany/lib/tomcat8-websocket-api.jar +usr/share/java/tomcat9-annotations-api.jar usr/share/syncany/lib/tomcat9-annotations-api.jar +usr/share/java/tomcat9-servlet-api.jar usr/share/syncany/lib/tomcat9-servlet-api.jar +usr/share/java/tomcat9-websocket-api.jar usr/share/syncany/lib/tomcat9-websocket-api.jar usr/share/java/undertow-core.jar usr/share/syncany/lib/undertow-core.jar usr/share/java/undertow-servlet.jar usr/share/syncany/lib/undertow-servlet.jar usr/share/java/undertow-websockets-jsr.jar usr/share/syncany/lib/undertow-websockets-jsr.jar @@ -26,3 +26,4 @@ usr/share/java/xnio-nio.jar usr/share/syncany/lib/xnio-nio.jar usr/share/syncany/bin/sy usr/bin/sy usr/share/syncany/bin/syncany usr/bin/syncany usr/share/man/man1/sy.1.gz /usr/share/man/man1/syncany.1.gz +usr/share/java/jaxb-api.jar usr/share/syncany/lib/jaxb-api.jar ===================================== debian/maven.rules ===================================== @@ -1,2 +1,5 @@ org.bouncycastle s/bcprov-jdk15on/bcprov/ * s/.*/debian/ * * org.bouncycastle s/bcpkix-jdk15on/bcpkix/ * s/.*/debian/ * * +javax.servlet javax.servlet-api * s/.*/3.1/ * * +javax.websocket javax.websocket-api s/.*/1.0/ * * + ===================================== debian/patches/javax.xml.bind.patch ===================================== @@ -0,0 +1,22 @@ +From: Markus Koschany <[email protected]> +Date: Mon, 17 Dec 2018 00:27:05 +0100 +Subject: javax.xml.bind + +Add missing build-dependency on javax.xml.bind because we compile with OpenJDK +11 now. +--- + syncany-util/build.gradle | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/syncany-util/build.gradle b/syncany-util/build.gradle +index 8653d02..be650b6 100644 +--- a/syncany-util/build.gradle ++++ b/syncany-util/build.gradle +@@ -11,6 +11,7 @@ repositories { + dependencies { + compile "commons-io:commons-io:2.4" + compile "org.hsqldb:hsqldb:2.3.1" ++ compile "javax.xml.bind:jaxb-api:2.3.1" + + testCompile "junit:junit:4.9" + } ===================================== debian/patches/series ===================================== @@ -2,3 +2,4 @@ applicationVersion.patch build.patch no-tests.patch startup-script.patch +javax.xml.bind.patch ===================================== debian/patches/startup-script.patch ===================================== @@ -11,7 +11,7 @@ Let's fix this by using the common [ and = expression. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/gradle/application.distribution.gradle b/gradle/gradle/application.distribution.gradle -index a6316b9..1fb66a0 100644 +index a6316b9..7efd841 100644 --- a/gradle/gradle/application.distribution.gradle +++ b/gradle/gradle/application.distribution.gradle @@ -137,7 +137,7 @@ startScripts { View it on GitLab: https://salsa.debian.org/java-team/syncany/compare/06c0aab0a749b610c2dbb92f4cc385940c5e3e13...6aae675c02073ee2fb00047b21a4b5d845e4d571 -- View it on GitLab: https://salsa.debian.org/java-team/syncany/compare/06c0aab0a749b610c2dbb92f4cc385940c5e3e13...6aae675c02073ee2fb00047b21a4b5d845e4d571 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
