Merge ~enr0n/ubuntu-release-upgrader:lp.1947581 into ubuntu-release-upgrader:ubuntu/main

[Nick Rosbrook]

[Brian Murray (brian-murray)]

This looks great, thanks!

review: Approve

diff --git a/DistUpgrade/DistUpgradeView.py b/DistUpgrade/DistUpgradeView.py
index 3d9510f..8b8b904 100644
--- a/DistUpgrade/DistUpgradeView.py
+++ b/DistUpgrade/DistUpgradeView.py
@@ -167,10 +167,10 @@ class AcquireProgress(apt.progress.base.AcquireProgress):
   def estimatedDownloadTime(self, required_download):
     """ get the estimated download time """
     if self.est_speed == 0:
-      timeModem = required_download/(56*1024/8)  # 56 kbit 
-      timeDSL = required_download/(1024*1024/8)  # 1Mbit = 1024 kbit
-      s= _("This download will take about %s with a 1Mbit DSL connection "
-           "and about %s with a 56k modem.") % (FuzzyTimeToStr(timeDSL), FuzzyTimeToStr(timeModem))
+      time5Mbit = required_download/(5*1000*1000/8)  # 1Mbit = 1000 kbit
+      time40Mbit = required_download/(40*1000*1000/8)
+      s= _("This download will take about %s with a 40Mbit connection "
+           "and about %s with a 5Mbit connection.") % (FuzzyTimeToStr(time40Mbit), FuzzyTimeToStr(time5Mbit))
       return s
     # if we have a estimated speed, use it
     s = _("This download will take about %s with your connection. ") % FuzzyTimeToStr(required_download/self.est_speed)
diff --git a/debian/changelog b/debian/changelog
index 122bd90..5a85141 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
 ubuntu-release-upgrader (1:22.04.5) UNRELEASED; urgency=medium
 
+  [ Brian Murray ]
   * debian/control: rename the main branch
 
+  [ Nick Rosbrook ]
+  * DistUpgrade: update download rates in estimated download message (LP: #1947581)
+
  -- Brian Murray <[e-mail]>  Fri, 28 Jan 2022 13:43:11 -0800
 
 ubuntu-release-upgrader (1:22.04.4) jammy; urgency=medium