Bug#926199: stretch-pu: package libreoffice/1:5.2.7-1+deb9u6

2019-04-16 Thread Rene Engelhard
Hi,

On Tue, Apr 16, 2019 at 10:05:30AM +0100, Adam D. Barratt wrote:
> OK, thanks. Please go ahead.

Uploaded, thanks.

Regards,

Rene



Bug#926199: stretch-pu: package libreoffice/1:5.2.7-1+deb9u6

2019-04-16 Thread Adam D. Barratt
Control: tags -1 + confirmed

On Mon, 2019-04-15 at 19:20 +0200, Rene Engelhard wrote:
> tag 926199 - moreinfo
> thanks
> 
> Hi Adam,
> 
> On Sun, Apr 14, 2019 at 09:23:10PM +0100, Adam D. Barratt wrote:
> > On Mon, 2019-04-01 at 21:43 +0200, Rene Engelhard wrote:
> > > now that https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911925
> > > is finally fixed in stretch-p-u I think it's time to fix
> > > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=913641 in the
> > > sense
> > > that we conflict against the "broken" OpenJDK (and build-conflict
> > > against it. So we can remove the "build hack" needed to be
> > > introduced
> > > in the +deb9u5 security update).
> > 
> > How much has the upgrade path from current stable been tested? e.g.
> 
> Good point...
> 
> > what happens if APT decides to upgrade LO before openjdk-8 and for
> > some
> > reason the system does not have the security.d.o package installed?
> 
> *Shrugs*, people should install security updates...

Sure, just trying to make sure we covered the bases. Sometimes we miss
really annoying corner cases that users manage to hit right away.

> Anyways:
> 
> Seems to just work. Plain stable + apt-get install libreoffice
> libreoffice-report-builder
> (which pulled in default-jre) and then adding proposed-updates and
> the
> new packages (deb9u7) and apt upgrade. See attached log.

OK, thanks. Please go ahead.

Regards,

Adam



Bug#926199: stretch-pu: package libreoffice/1:5.2.7-1+deb9u6

2019-04-15 Thread Rene Engelhard
tag 926199 - moreinfo
thanks

Hi Adam,

On Sun, Apr 14, 2019 at 09:23:10PM +0100, Adam D. Barratt wrote:
> On Mon, 2019-04-01 at 21:43 +0200, Rene Engelhard wrote:
> > now that https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911925
> > is finally fixed in stretch-p-u I think it's time to fix
> > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=913641 in the sense
> > that we conflict against the "broken" OpenJDK (and build-conflict
> > against it. So we can remove the "build hack" needed to be introduced
> > in the +deb9u5 security update).
> 
> How much has the upgrade path from current stable been tested? e.g.

Good point...

> what happens if APT decides to upgrade LO before openjdk-8 and for some
> reason the system does not have the security.d.o package installed?

*Shrugs*, people should install security updates...

Anyways:

Seems to just work. Plain stable + apt-get install libreoffice 
libreoffice-report-builder
(which pulled in default-jre) and then adding proposed-updates and the
new packages (deb9u7) and apt upgrade. See attached log.

Regards,

Rene

WARNING: apt does not have a stable CLI interface. Use with caution in scripts.

Reading package lists...
Building dependency tree...
Reading state information...
Calculating upgrade...
The following packages have been kept back:
  icedtea-netx
The following packages will be upgraded:
  ca-certificates-java fonts-opensymbol icedtea-netx-common libopenjp2-7
  libpq5 libreoffice libreoffice-avmedia-backend-gstreamer libreoffice-base
  libreoffice-base-core libreoffice-base-drivers libreoffice-calc
  libreoffice-common libreoffice-core libreoffice-draw libreoffice-impress
  libreoffice-java-common libreoffice-librelogo libreoffice-math
  libreoffice-nlpsolver libreoffice-ogltrans libreoffice-pdfimport
  libreoffice-report-builder libreoffice-report-builder-bin
  libreoffice-script-provider-bsh libreoffice-script-provider-js
  libreoffice-script-provider-python libreoffice-sdbc-hsqldb
  libreoffice-sdbc-postgresql libreoffice-style-galaxy
  libreoffice-wiki-publisher libreoffice-writer libssh2-1 libssl1.0.2
  libsystemd0 libudev1 openjdk-8-jre openjdk-8-jre-headless python3-uno
  systemd systemd-sysv tzdata udev uno-libs3 ure wget
45 upgraded, 0 newly installed, 0 to remove and 1 not upgraded.
Need to get 35.6 MB/119 MB of archives.
After this operation, 6623 kB disk space will be freed.
Do you want to continue? [Y/n] Get:1 
file:/home/rene/Debian/Pakete/LibreOffice/libreoffice/tmp ./ 
libreoffice-base-drivers 1:5.2.7-1+deb9u7 [509 kB]
Get:2 file:/home/rene/Debian/Pakete/LibreOffice/libreoffice/tmp ./ 
libreoffice-base 1:5.2.7-1+deb9u7 [1493 kB]
Get:3 file:/home/rene/Debian/Pakete/LibreOffice/libreoffice/tmp ./ 
libreoffice-calc 1:5.2.7-1+deb9u7 [6454 kB]
Get:4 file:/home/rene/Debian/Pakete/LibreOffice/libreoffice/tmp ./ 
libreoffice-impress 1:5.2.7-1+deb9u7 [918 kB]
Get:5 http://ftp.de.debian.org/debian proposed-updates/main amd64 libsystemd0 
amd64 232-25+deb9u11 [281 kB]
Get:6 file:/home/rene/Debian/Pakete/LibreOffice/libreoffice/tmp ./ 
libreoffice-draw 1:5.2.7-1+deb9u7 [2427 kB]
Get:7 http://ftp.de.debian.org/debian proposed-updates/main amd64 systemd amd64 
232-25+deb9u11 [2471 kB]
Get:8 file:/home/rene/Debian/Pakete/LibreOffice/libreoffice/tmp ./ 
libreoffice-writer 1:5.2.7-1+deb9u7 [7595 kB]
Get:9 file:/home/rene/Debian/Pakete/LibreOffice/libreoffice/tmp ./ uno-libs3 
5.2.7-1+deb9u7 [858 kB]
Get:10 file:/home/rene/Debian/Pakete/LibreOffice/libreoffice/tmp ./ 
libreoffice-ogltrans 1:5.2.7-1+deb9u7 [71.6 kB]
Get:11 file:/home/rene/Debian/Pakete/LibreOffice/libreoffice/tmp ./ ure 
5.2.7-1+deb9u7 [1689 kB]
Get:12 file:/home/rene/Debian/Pakete/LibreOffice/libreoffice/tmp ./ python3-uno 
1:5.2.7-1+deb9u7 [178 kB]
Get:13 file:/home/rene/Debian/Pakete/LibreOffice/libreoffice/tmp ./ 
libreoffice-sdbc-hsqldb 1:5.2.7-1+deb9u7 [109 kB]
Get:14 file:/home/rene/Debian/Pakete/LibreOffice/libreoffice/tmp ./ 
libreoffice-style-galaxy 1:5.2.7-1+deb9u7 [1844 kB]
Get:15 file:/home/rene/Debian/Pakete/LibreOffice/libreoffice/tmp ./ 
libreoffice-script-provider-js 1:5.2.7-1+deb9u7 [615 kB]
Get:16 file:/home/rene/Debian/Pakete/LibreOffice/libreoffice/tmp ./ 
libreoffice-script-provider-bsh 1:5.2.7-1+deb9u7 [32.9 kB]
Get:17 file:/home/rene/Debian/Pakete/LibreOffice/libreoffice/tmp ./ 
libreoffice-report-builder 1:5.2.7-1+deb9u7 [306 kB]
Get:18 file:/home/rene/Debian/Pakete/LibreOffice/libreoffice/tmp ./ 
libreoffice-pdfimport 1:5.2.7-1+deb9u7 [185 kB]
Get:19 file:/home/rene/Debian/Pakete/LibreOffice/libreoffice/tmp ./ 
libreoffice-java-common 1:5.2.7-1+deb9u7 [1933 kB]
Get:20 http://ftp.de.debian.org/debian proposed-updates/main amd64 udev amd64 
232-25+deb9u11 [1115 kB]
Get:21 http://ftp.de.debian.org/debian proposed-updates/main amd64 libudev1 
amd64 232-25+deb9u11 [126 kB]
Get:22 http://ftp.de.debian.org/debian proposed-updates/main amd64 systemd-sysv 
amd64 232-25+deb9u11 [82.4 kB]
Get:23 http://ftp.de.debian.org/debian proposed-updates/main amd64 

