Merge version 1:6.3.3-2+rpi1 and 1:6.3.3-3 to produce 1:6.3.3-3+rpi1 archive/raspbian/1%6.3.3-3+rpi1 raspbian/1%6.3.3-3+rpi1
authorRaspbian automatic forward porter <root@raspbian.org>
Sun, 24 Nov 2019 13:38:18 +0000 (13:38 +0000)
committerRaspbian automatic forward porter <root@raspbian.org>
Sun, 24 Nov 2019 13:38:18 +0000 (13:38 +0000)
1  2 
debian/changelog
debian/control
debian/rules

index 03ab5fa05172cffba129945c80ca92073744088a,a3bdd839b11a519767a41df22f37b7d533d8b4c9..5448869c5f1bb8eee82ace6572e8b48737f0bebb
@@@ -1,12 -1,10 +1,20 @@@
- libreoffice (1:6.3.3-2+rpi1) bullseye-staging; urgency=medium
++libreoffice (1:6.3.3-3+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>  Mon, 04 Nov 2019 19:03:54 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 24 Nov 2019 13:38:15 +0000
++
+ libreoffice (1:6.3.3-3) unstable; urgency=medium
+   * debian/atches/Switch-mdds-to-1.5.0-and-liborcus-to-0.15.0.diff:
+     as name says
+   * debian/rules, debian/shlibs.override.orcus: adapt for above
+  -- Rene Engelhard <rene@debian.org>  Wed, 20 Nov 2019 14:15:21 +0100
  
  libreoffice (1:6.3.3-2) unstable; urgency=medium
  
diff --cc debian/control
Simple merge
diff --cc debian/rules
Simple merge