From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sat, 29 Jul 2023 11:30:23 +0000 (+0100)
Subject: Merge version 4:7.4.5-3+rpi1 and 4:7.4.7-1 to produce 4:7.4.7-1+rpi1
X-Git-Tag: raspbian/4%7.4.7-1+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ffb5e403b1a6d96231ac98b9cee518d8a1a92f3c;p=libreoffice.git

Merge version 4:7.4.5-3+rpi1 and 4:7.4.7-1 to produce 4:7.4.7-1+rpi1
---

48f3be11a88a8705002f502a60178b68d2ceb1e4
diff --cc debian/changelog
index ed86ad60960,a5397a710e4..971ed33c575
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,14 +1,27 @@@
- libreoffice (4:7.4.5-3+rpi1) bookworm-staging; urgency=medium
++libreoffice (4:7.4.7-1+rpi1) bookworm-staging; urgency=medium
 +
 +  [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.
 +
 +  [changes introduced in 1:5.4.0-1+rpi1 by Peter Michael Green]
 +  * Disable pdfium, it fails to build for armv6
 +
 +  [changes introduced in 1:7.2.4-3+rpi1 by Peter Michael Green]
 +  * Use clang 11, newer versions cause armv7 contamination issues.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 02 Jun 2023 08:00:22 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 29 Jul 2023 11:30:18 +0000
++
+ libreoffice (4:7.4.7-1) bookworm; urgency=medium
+ 
+   * "New" upstream release 
+ 
+   * debian/control.postgresql.in:
+     - depend on libreoffice-core-nogui | libreoffice-core (like the other
+       -sdbc-*) (closes: #1034792)
+   * debian/rules:
+     - don't remove tabviewbar.ui in -impress-nogui (closes: #1028290)
+ 
+  -- Rene Engelhard <rene@debian.org>  Sat, 27 May 2023 14:00:08 +0200
  
  libreoffice (4:7.4.5-3) unstable; urgency=high