diff -Nru writer2latex-1.6.1/debian/changelog writer2latex-1.6.1/debian/changelog --- writer2latex-1.6.1/debian/changelog 2025-12-28 14:09:34.000000000 +0100 +++ writer2latex-1.6.1/debian/changelog 2025-12-29 10:25:56.000000000 +0100 @@ -1,3 +1,32 @@ +writer2latex (1.6.1-5) unstable; urgency=medium + + * debian/patches/fix-config-default.xml.diff: fix up default.xml template + * debian/patches/dont-use-supertabular.diff: add config to use avoid using + supertabular. + Does not work since texlive 2025.06 + * debian/patches/texlive-2025.diff: add patch - supposed to fix the above + according to https://github.com/latex3/latex2e/issues/1781 but doesn't - + disabled + * debian/patches/remove-supertabular-usage.diff: add (manually applied, see + below) patch to remove supertabular usage completely from the code + + * debian/writer2latex.install: + install source/java/writer2latex/latex/config/default.xml + into /etc/writer2latex/default.xml + * debian/patches/w2l-default-config.diff: use w2l + -config=/etc/writer2latex/default.xml + * debian/rules: build oxt with remove-supertabular-usage.diff applied + (use those for populate the packages) and after that w2l "correctly". + * debian/tests/*: convert sample-article.odt and run pdflatex on it + (user-manual.odt hangs pdflatex...) + * debian/control: clean up suggests/recommends: + - only suggest www-browser | pdf-viewer | libreoffice-writer in + writer2latex + - recommend texlive-latex-recommended in (libreoffice-)writer2latex + - recommend libreoffice-writer in libreoffice-writer2{latex,xhtml} + + -- Rene Engelhard Mon, 29 Dec 2025 10:25:56 +0100 + writer2latex (1.6.1-4) unstable; urgency=medium * install xhtml-config-sample extension in libreoffice-writer2xhtml diff -Nru writer2latex-1.6.1/debian/control writer2latex-1.6.1/debian/control --- writer2latex-1.6.1/debian/control 2025-12-28 14:08:10.000000000 +0100 +++ writer2latex-1.6.1/debian/control 2025-12-29 10:25:56.000000000 +0100 @@ -29,8 +29,9 @@ default-jre | java8-runtime, libwriter2latex-java, ${misc:Depends}, -Recommends: +Suggests: www-browser | x-www-browser | pdf-viewer | libreoffice-writer, +Recommends: texlive-latex-recommended Description: OpenOffice.org Writer/Calc to LaTeX/XHTML converter Writer2LaTeX is a java utility to convert OpenOffice.org/LibreOffice documents – in particular documents containing formulas – into other @@ -121,6 +122,7 @@ Enhances: libreoffice-calc, libreoffice-writer, +Recommends: libreoffice-writer, texlive-latex-recommended Description: Writer/Calc to LaTeX converter extension for LibreOffice Writer2LaTeX is a java utility to convert OpenOffice.org/LibreOffice documents – in particular documents containing formulas – into other @@ -148,6 +150,7 @@ Enhances: libreoffice-calc, libreoffice-writer, +Recommends: libreoffice-writer Description: Writer/Calc to XHTML converter extension for LibreOffice Writer2LaTeX is a java utility to convert OpenOffice.org/LibreOffice documents – in particular documents containing formulas – into other diff -Nru writer2latex-1.6.1/debian/patches/dirs.diff writer2latex-1.6.1/debian/patches/dirs.diff --- writer2latex-1.6.1/debian/patches/dirs.diff 2025-12-28 14:08:10.000000000 +0100 +++ writer2latex-1.6.1/debian/patches/dirs.diff 2025-12-29 10:25:56.000000000 +0100 @@ -10,13 +10,6 @@ # If the required JVM is not in your path, or the path is not set by JAVA_HOME, # please edit the following line to contain the full path and file name -@@ -19,4 +19,4 @@ - JAVAEXE="$JAVA_HOME/bin/java" - fi - --$JAVAEXE -jar "$W2LPATH/writer2latex.jar" "$@" -\ Kein Zeilenumbruch am Dateiende. -+$JAVAEXE -jar "$W2LPATH/writer2latex.jar" "$@" diff --git a/build.xml b/build.xml index ff7e492..c9fae53 100644 --- a/build.xml diff -Nru writer2latex-1.6.1/debian/patches/dont-use-supertabular.diff writer2latex-1.6.1/debian/patches/dont-use-supertabular.diff --- writer2latex-1.6.1/debian/patches/dont-use-supertabular.diff 1970-01-01 01:00:00.000000000 +0100 +++ writer2latex-1.6.1/debian/patches/dont-use-supertabular.diff 2025-12-29 10:25:56.000000000 +0100 @@ -0,0 +1,30 @@ +# supertabular is broken in texlive >= 2025.06. See +# see https://tex.stackexchange.com/questions/750538/supertabular-became-wrong-in-texlive-2025-06-02 +# avoid it. + +Index: writer2latex/source/java/writer2latex/latex/config/default.xml +=================================================================== +--- writer2latex.orig/source/java/writer2latex/latex/config/default.xml ++++ writer2latex/source/java/writer2latex/latex/config/default.xml +@@ -4,5 +4,7 @@ + This is a sample configuration file for Writer2LaTeX. + --> + ++ + + +diff --git a/source/oxt/w2lconfig/config/article.xml b/source/oxt/w2lconfig/config/article.xml +index e185ca7..3e77d8d 100644 +--- a/source/oxt/w2lconfig/config/article.xml ++++ b/source/oxt/w2lconfig/config/article.xml +@@ -28,6 +28,8 @@ +