Manual merge of version 1:60.9.0-1~deb10u1+rpi1 and 1:68.3.0-2~deb10u1 to produce...

diff --cc build/moz.configure/rust.configure
index ad27dbf5d8029fc9da2d70add6ae4dce7d433c15,9647cbc40e1f74b57835644e55b0b381d85c98ad..0645c1e53a1a17f6470b18504796e1ae370b9767
--- 1/build/moz.configure/rust.configure
--- 2/build/moz.configure/rust.configure
+++ b/build/moz.configure/rust.configure
@@@ -120,14 -192,12 +194,16 @@@ def rust_supported_targets(rustc)
      per_os = {}
      ambiguous = set()
      per_raw_os = {}
 +    #HACK: if there are multiple matches the algorithm uses the last one
 +    #put arm-unknown-linux-gnuebihf on the end of the list so it gets preffered
 +    out.append('arm-unknown-linux-gnueabihf')
      for t in out:
 +        traw = t
          t = split_triplet(t, allow_unknown=True)
-         key = (t.cpu, t.endianness, t.os)
-         sys.stdout.write(traw+' '+repr(key)+' '+repr(t.raw_os)+'\n')
+         endianness = t.endianness
+         if t.cpu.startswith('thumb') and endianness not in ('big', 'little'):
+             endianness = 'little'
+         key = (t.cpu, endianness, t.os)
          if key in per_os:
              previous = per_os[key]
              per_raw_os[(previous.cpu, previous.endianness,
@@@ -154,20 -224,21 +230,23 @@@ def rust_triple_alias(host_or_target)
      `host_or_target` is either `host` or `target` (the @depends functions
      from init.configure).
      """
-     assert host_or_target in (host, target)
+     assert host_or_target in {host, target}
+ 
+     host_or_target_str = {host: 'host', target: 'target'}[host_or_target]
  
      @depends(rustc, host_or_target, c_compiler, rust_supported_targets,
-              when=rust_compiler)
+              arm_target, when=rust_compiler)
+     @checking('for rust %s triplet' % host_or_target_str)
      @imports('os')
 +    @imports('sys')
      @imports('subprocess')
      @imports(_from='mozbuild.configure.util', _import='LineIO')
      @imports(_from='mozbuild.shellutil', _import='quote')
      @imports(_from='tempfile', _import='mkstemp')
      @imports(_from='textwrap', _import='dedent')
 +    @imports(_from='__builtin__', _import='repr')
      def rust_target(rustc, host_or_target, compiler_info,
-                     rust_supported_targets):
+                     rust_supported_targets, arm_target):
          # Rust's --target options are similar to, but not exactly the same
          # as, the autoconf-derived targets we use.  An example would be that
          # Rust uses distinct target triples for targetting the GNU C++ ABI

diff --cc debian/changelog
index d240ce0c669149ed574e728d14a664f5859f283e,9540689f00f7f87cbb3747ff6c5ac2277ad2c2c0..45ff61966e4453e1395241340a889aad1189d585
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,292 +1,305 @@@
- thunderbird (1:60.9.0-1~deb10u1+rpi1) buster-staging; urgency=medium
++thunderbird (1:68.3.0-2~deb10u1+rpi1) buster-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 :( ).
 +  * Add build-depends on clang-6.0 (to match libclang-6.0-dev)
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Tue, 17 Sep 2019 02:46:55 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 17 Dec 2019 17:00:25 +0000
++
+ thunderbird (1:68.3.0-2~deb10u1) stable-security; urgency=medium
+ 
+   * Rebuild for buster-security
+   [ Emilio Pozuelo Monfort ]
+   * [de88895] Fix MOZ_BUILD_DATE to have the expected format
+     (cherry-picked from debian/sid)
+ 
+   [ Carsten Schoenert ]
+   * [a077b71] d/rules: don't use SOURCE_DATE_EPOCH for MOZ_BUILD_DATE
+     (cherry-picked from debian/sid)
+     (Closes: #946588)
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Sat, 14 Dec 2019 10:31:09 +0100
+ 
+ thunderbird (1:68.3.0-2) unstable; urgency=medium
+ 
+   * [0625d30] rebuild patch queue from patch-queue branch
+     added patches:
+     fixes/Bug-1531309-Don-t-use-__PRETTY_FUNCTION__-or-__FUNCTION__.patch
+     fixes/Update-bindgen-in-ESR68.-r-glandium-a-RyanVM.patch
+   * [ea8d98c] Breaks: add versioned birdtray package
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Mon, 09 Dec 2019 18:22:15 +0100
+ 
+ thunderbird (1:68.3.0-1) unstable; urgency=medium
+ 
+   * [fe289ec] /u/b/thunderbird: export variable DICPATH before start
+     (Closes: #944295)
+   * [a9a48c6] New upstream version 68.3.0
+     Fixed CVE issues in upstream version 68.3 (MFSA 2019-38):
+     CVE-2019-17008: Use-after-free in worker destruction
+     CVE-2019-13722: Stack corruption due to incorrect number of arguments in
+                     WebRTC code
+     CVE-2019-11745: Out of bounds write in NSS when encrypting with a block
+                     cipher
+     CVE-2019-17009: Updater temporary files accessible to unprivileged
+                     processes
+     CVE-2019-17010: Use-after-free when performing device orientation checks
+     CVE-2019-17005: Buffer overflow in plain text serializer
+     CVE-2019-17011: Use-after-free when retrieving a document in
+                     antitracking
+     CVE-2019-17012: Memory safety bugs fixed in Firefox 71, Firefox ESR
+                     68.3, and Thunderbird 68.3
+   * [fb23473] d/control: increase B-D version on NSS to 3.44.3
+   * [6f59938] Breaks: adding more non compatible packaged AddOns
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Thu, 05 Dec 2019 10:03:22 +0100
+ 
+ thunderbird (1:68.2.2-1~deb10u1) stable-security; urgency=medium
+ 
+   * Rebuild for buster-security
+   * [2c1bd00] d/mozconfig.default: use internal version of
+     nspr, nss, sqlite and icu
+   * [94d6ae4] d/control: remove lib{nspr4,nss3,sqlite3}-dev from B-D
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Sat, 16 Nov 2019 12:58:00 +0100
+ 
+ thunderbird (1:68.2.2-1) unstable; urgency=medium
+ 
+   * [198d539] xul-ext-compactheader: allow also version << 3.0.0
+   * [0e93753] d/control: add incompatibility with jsunit << 0.2.2
+   * [87c84cb] New upstream version 68.2.2
+     This upstream version has removed the source for calendar-google-provider,
+     thus we can't provide the related binary package any more.
+   * [a3cea2a] rebuild patch queue from patch-queue branch
+     rebuild patch queue from patch-queue branch
+ 
+     removed patches (included upstream):
+     debian/patches/fixes/Bug-1470701-Use-run-time-page-size-when-changing-map.patch
+     debian/patches/fixes/Bug-1505608-Try-to-ensure-the-bss-section-of-the-elf.patch
+     debian/patches/fixes/Bug-1526744-find-dupes.py-Calculate-md5-by-chunk.patch
+     debian/patches/fixes/Build-also-gdata-provider-as-xpi-file.patch
+     debian/patches/fixes/rust-ignore-not-available-documentation.patch
+     debian/patches/porting-kfreebsd-hurd/Fix-GNU-non-Linux-failure-to-build-because-of-ipc-ch.patch
+     debian/patches/porting-mips/Bug-1444303-MIPS-Fix-build-failures-after-Bug-1425580-par.patch
+     debian/patches/porting-mips/Bug-1444834-MIPS-Stubout-MacroAssembler-speculationBarrie.patch
+     debian/patches/porting-powerpc/powerpc-Don-t-use-static-page-sizes-on-powerpc.patch
+     debian/patches/porting-sparc64/Bug-1434726-Early-startup-crash-on-Linux-sparc64-in-HashI.patch
+   * [1730f5f] d/control: remove references to calendar-google-provider
+     Don't build calendar-google-provider any more and remove any references
+     from other binary packages.
+   * [1b0bbb8] d/rules: remove any calendar-google-provider stuff
+   * [92f681c] thunderbird.NEWS: Adding hint about removal of gdata
+     Give out an announcement about the removal of a possible previously
+     installed package calendar-google-provider.
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Sun, 10 Nov 2019 12:09:17 +0100
+ 
+ thunderbird (1:68.2.1-1) unstable; urgency=medium
+ 
+   [ intrigeri ]
+   * [c48e2cb] AppArmor: update profile from upstream at commit a27a1a5
+     (Closes: #941290)
+ 
+   [ Carsten Schoenert ]
+   * [98497ae] New upstream version 68.2.0
+     Fixed CVE issues in upstream version 68.2 (MFSA 2019-35):
+     CVE-2019-15903: Heap overflow in expat library in XML_GetCurrentLineNumber
+     CVE-2019-11757: Use-after-free when creating index updates in IndexedDB
+     CVE-2019-11758: Potentially exploitable crash due to 360 Total Security
+     CVE-2019-11759: Stack buffer overflow in HKDF output
+     CVE-2019-11760: Stack buffer overflow in WebRTC networking
+     CVE-2019-11761: Unintended access to a privileged JSONView object
+     CVE-2019-11762: document.domain-based origin isolation has
+                     same-origin-property violation
+     CVE-2019-11763: Incorrect HTML parsing results in XSS bypass technique
+     CVE-2019-11764: Memory safety bugs fixed in Thunderbird 68.2
+     (Closes: #925841)
+   * [a104c51] d/control: increase Standards-Version to 4.4.1
+   * [6c9d012] xul-ext-dispmua: set current min usable version
+   * [b3bf16f] New upstream version 68.2.1
+   * [8f89b90] d/control: decrease build architecture list
+     Decreasing the current list of build architectures. Not meant to keep this
+     forever, removed RC architectures needing support and volunteering to get
+     them back.
+     (Closes: #921258)
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Fri, 01 Nov 2019 20:36:59 +0100
+ 
+ thunderbird (1:68.1.2-1~exp1) experimental; urgency=medium
+ 
+   * [81f4144] xul-ext-compactheader: increase minimal usable version
+   * [a815589] Update the global information about TB in Debian
+   * [bb5f5f7] rebuild patch queue from patch-queue branch
+   * [6fe7d3f] xul-ext-sogo-connector: increase minimal usable version
+   * [2e29af5] New upstream version 68.1.2
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Sat, 26 Oct 2019 08:41:50 +0200
+ 
+ thunderbird (1:68.0~b1-1) experimental; urgency=medium
+ 
+   * [0eabe70] New upstream version 68.0~b1
+   * [2febf67] rebuild patch queue from patch-queue branch
+     added patch:
+     debian-hacks/Downgrade-SQlite-version-to-3.27.2.patch
+   * [cfa5973] d/s/lintian-overrides: adjust overrides for needed files
+   * [46077e2] d/copyright: update after upstream changes
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Sun, 16 Jun 2019 10:28:52 +0200
+ 
+ thunderbird (1:67.0~b3-1) experimental; urgency=medium
+ 
+   [ intrigeri ]
+   * [9ad75ad] d/rules: drop useless usage of dpkg-parsechangelog
+ 
+   [ Carsten Schoenert ]
+   * [d6f6747] New upstream version 67.0~b3
+   * [90f73be] rebuild patch queue from patch-queue branch
+     removed patch:
+     fixes/Bug-1515641-Turn-enable-av1-around.-r-nalexander.patch
+   * [7dd5c54] d/control: increase various B-D versions
+     Increasing the version for the build depending packages of cargo, cbindgen,
+     libnspr4-dev, libnss3-dev, libsqlite3-dev and rustc.
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Tue, 11 Jun 2019 19:36:00 +0200
+ 
+ thunderbird (1:66.0~b1-1) experimental; urgency=medium
+ 
+   [ Carsten Schoenert ]
+   * [afe31d9] New upstream version 66.0~b1
+   * [4ec53cc] apparmor: update profile from upstream (commit 7ace41b1)
+     (cherry-picked from debian/sid)
+   * [b3657a0] d/rules: make dh_clean more robust
+     Remove some regenerated files in dh_clean to the build will not fail in
+     case the build needs to be started twice within the same build environment.
+     (cherry-picked from debian/sid)
+   * [dceb027] d/rules: move disable debug option into configure step
+     Adding the option '--disable-debug-symbols' to the file mozconfig.default
+     in case the build is running on a 32bit architecture instead of expanding
+     the variable 'CONFIGURE_FLAGS'. The configuration approach for this option
+     taken from firefox-esr was not working for the thunderbird package.
+     (cherry-picked from debian/sid)
+   * [f7f02a9] d/rules: reorder LDFLAGS for better readability
+     Make the used additional options for LDFLAGS better readable by reordering
+     the various used options. Also adding the option '-Wl, --as-needed' to the
+     list of used options here.
+     (cherry-picked from debian/sid)
+   * [79801fb] d/rules: use 'compress-debug-sections' only on 64bit
+     Do not set 'LDFLAGS += -Wl,--compress-debug-sections=zlib' globally, lets
+     use this option only if we are on a 64bit architecture as otherwise the
+     build is failing on 32bit architectures again. We don't want to build any
+     debug information on 32bit anyway so we don't need this option on these
+     platforms.
+     (cherry-picked from debian/sid)
+   * [11f9e14] d/mozconfig.default: adding option for mipsel
+     We don't have set up any options for the mipsel platform before, but the
+     build needs some additional options too on this platform to succeed.
+     (cherry-picked from debian/sid)
+   * [e46e178] d/mozconfig.default: disable ion on mips and mipsel
+     The build will fail on mips{,el} if we have enabled ION, the JavaScript
+     JIT compiler on these platforms will loose some performance by this.
+     (cherry-picked from debian/sid)
+ 
+   [ Alexander Nitsch ]
+   * [31b87e9] Make the logo SVG square
+     The original SVG source isn't completely square, modifying the SVG file
+     so all generated other files from the input are also exactly square.
+   * [c0f19a3] Add script for generating PNGs from logo SVG
+   * [c153c5f] Update icon PNGs to be properly scaled
+ 
+   [ Carsten Schoenert ]
+   * [c372e1f] d/source.filter: add some configure scripts
+     Filter out some files that are named 'configure', they are rebuild later
+     anyway. The filtering of these files is moved from gbp.conf to
+     source.filter.
+     (cherry-picked from debian/sid)
+   * [a40c5df] d/c-lightning-l10n-t.sh: drop version checking
+     Remove an old check for a version string within the file install.rdf.
+     It's not created any more by upstream since > 60.0.
+   * [05b325e] d/source.filter: don't ignore files in root folder
+     Try to not ignore files which are in the top root folder of the upstream
+     source tarball.
+   * [d2ca267] rebuild patch queue from patch-queue branch
+     added patch:
+     fixes/Bug-1515641-Turn-enable-av1-around.-r-nalexander.patch
+     
+     modified (refreshed) patches:
+     porting-armel/Avoid-using-vmrs-vmsr-on-armel.patch
+     porting-armel/Bug-1463035-Remove-MOZ_SIGNAL_TRAMPOLINE.-r-darchons.patch
+     porting-kfreebsd-hurd/Allow-ipc-code-to-build-on-GNU-hurd.patch
+     porting-kfreebsd-hurd/Allow-ipc-code-to-build-on-GNU-kfreebsd.patch
+     porting-kfreebsd-hurd/FTBFS-hurd-fixing-unsupported-platform-Hurd.patch
+     porting-kfreebsd-hurd/Fix-GNU-non-Linux-failure-to-build-because-of-ipc-ch.patch
+     porting-kfreebsd-hurd/adding-missed-HURD-adoptions.patch
+     porting-kfreebsd-hurd/ipc-chromium-fix-if-define-for-kFreeBSD-and-Hurd.patch
+     porting-m68k/Add-m68k-support-to-Thunderbird.patch
+     
+     removed patches (applied upstream):
+     fixes/Fix-big-endian-build-for-SKIA.patch
+     porting-kfreebsd-hurd/Fix-GNU-non-Linux-failure-to-build-because-of-ipc-ch.patch
+     porting-s390x/FTBFS-s390x-Use-jit-none-AtomicOperations-sparc.h-on-s390.patch
+   * [cb1dde9] d/control: increase version in B-D for libsqlite3-dev
+   * [54e8890] d/mozconfig.default: add new configure option
+     We need to disable the usage of libav1 for an successful build. The used
+     configure option was added by the new added patch to the patch queue.
+   * [ecd3ade] d/copyright: update after upstream changes
+   * [af58ed8] d/source.filter: add extra content to ignore
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Sun, 17 Feb 2019 10:58:46 +0100
+ 
+ thunderbird (1:65.0~b1-1) experimental; urgency=medium
+ 
+   * [e5956ef] Merge tag 'debian/1%60.4.0-1' into debian/experimental
+   * [389748b] d/source.filter: adjust files to filter while repack
+     Rework of the file filter list due new upstream version but also to no
+     filter out files we obviously need later, e.g. for the omni.jar archive.
+   * [4b86a78] New upstream version 65.0~b1
+   * [3db29ed] rebuild patch queue from patch-queue branch
+     removed patches (fixed upstream):
+     debian-hacks/icu-use-locale.h-instead-of-xlocale.h.patch
+     debian-hacks/shellutil.py-ignore-tilde-as-special-character.patch
+     fixes/Build-also-gdata-provider-as-xpi-file.patch
+     fixes/Use-msse-2-fpmath-C-CXXFLAGS-only-on-x86_64-platforms.patch
+     porting-mips/Bug-1444303-MIPS-Fix-build-failures-after-Bug-1425580-par.patch
+     porting-mips/Bug-1444834-MIPS-Stubout-MacroAssembler-speculationBarrie.patch
+     porting-sparc64/Bug-1434726-Early-startup-crash-on-Linux-sparc64-in-HashI.patch
+ 
+     removed patches (dropped for Debian specific build):
+     debian-hacks/Don-t-build-testing-suites-and-stuff.patch
+     debian-hacks/Don-t-build-testing-suites-and-stuff-part-2.patch
+     adjusted patches:
+ 
+     debian-hacks/Add-another-preferences-directory-for-applications-p.patch
+     debian-hacks/stop-configure-if-with-system-bz2-was-passed-but-no-.patch
+     patches/fixes/Fix-big-endian-build-for-SKIA.patch (but currently disabled)
+     porting-kfreebsd-hurd/FTBFS-hurd-fixing-unsupported-platform-Hurd.patch
+     porting-kfreebsd-hurd/adding-missed-HURD-adoptions.patch
+     porting-kfreebsd-hurd/ipc-chromium-fix-if-define-for-kFreeBSD-and-Hurd.patch
+     porting-s390x/FTBFS-s390x-Use-jit-none-AtomicOperations-sparc.h-on-s390.patch
+   * [e918c6c] d/control: increase versions in B-D
+     New Thunderbirds version typically need other packages available with
+     higher versions like NSS, NSPR, rust ...
+     Also adding cbindgen and nodejs()!!).
+   * [b6c63bf] d/mozconfig.default: remove dead options
+     More old configure options are now not available any more and we need to
+     drop them.
+   * [0f959ad] remove GCC specific options
+     LLVM's clang is now widely used, and clang isn't knowing the GCC options
+     '-fno-schedule-insns2' and '-fno-lifetime-dse', removing these options
+     from CFLAGS and CXXFLAGS.
+   * [d0b1f4b] d/rules: work around about strong quotings in .mk files
+     After the configuration of the source some Makefiles in the build folder
+     'obj-thunderbird' have a strong qouting on some entries. This will
+     later provoke a build failure if we don't remove the single quotes
+     before in the Makefiles.
+   * [093053e] copyright: update after upstream changes
+   * [95eaacf] d/s/lintian-overrides: adjust overrides for needed files
+ 
+  -- Carsten Schoenert <c.schoenert@t-online.de>  Sun, 20 Jan 2019 15:48:06 +0100
  
  thunderbird (1:60.9.0-1~deb10u1) buster-security; urgency=medium
  

diff --cc debian/control
index 47b33bdbd911f0d3d1f76fd0d6f4f3fb1f2c1c8a,675eb21302bfbcf95436d314200c99ff0b4def3a..14be90c10f46e55398ccf1472a03c834f09bbad6
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -8,9 -8,9 +8,10 @@@ Build-Depends
   autoconf2.13,
   bash-completion,
   bzip2,
-  cargo (>= 0.20),
+  cargo (>= 0.35),
+  cbindgen (>= 0.8.7),
   clang,
 + clang-6.0,
   debhelper (>= 10.2.5~),
   dh-apparmor,
   dh-exec,

diff --cc debian/patches/series
index d86c4d0c2b5b5663b5321319cb4acb68af98bf74,936218f716917a455a97366934850bc739e6a4fe..50c4d16a33924554af536ef6d71be7acafc56553
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -25,18 -21,20 +21,21 @@@ porting-m68k/Add-m68k-support-to-Thunde
  debian-hacks/use-icudt-b-l-.dat-depending-on-architecture.patch
  debian-hacks/Build-against-system-libjsoncpp.patch
  porting-sh4/Add-sh4-support-to-Thunderbird.patch
- porting-mips/Fix-CPU_ARCH-test-for-libjpeg-on-mips.patch
- porting-mips/Bug-1444303-MIPS-Fix-build-failures-after-Bug-1425580-par.patch
- porting-mips/Bug-1444834-MIPS-Stubout-MacroAssembler-speculationBarrie.patch
- debian-hacks/icu-use-locale.h-instead-of-xlocale.h.patch
- debian-hacks/shellutil.py-ignore-tilde-as-special-character.patch
- fixes/Fix-big-endian-build-for-SKIA.patch
- porting-sparc64/Bug-1434726-Early-startup-crash-on-Linux-sparc64-in-HashI.patch
- fixes/Use-msse-2-fpmath-C-CXXFLAGS-only-on-x86_64-platforms.patch
- fixes/Build-also-gdata-provider-as-xpi-file.patch
  porting-armel/Bug-1463035-Remove-MOZ_SIGNAL_TRAMPOLINE.-r-darchons.patch
  porting-armel/Avoid-using-vmrs-vmsr-on-armel.patch
- porting-powerpc/powerpc-Don-t-use-static-page-sizes-on-powerpc.patch
- fixes/Bug-1526744-find-dupes.py-Calculate-md5-by-chunk.patch
- fixes/rust-ignore-not-available-documentation.patch
+ debian-hacks/Downgrade-SQlite-version-to-3.27.2.patch
+ porting-armhf/Bug-1526653-Include-struct-definitions-for-user_vfp-and-u.patch
+ fixes/Allow-.js-preference-files-to-set-locked-prefs-with-lockP.patch
+ fixes/Bug-1556197-amend-Bug-1544631-for-fixing-mips32.patch
+ fixes/Bug-1560340-Only-add-confvars.sh-as-a-dependency-to-confi.patch
+ debian-hacks/Work-around-Debian-bug-844357.patch
+ debian-hacks/Set-program-name-from-the-remoting-name.patch
+ debian-hacks/Use-remoting-name-for-call-to-gdk_set_program_class.patch
+ porting/Work-around-GCC-ICE-on-mips-i386-and-s390x.patch
+ porting-ppc64el/work-around-a-build-failure-with-clang-on-ppc64el.patch
+ porting-armhf/Don-t-use-LLVM-internal-assembler-on-armhf.patch
+ porting-arm/Reduce-memory-usage-while-linking-on-arm-el-hf-platforms.patch
+ debian-hacks/Make-Thunderbird-build-reproducible.patch
+ fixes/Bug-1531309-Don-t-use-__PRETTY_FUNCTION__-or-__FUNCTION__.patch
+ fixes/Update-bindgen-in-ESR68.-r-glandium-a-RyanVM.patch
 +raspbian-rust-triplet-hack.patch

diff --cc debian/rules
Simple merge