Bug#926199: stretch-pu: package libreoffice/1:5.2.7-1+deb9u6

2019-04-14 Thread Adam D. Barratt
Control: tags -1 + moreinfo

On Mon, 2019-04-01 at 21:43 +0200, Rene Engelhard wrote:
> now that https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911925
> is finally fixed in stretch-p-u I think it's time to fix
> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=913641 in the sense
> that we conflict against the "broken" OpenJDK (and build-conflict
> against it. So we can remove the "build hack" needed to be introduced
> in the +deb9u5 security update).

How much has the upgrade path from current stable been tested? e.g.
what happens if APT decides to upgrade LO before openjdk-8 and for some
reason the system does not have the security.d.o package installed?

Regards,

Adam



Bug#926199: stretch-pu: package libreoffice/1:5.2.7-1+deb9u7 (was: Re: Bug#926199: stretch-pu: package libreoffice/1:5.2.7-1+deb9u6)

2019-04-13 Thread Rene Engelhard
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.0 +0200
+++ libreoffice-5.2.7/debian/changelog  2019-01-23 18:51:09.0 +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   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/control2019-04-11 21:48:53.0 +0200
+++ libreoffice-5.2.7/debian/control2019-01-23 18:51:09.0 +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.0 +0200
+++ libreoffice-5.2.7/debian/control.in 2019-01-23 18:51:09.0 +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.0 +0200
+++ libreoffice-5.2.7/debian/patches/disableClassPathURLCheck.diff  
1970-01-01 01:00:00.0 +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.0 +0200
+++ libreoffice-5.2.7/debian/patches/mention-java-common-package.diff   
2019-01-23 18:51:09.0 +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 

Bug#926199: stretch-pu: package libreoffice/1:5.2.7-1+deb9u6

2019-04-11 Thread Rene Engelhard
retitle 926199 stretch-pu: package libreoffice/1:5.2.7-1+deb9u7
thanks

Hi,

this is now 1:5.2.7-1+deb9u7 given the Reiwa fix...

New diff will follow.

Regards,

Rene



Bug#926199: stretch-pu: package libreoffice/1:5.2.7-1+deb9u6

2019-04-01 Thread Rene Engelhard
Package: release.debian.org
Severity: normal
Tags: stretch
User: release.debian@packages.debian.org
Usertags: pu

Hi,

now that https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911925
is finally fixed in stretch-p-u I think it's time to fix
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=913641 in the sense
that we conflict against the "broken" OpenJDK (and build-conflict
against it. So we can remove the "build hack" needed to be introduced
in the +deb9u5 security update).

I also included a simple documentation fix I noticed when seeing
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=926009

Diff is

diff -Nru libreoffice-5.2.7/debian/changelog libreoffice-5.2.7/debian/changelog
--- libreoffice-5.2.7/debian/changelog  2019-01-23 18:51:09.0 +0100
+++ libreoffice-5.2.7/debian/changelog  2019-01-23 18:51:09.0 +0100
@@ -1,3 +1,15 @@
+libreoffice (1:5.2.7-1+deb9u6) 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   Wed, 23 Jan 2019 18:51:09 +0100
+
 libreoffice (1:5.2.7-1+deb9u5) stretch-security; urgency=high

   * debian/patches/disableClassPathURLCheck.diff: add workaround to
diff -Nru libreoffice-5.2.7/debian/control libreoffice-5.2.7/debian/control
--- libreoffice-5.2.7/debian/control2019-01-23 18:51:09.0 +0100
+++ libreoffice-5.2.7/debian/control2019-01-23 18:51:09.0 +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 2018-11-23 07:50:05.0 +0100
+++ libreoffice-5.2.7/debian/control.in 2019-01-23 18:51:09.0 +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  
2018-12-28 11:20:29.0 +0100
+++ libreoffice-5.2.7/debian/patches/disableClassPathURLCheck.diff  
1970-01-01 01:00:00.0 +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   
2017-09-17 15:36:00.0 +0200
+++ libreoffice-5.2.7/debian/patches/mention-java-common-package.diff   
2019-01-23 18:51:09.0 +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