Merge version 1:7.2.2-1+rpi1 and 1:7.2.3-2 to produce 1:7.2.3-2+rpi1 archive/raspbian/1%7.2.3-2+rpi1 raspbian/1%7.2.3-2+rpi1
authorRaspbian automatic forward porter <root@raspbian.org>
Mon, 6 Dec 2021 12:34:42 +0000 (12:34 +0000)
committerRaspbian automatic forward porter <root@raspbian.org>
Mon, 6 Dec 2021 12:34:42 +0000 (12:34 +0000)
1  2 
debian/changelog
debian/control
debian/rules

index 662dc60bf1687cb22a2217d7a566dc9f83543462,2c21829f636f02612fc07c8f45034ab9451340ae..50639d2dd30d88df41364cbf22e4da5205ca85b5
@@@ -1,12 -1,22 +1,32 @@@
- libreoffice (1:7.2.2-1+rpi1) bookworm-staging; urgency=medium
++libreoffice (1:7.2.3-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>  Thu, 21 Oct 2021 16:39:36 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 06 Dec 2021 12:34:38 +0000
++
+ libreoffice (1:7.2.3-2) unstable; urgency=medium
+   * debian/changelog: fix (closes: #1000605)
+  -- Rene Engelhard <rene@debian.org>  Sun, 28 Nov 2021 15:05:29 +0000
+ libreoffice (1:7.2.3-1) unstable; urgency=medium
+   * New upstream release
+   * debian/patches/icu-70.diff: backport from master; fix build/test
+     with icu 70 ("TestBreakIterator::testLao() had to be disabled/adapted.")
+   * debian/rules:
+     - actually only set TEST_TIMEOUT if we ignore the test results anyway...
+   * debian/control*.in: also apply 1:7.2.1-2/-3 changes for
+     libreoffice-core-nogui...
+  -- Rene Engelhard <rene@debian.org>  Tue, 23 Nov 2021 18:52:54 +0100
  
  libreoffice (1:7.2.2-1) unstable; urgency=medium
  
diff --cc debian/control
Simple merge
diff --cc debian/rules
Simple merge