Merge version 0.90+rpi1 and 0.90+nmu1 to produce 0.90+rpi1+nmu1

diff --cc debian/changelog
index 80b4d871751e4d9cda5883b2b8e5e70b10f276d6,350f7e72bdba4f6d59c6e0c9874fa40ec65aeeb6..b94b2924bbb9c39858c1215796fc8dcca60e3e0d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,16 +1,26 @@@
- synaptic (0.90+rpi1) bullseye-staging; urgency=medium
++synaptic (0.90+rpi1+nmu1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 0.81.2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 01 Aug 2014 01:51:30 +0000]
 +  * Fix build on raspbian (see: #744371).
 +
 +  [changes introduced in 0.83+rpi1+nmu1 by Peter Michael Green]
 +  * Force build system to apply patches for Debian regardless of system.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 31 Jan 2020 18:29:31 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 10 Mar 2020 20:19:01 +0000
++
+ synaptic (0.90+nmu1) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+ 
+   [ Debian Janitor ]
+   * Wrap long lines in changelog entries: 0.63.2, 0.63.1ubuntu3,
+     0.55+cvs20041119-1ubuntu4.
+ 
+   [ Julian Andres Klode ]
+   * Port to APT 1.9.11: Use pkgCacheFile instead of manually opening cache
+     (Closes: #953311)
+ 
+  -- Julian Andres Klode <jak@debian.org>  Sun, 08 Mar 2020 14:46:39 +0100
  
  synaptic (0.90) unstable; urgency=medium