On Thu, Apr 11, 2019 at 10:32:31PM +0200, Rene Engelhard wrote:
> this is now 1:5.2.7-1+deb9u7 given the Reiwa fix...
>
> New diff will follow.
Here it is:
diff -Nru libreoffice-5.2.7/debian/changelog libreoffice-5.2.7/debian/changelog
--- libreoffice-5.2.7/debian/changelog 2019-04-11 21:48:53.000000000 +0200
+++ libreoffice-5.2.7/debian/changelog 2019-01-23 18:51:09.000000000 +0100
@@ -1,3 +1,15 @@
+libreoffice (1:5.2.7-1+deb9u7) stretch; urgency=medium
+
+ * debian/patches/mention-java-common-package.diff: update message to
+ reflect current config dir...
+ * debian/patches/disableClassPathURLCheck.diff: revert openjdk is fixed
+
+ * debian/control.in:
+ - make -core conflict against openjdk-8-jre-headless (= 8u181-b13-2~deb9u1)
+ (closes: 913641#) and build-conflict against it
+
+ -- Rene Engelhard <r...@debian.org> Wed, 23 Jan 2019 18:51:09 +0100
+
libreoffice (1:5.2.7-1+deb9u6) stable; urgency=medium
* debian/patches/jp-JP-Reiwa.diff: Introduce next Japanese gengou
diff -Nru libreoffice-5.2.7/debian/control libreoffice-5.2.7/debian/control
--- libreoffice-5.2.7/debian/control 2019-04-11 21:48:53.000000000 +0200
+++ libreoffice-5.2.7/debian/control 2019-01-23 18:51:09.000000000 +0100
@@ -183,6 +183,7 @@
nvidia-glx-dev,
nvidia-glx-legacy-dev,
nvidia-libopencl1,
+ openjdk-8-jre-headless (= 8u181-b13-2~deb9u1),
qt3-dev-tools
Standards-Version: 3.9.4
Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
@@ -430,7 +431,10 @@
myspell-sw (<< 1:3.1.0-3),
myspell-th (<< 1:3.1.0-3),
myspell-tl (<< 0.4-0-5)
-Conflicts: cacao-oj6-jre, libreoffice-filter-binfilter, libreoffice-unbundled
+Conflicts: cacao-oj6-jre,
+ libreoffice-filter-binfilter,
+ libreoffice-unbundled,
+ openjdk-8-jre-headless (= 8u181-b13-2~deb9u1)
Provides: libreoffice-bundled
Replaces: libreoffice-calc (<< 1:3.3.2-5),
libreoffice-common (<< 1:4.4.0~rc3-1),
diff -Nru libreoffice-5.2.7/debian/control.in
libreoffice-5.2.7/debian/control.in
--- libreoffice-5.2.7/debian/control.in 2019-04-11 21:48:53.000000000 +0200
+++ libreoffice-5.2.7/debian/control.in 2019-01-23 18:51:09.000000000 +0100
@@ -20,6 +20,7 @@
libc6-dev (= 2.6.1-4) [i386 amd64],
libcairo2 (= 1.4.8-1),
libxul-dev (= 1.8.0.13~pre070720-0etch1),
+ openjdk-8-jre-headless (= 8u181-b13-2~deb9u1),
nvidia-glx-dev,
nvidia-glx-legacy-dev,
qt3-dev-tools,
@@ -269,7 +270,7 @@
myspell-th (<< 1:3.1.0-3),
myspell-tl (<< 0.4-0-5),
browser-plugin-libreoffice
-Conflicts: cacao-oj6-jre, libreoffice-filter-binfilter, libreoffice-unbundled
+Conflicts: cacao-oj6-jre, libreoffice-filter-binfilter, libreoffice-unbundled,
openjdk-8-jre-headless (= 8u181-b13-2~deb9u1)
Provides: libreoffice-bundled
Replaces: libreoffice-calc (<< 1:3.3.2-5),
libreoffice-common (<< 1:4.4.0~rc3-1),
diff -Nru libreoffice-5.2.7/debian/patches/disableClassPathURLCheck.diff
libreoffice-5.2.7/debian/patches/disableClassPathURLCheck.diff
--- libreoffice-5.2.7/debian/patches/disableClassPathURLCheck.diff
2019-04-11 21:48:53.000000000 +0200
+++ libreoffice-5.2.7/debian/patches/disableClassPathURLCheck.diff
1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
---- a/configure.ac-old 2018-12-28 11:10:35.953066686 +0100
-+++ b/configure.ac 2018-12-28 11:11:06.049403639 +0100
-@@ -6976,6 +6976,7 @@
-
- # set to limit VM usage for JunitTests
- JAVAIFLAGS=-Xmx64M
-+ JAVAIFLAGS="$JAVAIFLAGS
-Djdk.net.URLClassPath.disableClassPathURLCheck=true"
- # set to limit VM usage for javac
- JAVAFLAGS=-J-Xmx128M
- fi
diff -Nru libreoffice-5.2.7/debian/patches/mention-java-common-package.diff
libreoffice-5.2.7/debian/patches/mention-java-common-package.diff
--- libreoffice-5.2.7/debian/patches/mention-java-common-package.diff
2019-04-11 21:48:53.000000000 +0200
+++ libreoffice-5.2.7/debian/patches/mention-java-common-package.diff
2019-01-23 18:51:09.000000000 +0100
@@ -8,7 +8,7 @@
fprintf(stderr,"javaldx: Could not find a Java Runtime Environment!
\n");
+ fprintf(stderr,"Please ensure that a JVM and the package
libreoffice-java-common\n");
+ fprintf(stderr,"is installed.\n");
-+ fprintf(stderr,"If it is already installed then try removing
~/.libreoffice/3/user/config/javasettings_Linux_*.xml\n");
++ fprintf(stderr,"If it is already installed then try removing
~/.config/libreoffice/4/user/config/javasettings_Linux_*.xml\n");
return false;
}
else if (errcode != JFW_E_NONE && errcode != JFW_E_DIRECT_MODE)
diff -Nru libreoffice-5.2.7/debian/patches/series
libreoffice-5.2.7/debian/patches/series
--- libreoffice-5.2.7/debian/patches/series 2019-04-11 21:48:53.000000000
+0200
+++ libreoffice-5.2.7/debian/patches/series 2019-01-23 18:51:09.000000000
+0100
@@ -39,7 +39,6 @@
layout-footnote-use-after-free.diff
CVE-2018-10119.diff
CVE-2018-10120.diff
-disableClassPathURLCheck.diff
keep-pyuno-script-processing-below-base-uri.diff
show-partial-signatures-even-if-cert-validation-fails.diff
jp-JP-Reiwa.diff
Regards,
Rene
