Merge version 1:7.2.4-1+rpi1 and 1:7.2.4-2 to produce 1:7.2.4-2+rpi1 archive/raspbian/1%7.2.4-2+rpi1 raspbian/1%7.2.4-2+rpi1
authorRaspbian automatic forward porter <root@raspbian.org>
Fri, 24 Dec 2021 23:55:26 +0000 (23:55 +0000)
committerRaspbian automatic forward porter <root@raspbian.org>
Fri, 24 Dec 2021 23:55:26 +0000 (23:55 +0000)
1  2 
debian/changelog
debian/control
debian/rules

index 4455901fd3d2a98e5e8f46826eeaa9ac307fe666,cdf989f150198758f466b62d48c7bb801e7e3e37..405abf8d0b9072e3a49127cdf08a2193054740fd
@@@ -1,12 -1,13 +1,23 @@@
- libreoffice (1:7.2.4-1+rpi1) bookworm-staging; urgency=medium
++libreoffice (1:7.2.4-2+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
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 14 Dec 2021 16:04:26 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 24 Dec 2021 23:55:24 +0000
++
+ libreoffice (1:7.2.4-2) unstable; urgency=medium
+   * debian/patches/fix-e_book_client_connect_direct_sync-sig.diff:
+     as name says; from libreoffice-7-2 branch
+   * debian/patches/mdds-2.0-and-orcus-0.17.diff: update
+   * debian/rules:
+     - bump liborcus-dev build-depends to >= 0.17.2 if we run the tests
+  -- Rene Engelhard <rene@debian.org>  Fri, 17 Dec 2021 17:57:04 +0100
  
  libreoffice (1:7.2.4-1) unstable; urgency=medium
  
diff --cc debian/control
Simple merge
diff --cc debian/rules
Simple merge