From: Raspbian automatic forward porter <root@raspbian.org>
Date: Mon, 4 Nov 2019 19:03:59 +0000 (+0000)
Subject: Merge version 1:6.3.2-1+rpi1 and 1:6.3.3-2 to produce 1:6.3.3-2+rpi1
X-Git-Tag: archive/raspbian/1%6.3.3-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e39b89b3125c7170e8a0363bba9a2363b86b38e7;p=libreoffice.git

Merge version 1:6.3.2-1+rpi1 and 1:6.3.3-2 to produce 1:6.3.3-2+rpi1
---

e39b89b3125c7170e8a0363bba9a2363b86b38e7
diff --cc debian/changelog
index da786fd1c56,cca923ae2d4..03ab5fa0517
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,40 +1,50 @@@
- libreoffice (1:6.3.2-1+rpi1) bullseye-staging; urgency=medium
++libreoffice (1:6.3.3-2+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes introduced in 1:5.4.0-1+rpi1 by Peter Michael Green]
 +  * Disable pdfium, it fails to build for armv6
 +
 +  [changes brought forward from 1:6.0.2-1+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Fri, 27 Apr 2018 02:14:18 +0000]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 04 Oct 2019 02:31:02 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 04 Nov 2019 19:03:54 +0000
++
+ libreoffice (1:6.3.3-2) unstable; urgency=medium
+ 
+   * debian/patches/Prepare-for-builds-against-ICU-64.diff:
+     as name says (from libreoffice-6-3 branch)
+   * debian/patches/Fix-build-with-poppler-0.82.diff:
+     as name says (from master)
+   * debian/patches/Postgresql-12-no-adsrc.diff: add from
+     libreoffice-6-3 branch; fix the postgresql driver with
+     PostgreSQL 12 (closes: #943873)
+ 
+   * debian/rules, debian/tests/control:
+     - re-enable make check and smoketest autopkgtest and add g++-9
+       build-conflicts for #943401 
+ 
+  -- Rene Engelhard <rene@debian.org>  Thu, 31 Oct 2019 18:07:12 +0100
+ 
+ libreoffice (1:6.3.3-1) unstable; urgency=medium
+ 
+   * LibreOffice 6.3.3 final release
+ 
+   * debian/rules:
+     - actually add explicit --no-automatic-dbgsym if BUILD_DBGSYM_PACKAGES != y 
+   * debian/rules, debian/tests/control:
+     - temporarily disable make check and smoketest autopkgtest due #943401
+ 
+  -- Rene Engelhard <rene@debian.org>  Sun, 27 Oct 2019 22:33:19 +0100
+ 
+ libreoffice (1:6.3.3~rc1-1) unstable; urgency=medium
+ 
+   * New upstream release candidate
+     - fixes images getting black in some circumstances
+       (closes: #941655)
+ 
+   * debian/scripts/gid2pkgdirs.sh:
+     - stop installing /usr/share/mimelnk (closes: #941439)
+ 
+  -- Rene Engelhard <rene@debian.org>  Sun, 13 Oct 2019 16:39:08 +0000
  
  libreoffice (1:6.3.2-1) unstable; urgency=medium
  
diff --cc debian/control
index 15ec6eb09f2,ac72f6fa0e5..70616477616
--- a/debian/control
+++ b/debian/control
@@@ -184,6 -192,12 +184,11 @@@ Build-Depends-Indep: ant (>= 1.7.0) [!h
                       rdfind,
                       symlinks
  Build-Conflicts: amd-libopencl1,
 -                 fonts-opensymbol <!nocheck>,
+                  g++-9 (= 9.2.1-12) <!nocheck>,
+                  g++-9 (= 9.2.1-13) <!nocheck>,
+                  g++-9 (= 9.2.1-14) <!nocheck>,
+                  g++-9 (= 9.2.1-15) <!nocheck>,
+                  g++-9 (= 9.2.1-15.1) <!nocheck>,
                   nvidia-glx-dev,
                   nvidia-glx-legacy-dev,
                   nvidia-libopencl1