gregor herrmann pushed to branch master at Debian Java Maintainers / jabref
Commits: 61755c23 by Rene Engelhard at 2020-07-16T17:54:16+02:00 add explicit dependencies to libjuh-java, libjurt-java, libridl-java, libunoil-java (closes: #965133) - - - - - c9988ab8 by Rene Engelhard at 2020-07-16T17:54:29+02:00 only recommend libreoffice-java-common and remove it from Build-Depends: (unneeded) - - - - - 8acca415 by Rene Engelhard at 2020-07-16T23:24:46+02:00 use org.libreoffice:libreoffice:7.0.0 and build-depend on liblibreoffice-java instead of the compatiblity libraries (closes: #964706, #965133) - - - - - 893a1e0e by gregor herrmann at 2020-07-17T01:42:25+02:00 Refresh 010_gradle_build.patch. - - - - - 217a43ea by gregor herrmann at 2020-07-17T01:56:10+02:00 Bump debhelper-compat to 13. - - - - - 95f1d9cb by gregor herrmann at 2020-07-17T01:56:56+02:00 Disable test suite which gets enabled by debhelper-compat (= 13) but fails. - - - - - 514afa0c by gregor herrmann at 2020-07-17T02:01:15+02:00 releasing package jabref version 3.8.2+ds-14 into distribution unstable Gbp-Dch: Ignore - - - - - 4 changed files: - debian/changelog - debian/control - debian/patches/010_gradle_build.patch - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,20 @@ +jabref (3.8.2+ds-14) unstable; urgency=medium + + [ Rene Engelhard ] + * use org.libreoffice:libreoffice:7.0.0 and build-depend on + liblibreoffice-java instead of the compatibility libraries + (closes: #964706, #965133) + * only recommend libreoffice-java-common and remove it from Build-Depends: + (unneeded) + + [ gregor herrmann ] + * Refresh 010_gradle_build.patch. + * Bump debhelper-compat to 13. + * Disable test suite which gets enabled by debhelper-compat (= 13) but + fails. + + -- gregor herrmann <[email protected]> Fri, 17 Jul 2020 01:49:01 +0200 + jabref (3.8.2+ds-13) unstable; urgency=medium * Add patch from upstream Git repo to fix DOI fetcher. ===================================== debian/control ===================================== @@ -4,7 +4,7 @@ Uploaders: tony mancill <[email protected]>, gregor herrmann <[email protected]> Section: tex Priority: optional -Build-Depends: debhelper-compat (= 12), +Build-Depends: debhelper-compat (= 13), gradle-debian-helper Build-Depends-Indep: ant, antlr, @@ -35,7 +35,7 @@ Build-Depends-Indep: ant, libpdfbox-java, libpostgresql-jdbc-java (>= 9.4.1212), librelaxng-datatype-java, - libreoffice-java-common, + liblibreoffice-java, libscram-java, libspin-java, libswingx-java, @@ -75,7 +75,7 @@ Depends: ${misc:Depends}, liblog4j2-java (>= 2.10.0-2) | liblog4j2-java (<< 2.10), libmicroba-java, libpdfbox-java (<< 1:2), - libreoffice-java-common, + liblibreoffice-java, libspin-java, libswing-layout-java, libswingx-java (<< 1:1.6.4), @@ -83,6 +83,7 @@ Depends: ${misc:Depends}, Recommends: libmariadb-java, libpostgresql-jdbc-java (>= 9.4.1212), libreoffice-writer, + libreoffice-java-common, xdg-utils Suggests: gv | postscript-viewer, xpdf | pdf-viewer ===================================== debian/patches/010_gradle_build.patch ===================================== @@ -1,6 +1,8 @@ Description: patch upstream build system for building on Debian -Author: tony mancill <[email protected]> Forwarded: not-needed +Author: tony mancill <[email protected]> +Reviewed-by: gregor herrmann <[email protected]> +Last-Update: 2020-07-17 --- a/build.gradle +++ b/build.gradle @@ -64,7 +66,19 @@ Forwarded: not-needed compile 'com.jgoodies:jgoodies-common:1.8.1' compile 'com.jgoodies:jgoodies-forms:1.9.0' compile 'com.jgoodies:jgoodies-looks:2.7.0' -@@ -97,9 +106,8 @@ +@@ -86,10 +95,7 @@ + + compile 'commons-cli:commons-cli:1.3.1' + +- compile 'org.openoffice:juh:4.1.2' +- compile 'org.openoffice:jurt:4.1.2' +- compile 'org.openoffice:ridl:4.1.2' +- compile 'org.openoffice:unoil:4.1.2' ++ compile 'org.libreoffice:libreoffice:7.0.0' + + antlr3 'org.antlr:antlr:3.5.2' + compile 'org.antlr:antlr-runtime:3.5.2' +@@ -97,9 +103,8 @@ antlr4 'org.antlr:antlr4:4.6' compile 'org.antlr:antlr4-runtime:4.6' @@ -76,7 +90,7 @@ Forwarded: not-needed compile 'org.postgresql:postgresql:9.4.1210' compile 'net.java.dev.glazedlists:glazedlists_java15:1.9.1' -@@ -118,8 +126,8 @@ +@@ -118,8 +123,8 @@ compile 'org.apache.logging.log4j:log4j-jcl:2.7' compile 'org.apache.logging.log4j:log4j-api:2.7' compile 'org.apache.logging.log4j:log4j-core:2.7' @@ -87,7 +101,7 @@ Forwarded: not-needed testCompile 'junit:junit:4.12' testCompile 'org.mockito:mockito-core:2.6.2' -@@ -257,11 +265,12 @@ +@@ -257,11 +262,12 @@ tasks.withType(Test) { reports.html.destination = file("${reporting.baseDir}/${name}") @@ -103,7 +117,7 @@ Forwarded: not-needed jacocoTestReport { reports { xml.enabled = true // coveralls plugin depends on xml format report -@@ -299,6 +308,7 @@ +@@ -299,6 +305,7 @@ } }) } @@ -111,7 +125,7 @@ Forwarded: not-needed /* * Changes project.version to VERSION--snapshot--DATE--GIT_HASH -@@ -333,6 +343,7 @@ +@@ -333,6 +340,7 @@ project.version += "--snapshot--" + infoString } @@ -119,7 +133,7 @@ Forwarded: not-needed // has to be defined AFTER 'dev' things to have the correct project.version task media(type: com.install4j.gradle.Install4jTask, dependsOn: "releaseJar") { projectFile = file('jabref.install4j') -@@ -391,3 +402,4 @@ +@@ -391,3 +399,4 @@ // See https://github.com/andrewgaul/modernizer-maven-plugin for more information on modernizer failOnViolations = false } ===================================== debian/rules ===================================== @@ -5,6 +5,10 @@ export DH_VERBOSE=1 %: dh $@ --buildsystem=gradle +override_dh_auto_test: + # enabled by debhelper-compat=13 but fails + true + override_dh_auto_install: dh_auto_install install -m 755 debian/jabref-wrapper $(CURDIR)/debian/jabref/usr/bin/jabref View it on GitLab: https://salsa.debian.org/java-team/jabref/-/compare/c7c73db762389591c667c566a8a752066496e6b8...514afa0cfc5b6b42bb23c565b8103dd1ec66c3ee -- View it on GitLab: https://salsa.debian.org/java-team/jabref/-/compare/c7c73db762389591c667c566a8a752066496e6b8...514afa0cfc5b6b42bb23c565b8103dd1ec66c3ee 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
