Merge lp:~mclemenceau/ubuntu/focal/apport/ubuntu into lp:~ubuntu-core-dev/ubuntu/focal/apport/ubuntu

[Matthieu Clemenceau]

Fixed autopkgtest on focal due to mismatch linux pakcage name. remove version 5.4 from package name.

Fixed autopkgtest on focal due to mismatch linux pakcage name. remove version 5.4 from package name.

[Brian Murray (brian-murray)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2020-03-13 23:51:50 +0000
+++ debian/changelog	2020-03-20 21:51:00 +0000
@@ -1,5 +1,6 @@
-apport (2.20.11-0ubuntu21) UNRELEASED; urgency=medium
+apport (2.20.11-0ubuntu21) focal; urgency=medium
 
+  [ Brian Murray ]
   * backends/packaging-apt-dpkg.py: allow mirrors which are accessed via https
     in sources.list. Thanks to Launchpad user Esokrates for the fix.
     (LP: #1866996)
@@ -8,6 +9,10 @@
   * test/test_backend_apt_dpkg.py: Fix check for connectivity and modify
     install from PPA test for a change in the PPA being tested.
 
+  [ Matthieu Clemenceau ]
+  * test/test_ui.py: Removed linux package version to fix autopkgtest with
+    focal. Changed linux-5.4 and linux-signed-5.4 to linux and linux-signed 
+
  -- Brian Murray <[e-mail]>  Thu, 12 Mar 2020 15:46:30 -0700
 
 apport (2.20.11-0ubuntu20) focal; urgency=medium

=== modified file 'test/test_ui.py'
--- test/test_ui.py	2020-02-21 18:21:09 +0000
+++ test/test_ui.py	2020-03-20 21:51:00 +0000
@@ -1290,9 +1290,9 @@
 
         sys_arch = impl.get_system_architecture()
         if sys_arch in ['amd64', 'ppc64el']:
-            src_pkg = 'linux-signed-5.4'
+            src_pkg = 'linux-signed'
         else:
-            src_pkg = 'linux-5.4'
+            src_pkg = 'linux'
 
         # set up hook
         f = open(os.path.join(self.hookdir, 'source_%s.py' % src_pkg), 'w')