Merge lp:~azzar1/update-manager/lp-1787553-bionic into lp:update-manager

[Andrea Azzarone]

Add a reminder to enable Livepatch (LP: #1787553).

Unmerged revisions

2828. By Andrea Azzarone on 2018-09-07

Add a reminder to enable Livepatch (LP: #1787553).

2827. By Julian Andres Klode on 2018-07-20

releasing package update-manager version 1:18.04.11.4

2826. By Julian Andres Klode on 2018-07-20

Adjust dates in hwe-support-status for bionic (LP: #1775236)

2825. By Julian Andres Klode on 2018-06-29

releasing package update-manager version 1:18.04.11.3

2824. By Julian Andres Klode on 2018-06-29

Add support for HTTPS proxies; this breaks UpdateManager.Core.utils.init_proxy()
API - the return value is now a dict, rather than a string (LP: #1771914).

2823. By Mathieu Trudel-Lapierre on 2018-06-08

releasing package update-manager version 1:18.04.11.2

2822. By Mathieu Trudel-Lapierre on 2018-06-08

Fix my embarassing typo that makes update-manager report crashes, when
instanciating the "reboot" dialog and mangling signals. (LP: #1774131)

2821. By Mathieu Trudel-Lapierre on 2018-05-28

releasing package update-manager version 1:18.04.11.1

2820. By Mathieu Trudel-Lapierre on 2018-05-28

Block style context changed signal while enforcing the main window's
constant size. Thanks to Thomas Waldmann and Sebastien Bacher for the
initial analysis of this bug. (LP: #1637180)

=== modified file 'HweSupportStatus/consts.py'
--- HweSupportStatus/consts.py	2017-08-07 19:42:06 +0000
+++ HweSupportStatus/consts.py	2018-09-07 09:00:48 +0000
@@ -6,14 +6,14 @@
 
 
 # the day on which the short support HWE stack goes EoL
-HWE_EOL_DATE = datetime.date(2016, 8, 4)
+HWE_EOL_DATE = datetime.date(2023, 4, 30)
 
 # the day on which the next LTS first point release is available
 # used to propose a release upgrade
-NEXT_LTS_DOT1_DATE = datetime.date(2016, 7, 21)
+NEXT_LTS_DOT1_DATE = datetime.date(2020, 7, 21)
 
 # end of the month in which this LTS goes EoL
-LTS_EOL_DATE = datetime.date(2019, 4, 30)
+LTS_EOL_DATE = datetime.date(2023, 4, 30)
 
 
 class Messages:
@@ -27,7 +27,7 @@
     APT_UPGRADE = _("""
 To upgrade to a supported (or longer-supported) configuration:
 
-* Upgrade from Ubuntu 14.04 LTS to Ubuntu 16.04 LTS by running:
+* Upgrade from Ubuntu 16.04 LTS to Ubuntu 18.04 LTS by running:
 sudo do-release-upgrade %s
 
 OR
@@ -58,11 +58,11 @@
 and graphics stack) of your system will no longer be available.
 
 For more information, please see:
-http://wiki.ubuntu.com/1404_HWE_EOL
+http://wiki.ubuntu.com/1604_HWE_EOL
 """) % HWE_EOL_DATE.isoformat()
 
     HWE_SUPPORT_HAS_ENDED = _("""
 WARNING: Security updates for your current Hardware Enablement
 Stack ended on %s:
- * http://wiki.ubuntu.com/1404_HWE_EOL
+ * http://wiki.ubuntu.com/1604_HWE_EOL
 """) % HWE_EOL_DATE.isoformat()

=== modified file 'UpdateManager/Core/utils.py'
=== modified file 'UpdateManager/Dialogs.py'
=== modified file 'debian/changelog'
--- debian/changelog	2018-09-06 07:10:42 +0000
+++ debian/changelog	2018-09-07 09:00:48 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 update-manager (1:18.10.7) cosmic; urgency=medium
 
   * Fix PEP8 regression from 18.10.4 to allow autopkgtest to pass
@@ -48,6 +49,43 @@
 
  -- Mathieu Trudel-Lapierre <[e-mail]>  Mon, 28 May 2018 10:03:52 -0400
 
+=======
+update-manager (1:18.04.11.5) UNRELEASED; urgency=medium
+
+  * Add a reminder to enable Livepatch (LP: #1787553).
+  * Build-Depends on python3-distro-info.
+
+ -- Andrea Azzarone <[e-mail]>  Fri, 07 Sep 2018 10:41:28 +0200
+
+update-manager (1:18.04.11.4) bionic; urgency=medium
+
+  * Adjust dates in hwe-support-status for bionic (LP: #1775236)
+
+ -- Julian Andres Klode <[e-mail]>  Fri, 20 Jul 2018 12:26:28 +0200
+
+update-manager (1:18.04.11.3) bionic; urgency=medium
+
+  * Add support for HTTPS proxies; this breaks UpdateManager.Core.utils.init_proxy()
+    API - the return value is now a dict, rather than a string (LP: #1771914).
+
+ -- Julian Andres Klode <[e-mail]>  Fri, 29 Jun 2018 14:44:16 +0200
+
+update-manager (1:18.04.11.2) bionic; urgency=medium
+
+  * Fix my embarassing typo that makes update-manager report crashes, when
+    instanciating the "reboot" dialog and mangling signals. (LP: #1774131)
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Fri, 08 Jun 2018 11:50:10 -0700
+
+update-manager (1:18.04.11.1) bionic; urgency=medium
+
+  * Block style context changed signal while enforcing the main window's
+    constant size. Thanks to Thomas Waldmann and Sebastien Bacher for the
+    initial analysis of  this bug. (LP: #1637180)
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Mon, 28 May 2018 10:13:12 -0400
+
+>>>>>>> MERGE-SOURCE
 update-manager (1:18.04.11) bionic; urgency=medium
 
   * Add Appstream metadata with compulsory_for_desktop fields to prevent

=== modified file 'debian/control'
=== modified file 'hwe-support-status'
--- hwe-support-status	2016-08-15 21:34:38 +0000
+++ hwe-support-status	2018-09-07 09:00:48 +0000
@@ -45,8 +45,8 @@
     r'linux-image.*-(3\.16|3\.19|4\.2)(\.[0-9]+)?-.*'
 
 # HWE stack with a long support period
-HWE_SUPPORTED_BACKPORT = "-lts-xenial"
-SUPPORTED_KERNEL_IMAGE_REGEX = r'linux-image.*-4\.4(\.[0-9]+)?-.*'
+HWE_SUPPORTED_BACKPORT = "-hwe-18.04"
+SUPPORTED_KERNEL_IMAGE_REGEX = r'^$' # No fixed backported kernel yet
 
 
 KERNEL_METAPKGS = (

=== modified file 'tests/test_hwe_support_status.py'
--- tests/test_hwe_support_status.py	2017-08-07 20:54:58 +0000
+++ tests/test_hwe_support_status.py	2018-09-07 09:00:48 +0000
@@ -121,7 +121,7 @@
                 text = mock_print.call_args[0][0]
                 print("43242343243", mock_print.call_count)
                 self.assertIn(
-                    "Your system is supported until April 2019", text)
+                    "Your system is supported until April 2023", text)
 
     def test_advice_about_hwe_status_supported_hwe_stack(self):
         with patch("hwe_support_status.is_unsupported_hwe_running") as m:
@@ -139,7 +139,7 @@
                 text = mock_print.call_args[0][0]
                 self.assertIn(
                     "Your Hardware Enablement Stack (HWE) is supported "
-                    "until April 2019", text)
+                    "until April 2023", text)
 
 
 if __name__ == "__main__":