tag 964706 + patch thanks
Hi, Am 16.07.20 um 17:27 schrieb Rene Engelhard: > >>> Replacing org.openoffice:juh:jar:4.1.2 -> >>> org.libreoffice:juh:jar:debian >>> Replacing org.openoffice:jurt:jar:4.1.2 -> >>> org.libreoffice:jurt:jar:debian >>> Replacing org.openoffice:ridl:jar:4.1.2 -> >>> org.libreoffice:ridl:jar:debian >>> Replacing org.openoffice:unoil:jar:4.1.2 -> >>> org.libreoffice:unoil:jar:debian > So they are found there... This sounded like maven stuff so I tried https://gerrit.libreoffice.org/c/core/+/98929 (hacked into the local /usr/share/maven-repo poms), but still it failed. > All of thse libs above are now dummy libs for liblibreoffice.jar. They > are empty and just contain Class-Path: > [...] > As a workaround one might patch jabref to use libreoffice.jar directly > - which is the library to use anyway. (the others are still packaged for > compatibility with old packages and third-party stuff which doesn't know > about libreoffice.jar...) but... This is what I did now... diff --git a/debian/changelog b/debian/changelog index 8a56e6c..459513d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,12 +2,13 @@ jabref (3.8.2+ds-14) unstable; urgency=medium * Team upload. - * add explicit dependencies to libjuh-java, libjurt-java, - libridl-java, libunoil-java (closes: #965133) + * use org.libreoffice:libreoffice:7.0.0 and build-depend on + liblibreoffice-java instead of the compatiblity libraries + (closes: #964706, #965133) * only recommend libreoffice-java-common and remove it from Build-Depends: (unneeded) - -- Rene Engelhard <r...@debian.org> Thu, 09 Jul 2020 21:19:22 +0000 + -- Rene Engelhard <r...@debian.org> Thu, 16 Jul 2020 23:19:05 +0200 jabref (3.8.2+ds-13) unstable; urgency=medium diff --git a/debian/control b/debian/control index 33977ba..fe9a312 100644 --- a/debian/control +++ b/debian/control @@ -35,10 +35,7 @@ Build-Depends-Indep: ant, libpdfbox-java, libpostgresql-jdbc-java (>= 9.4.1212), librelaxng-datatype-java, - libjuh-java, - libjurt-java, - libridl-java, - libunoil-java, + liblibreoffice-java, libscram-java, libspin-java, libswingx-java, @@ -78,10 +75,7 @@ Depends: ${misc:Depends}, liblog4j2-java (>= 2.10.0-2) | liblog4j2-java (<< 2.10), libmicroba-java, libpdfbox-java (<< 1:2), - libjuh-java, - libjurt-java, - libridl-java, - libunoil-java, + liblibreoffice-java, libspin-java, libswing-layout-java, libswingx-java (<< 1:1.6.4), diff --git a/debian/patches/010_gradle_build.patch b/debian/patches/010_gradle_build.patch index 3d19f7e..0797b5f 100644 --- a/debian/patches/010_gradle_build.patch +++ b/debian/patches/010_gradle_build.patch @@ -64,6 +64,18 @@ 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' +@@ -86,10 +86,7 @@ dependencies { + + 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' + + compile 'com.github.bkromhout:java-diff-utils:2.1.1' + @@ -97,9 +106,8 @@ antlr4 'org.antlr:antlr4:4.6' compile 'org.antlr:antlr4-runtime:4.6' Regards, Rene
