Merge version 1:68.10.0-1+rpi1 and 1:68.11.0-3 to produce 1:68.11.0-3+rpi1

diff --cc debian/changelog
index f6d907de5ba41e2fca46a8ff56ab55aa1debf6be,0d68120b8c5530abfc9579b9387562c07f0a36fd..7bd4dafd3a3951586cee74f7b40495a0bda79e0c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,38 +1,58 @@@
- thunderbird (1:68.10.0-1+rpi1) bullseye-staging; urgency=medium
++thunderbird (1:68.11.0-3+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought over from firefox-esr 60.3.0esr-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 05 Dec 2018 06:56:52 +0000]
 +  * Hack broken rust target selection so it produces the right target
 +    on raspbian.
 +  * Fix clean target.
 +
 +  [changes introduced in 60.4.0-1+rpi1 by Peter Michael Green]
 +  * Further fixes to clean target (still not completely fixed :( ).
 +
 +  [changes introduced in 1:68.5.0-1~deb10u1+rpi1 by Peter Michael Green]
 +  * Disable neon (patches taken from firefox-esr package)
 +  * Build in a chroot with arm64 binutils-arm-linux-gnueabihf
 +
 +  [changes brought forward from 1:68.5.0-1~deb10u1+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Sun, 15 Mar 2020 16:27:21 +0000]
 +  * Actually build the binary packages on armhf.
 +  * Yet more clean target fixing.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 06 Jul 2020 17:49:57 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 13 Aug 2020 21:38:15 +0000
++
+ thunderbird (1:68.11.0-3) unstable; urgency=medium
+ 
+   * [28707fd] d/xpi-pack.sh: adding xpi-pack shell script
+     As we can't depend on mozilla-devscripts anymore we pick up the shell
+     script from that package as this builds XPI files we need.
+   * [037212e] Drop mozilla-devscripts as B-D
+     mozilla-devscripts isn't ported to Python3 yet and depends on Python2 so.
+     We don't need that package as B-D as we picked the main shell script from
+     that and we can drop that package from the build dependencies.
+   * [31eda41] Drop python-{minimal,ply} from B-D
+     These packages are removed from teh archive and we don't need them for
+     building Thunderbird as long we have python2 as package available.
+   (Closes: #967223)
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Tue, 04 Aug 2020 19:06:20 +0200
+ 
+ thunderbird (1:68.11.0-2) unstable; urgency=medium
+ 
+   * [110a375] d/control: increase B-D for libnss3
+   * [73fa23e] d/control: tb manually set dep on libnss3 to 2:3.55
+   (Closes: #966806)
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Sun, 02 Aug 2020 20:12:49 +0200
+ 
+ thunderbird (1:68.11.0-1) unstable; urgency=medium
+ 
+   * [093b080] New upstream version 68.11.0
+     Fixed CVE issues in upstream version 68.11.0 (MFSA 2020-35):
+     CVE-2020-15652: Potential leak of redirect targets when loading scripts
+                     in a worker
+     CVE-2020-6514: WebRTC data channel leaks internal address to peer
+     CVE-2020-6463: Use-after-free in ANGLE gl::Texture::onUnbindAsSamplerTexture
+     CVE-2020-15659: Memory safety bugs fixed in Thunderbird 68.11
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Wed, 29 Jul 2020 22:26:14 +0200
  
  thunderbird (1:68.10.0-1) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge