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

diff --cc debian/changelog
index 8c6a5f6d3a7c4919bb641bebb3421aa709552d59,210b63859fe83263dd0cfb63d4b72d45a0287f55..80b4d871751e4d9cda5883b2b8e5e70b10f276d6
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,42 +1,52 @@@
- synaptic (0.84.8+rpi1) bullseye-staging; urgency=medium
++synaptic (0.90+rpi1) 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>  Tue, 22 Oct 2019 20:22:37 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 31 Jan 2020 18:29:31 +0000
++
+ synaptic (0.90) unstable; urgency=medium
+ 
+   [ Julian Andres Klode ]
+   * Update config.h.in and INSTALL file
+   * Remove obsolete <apt-pkg/sptr.h> include
+   * Use RFC1123StrToTime instead of StrToTime
+   * Use VerIterator::Section() instead of PkgIterator::Section()
+   * Use APT::Progress::PackageManager subclass instead of fd
+   * Remove calls to no-op InstallProtect()
+   * Port code from TFRewrite to pkgTagSection::Write
+   * Fix un-namespaced use of std::vector and std::string
+   * Port pkgMakeStatusCache to pkgCacheGenerator::MakeStatusCache
+   * Add missing #include <apt-pkg/update.h>
+   * Port to APT::Upgrade::Upgrade
+   * Port to a subclass of pkgArchiveCleaner that actually removes
+   * Port GetCandidateVer to GetCandidateVersion
+   * Swich from MD5 to Hashes
+   * Use apt-pkg's indexcopy, it was merged in 2005
+   * CurrentSize and co in acquire worker moved to CurrentItem
+   * configure.in: apt-inst is optional
+ 
+   [ Reuben ]
+   * Use pkgAcqChangelog to get changelog URI.
+   * Remove obsolete getChangelogURI() function
+ 
+   [ Michael Vogt ]
+   * rgpkgtreeview.cc: save column width changes in config
+ 
+   [ Debian Janitor ]
+   * Trim trailing whitespace.
+   * Use secure URI in Homepage field.
+   * debian/control: Add Vcs-Browser field
+   * Bump debhelper from deprecated 8 to 12.
+   * Set debhelper-compat version in Build-Depends.
+   * Drop unnecessary dependency on dh-autoreconf.
+   * Use canonical URL in Vcs-Git.
+   * Fix day-of-week for changelog entries 0.62.1, 0.37-1.
+ 
+  -- Michael Vogt <mvo@debian.org>  Sat, 25 Jan 2020 15:15:30 +0200
  
  synaptic (0.84.8) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge