[pkg-apparmor] Bug#925600: apparmor-profiles-extra: adjust autopkgtests to also work on Ubuntu

[Jamie Strandboge]

Package: apparmor-profiles-extra
Version: 1.26
Severity: normal
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu disco ubuntu-patch

In Ubuntu, the attached patch was applied to achieve the following:

  * debian/tests/control:
    - try to pull in linux-image-generic for Ubuntu
    - also limit Debian kernel to only amd64 and add skip-not-installable
      restriction

Thanks for considering the patch.


-- System Information:
Debian Release: buster/sid
  APT prefers disco
  APT policy: (500, 'disco')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 5.0.0-7-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
-------------- next part --------------
diff -Nru apparmor-profiles-extra-1.26/debian/tests/control apparmor-profiles-extra-1.26ubuntu1/debian/tests/control
--- apparmor-profiles-extra-1.26/debian/tests/control	2019-02-25 08:34:49.000000000 -0600
+++ apparmor-profiles-extra-1.26ubuntu1/debian/tests/control	2019-03-26 17:51:40.000000000 -0500
@@ -5,5 +5,5 @@
 # Dummy test so that changes to linux-image-amd64 trigger our other autopkgtests
 # on ci.debian.net
 Test-Command: /bin/true
-Depends: linux-image-amd64 [amd64]
-Restrictions: superficial
+Depends: linux-image-amd64 [amd64] | linux-image-generic [amd64]
+Restrictions: superficial, skip-not-installable