diff -Nru writer2latex-1.4/debian/changelog writer2latex-1.4/debian/changelog --- writer2latex-1.4/debian/changelog 2017-08-16 20:54:15.000000000 +0000 +++ writer2latex-1.4/debian/changelog 2019-02-26 15:44:25.000000000 +0000 @@ -1,3 +1,45 @@ +writer2latex (1.4-8~18.04) bionic; urgency=medium + + * Backport for OpenJDK 11. LP: #1814133. + + -- Matthias Klose Tue, 26 Feb 2019 16:44:25 +0100 + +writer2latex (1.4-8) unstable; urgency=medium + + * remove code changes of no_JSON.diff and use libandroid-json-java. + * move more java5-runtime to java6-runtimes + + -- Rene Engelhard Sun, 04 Nov 2018 21:51:10 +0100 + +writer2latex (1.4-7) unstable; urgency=medium + + * Revert "remove code changes of no_JSON.diff and use libandroid-json-java" + for now... + + -- Rene Engelhard Sun, 04 Nov 2018 20:59:52 +0100 + +writer2latex (1.4-6) unstable; urgency=medium + + * build-depend on libjaxb-java and add jaxb-api.jar to main.class.path, + thanks Emmanuel Bourg for the hint (closes: #912270) + * remove code changes of no_JSON.diff and use libandroid-json-java + * java2-runtime -> java6-runtime in Depends:... + + -- Rene Engelhard Sun, 04 Nov 2018 18:47:00 +0000 + +writer2latex (1.4-5) unstable; urgency=medium + + * also update libreoffice-writer2xhtml... + + -- Rene Engelhard Mon, 23 Apr 2018 12:02:18 +0200 + +writer2latex (1.4-4) unstable; urgency=medium + + * update Vcs-* to salsa + * remove g(c|i)j alternatives in Depends: + + -- Rene Engelhard Sun, 22 Apr 2018 17:52:22 +0000 + writer2latex (1.4-3) unstable; urgency=medium * debian/patches/no-built-by.diff: don't write Built-By: into the manifest diff -Nru writer2latex-1.4/debian/control writer2latex-1.4/debian/control --- writer2latex-1.4/debian/control 2017-05-26 12:14:14.000000000 +0000 +++ writer2latex-1.4/debian/control 2018-11-04 20:51:10.000000000 +0000 @@ -3,16 +3,16 @@ Priority: optional Maintainer: Debian LibreOffice Maintainers Uploaders: Rene Engelhard , Chris Halls -Build-Depends: debhelper (>= 6.0.7~), ant, libxerces2-java, libxalan2-java, default-jdk (>= 2:1.6), libreoffice-java-common (>= 1:3.5.0~), ure (>= 1.4.1~), tex-common, zip, unzip +Build-Depends: debhelper (>= 6.0.7~), ant, libxerces2-java, libxalan2-java, default-jdk (>= 2:1.6), libreoffice-java-common (>= 1:3.5.0~), ure (>= 1.4.1~), tex-common, zip, unzip, libandroid-json-java, libjaxb-java Build-Conflicts: ant (= 1.8.0-1), ant (= 1.8.0-2), ant (= 1.8.0-3) Standards-Version: 3.7.2 -Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/writer2latex.git -Vcs-Browser: http://git.debian.org/?p=pkg-openoffice/writer2latex.git;a=summary +Vcs-Git: https://salsa.debian.org/libreoffice-team/extensions/writer2latex.git +Vcs-Browser: https://salsa.debian.org/libreoffice-team/extensions/writer2latex Homepage: http://writer2latex.sourceforge.net Package: writer2latex Architecture: all -Depends: gij | java2-runtime, libwriter2latex-java, ${misc:Depends} +Depends: java6-runtime, libwriter2latex-java, ${misc:Depends} Recommends: www-browser | x-www-browser | pdf-viewer | libreoffice-writer Description: OpenOffice.org Writer/Calc to LaTeX/XHTML converter Writer2LaTeX is a java utility to convert OpenOffice.org/LibreOffice @@ -69,7 +69,7 @@ Package: libwriter2latex-java Section: java Architecture: all -Depends: libxalan2-java, libxerces2-java, ${misc:Depends} +Depends: libxalan2-java, libxerces2-java, libandroid-json-java, libjaxb-java, ${misc:Depends} Description: OpenOffice.org Writer/Calc to LaTeX/XHTML converter -- library Writer2LaTeX is a java utility to convert OpenOffice.org/LibreOffice documents - in particular documents containing formulas - into other @@ -87,7 +87,7 @@ Package: libreoffice-writer2latex Architecture: all -Depends: default-jre | gcj-jre | java-gcj-compat | openjdk-6-jre | sun-java5-jre | sun-java6-jre | java5-runtime | jre, libreoffice-core (>= 1:2.3.0~oog680m1), libreoffice-java-common (>= 1:2.3.0~oog680m1), ${misc:Depends} +Depends: default-jre | java6-runtime, libreoffice-core (>= 1:2.3.0~oog680m1), libreoffice-java-common (>= 1:2.3.0~oog680m1), ${misc:Depends} Enhances: libreoffice-writer, libreoffice-calc Conflicts: libreoffice-core (<< 1:3.0.0~), libreoffice-common (<< 1:3.0.1-10), ure (<< 1.5.1+OOo3.1.1-15) Description: Writer/Calc to LaTeX converter extension for LibreOffice @@ -107,7 +107,7 @@ Package: libreoffice-writer2xhtml Architecture: all -Depends: default-jre | gcj-jre | java-gcj-compat | openjdk-6-jre | sun-java5-jre | sun-java6-jre | java5-runtime | jre, libreoffice-core (>= 1:2.3.0~oog680m1), libreoffice-java-common (>= 1:2.3.0~oog680m1), ${misc:Depends} +Depends: default-jre | java6-runtime, libreoffice-core (>= 1:2.3.0~oog680m1), libreoffice-java-common (>= 1:2.3.0~oog680m1), ${misc:Depends} Enhances: libreoffice-writer, libreoffice-calc Conflicts: libreoffice-core (<< 1:3.0.0~), libreoffice-common (<< 1:3.0.1-10), ure (<< 1.5.1+OOo3.1.1-15) Description: Writer/Calc to XHTML converter extension for LibreOffice diff -Nru writer2latex-1.4/debian/patches/android-JSON.diff writer2latex-1.4/debian/patches/android-JSON.diff --- writer2latex-1.4/debian/patches/android-JSON.diff 1970-01-01 00:00:00.000000000 +0000 +++ writer2latex-1.4/debian/patches/android-JSON.diff 2018-11-04 20:50:10.000000000 +0000 @@ -0,0 +1,20 @@ +--- a/build.xml-old 2018-11-04 19:00:48.902249745 +0100 ++++ b/build.xml 2018-11-04 19:01:08.266681273 +0100 +@@ -51,6 +51,8 @@ + + + ++ + +@@ -109,7 +109,7 @@ + + + +- ++ + + + diff -Nru writer2latex-1.4/debian/patches/BASE64_no_Sunism.diff writer2latex-1.4/debian/patches/BASE64_no_Sunism.diff --- writer2latex-1.4/debian/patches/BASE64_no_Sunism.diff 1970-01-01 00:00:00.000000000 +0000 +++ writer2latex-1.4/debian/patches/BASE64_no_Sunism.diff 2018-11-04 18:19:09.000000000 +0000 @@ -0,0 +1,33 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_BASE64_no_Sunism.dpatch by Rene Engelhard +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: remove Sunism + +@DPATCH@ +diff -urNad writer2latex-0.5~/build.xml writer2latex-0.5/build.xml +--- writer2latex-0.5~/build.xml 2006-11-02 11:15:42.000000000 +0100 ++++ writer2latex-0.5/build.xml 2007-11-20 21:17:21.000000000 +0100 +@@ -85,7 +85,7 @@ + + + +- ++ + + + +diff -urNad writer2latex-0.5~/source/writer2latex/office/ImageLoader.java writer2latex-0.5/source/writer2latex/office/ImageLoader.java +--- writer2latex-1.0~beta2/source/java/writer2latex/office/ImageLoader.java 2007-04-17 09:30:42.000000000 +0200 ++++ writer2latex-1.0~beta2/source/java/writer2latex/office/ImageLoader.java 2007-11-20 21:18:32.000000000 +0100 +@@ -107,8 +107,8 @@ + } + // TODO: Use another base64 decoder. This one is "nonstandard" + try { +- blob = new sun.misc.BASE64Decoder().decodeBuffer(buf.toString()); +- } catch (IOException e) { ++ blob = org.apache.xerces.impl.dv.util.Base64.decode(buf.toString()); ++ } catch (Exception e) { + System.err.println("Oops - error converting base64"); + } + sMIME = MIMETypes.getMagicMIMEType(blob); diff -Nru writer2latex-1.4/debian/patches/BASE64_no_Sunism.dirr writer2latex-1.4/debian/patches/BASE64_no_Sunism.dirr --- writer2latex-1.4/debian/patches/BASE64_no_Sunism.dirr 2017-05-26 12:14:14.000000000 +0000 +++ writer2latex-1.4/debian/patches/BASE64_no_Sunism.dirr 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 02_BASE64_no_Sunism.dpatch by Rene Engelhard -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: remove Sunism - -@DPATCH@ -diff -urNad writer2latex-0.5~/build.xml writer2latex-0.5/build.xml ---- writer2latex-0.5~/build.xml 2006-11-02 11:15:42.000000000 +0100 -+++ writer2latex-0.5/build.xml 2007-11-20 21:17:21.000000000 +0100 -@@ -85,7 +85,7 @@ - - - -- -+ - - - -diff -urNad writer2latex-0.5~/source/writer2latex/office/ImageLoader.java writer2latex-0.5/source/writer2latex/office/ImageLoader.java ---- writer2latex-1.0~beta2/source/java/writer2latex/office/ImageLoader.java 2007-04-17 09:30:42.000000000 +0200 -+++ writer2latex-1.0~beta2/source/java/writer2latex/office/ImageLoader.java 2007-11-20 21:18:32.000000000 +0100 -@@ -107,8 +107,8 @@ - } - // TODO: Use another base64 decoder. This one is "nonstandard" - try { -- blob = new sun.misc.BASE64Decoder().decodeBuffer(buf.toString()); -- } catch (IOException e) { -+ blob = org.apache.xerces.impl.dv.util.Base64.decode(buf.toString()); -+ } catch (Exception e) { - System.err.println("Oops - error converting base64"); - } - sMIME = MIMETypes.getMagicMIMEType(blob); diff -Nru writer2latex-1.4/debian/patches/jaxb-api.diff writer2latex-1.4/debian/patches/jaxb-api.diff --- writer2latex-1.4/debian/patches/jaxb-api.diff 1970-01-01 00:00:00.000000000 +0000 +++ writer2latex-1.4/debian/patches/jaxb-api.diff 2018-11-04 20:49:56.000000000 +0000 @@ -0,0 +1,22 @@ +diff --git a/build.xml b/build.xml +index 56be5f1..13bdb4c 100644 +--- a/build.xml ++++ b/build.xml +@@ -50,6 +50,8 @@ + + + ++ + + + + +- ++ + + + diff -Nru writer2latex-1.4/debian/patches/series writer2latex-1.4/debian/patches/series --- writer2latex-1.4/debian/patches/series 2017-08-16 20:53:36.000000000 +0000 +++ writer2latex-1.4/debian/patches/series 2018-11-04 20:50:10.000000000 +0000 @@ -4,3 +4,5 @@ no_JSON.diff javadoc-notimestamp.diff no-built-by.diff +jaxb-api.diff +android-JSON.diff