[pkg-apparmor] Bug#881936: apparmor: support usrmerge

[intrigeri]

Control: tag -1 + upstream

Hi Héctor,

Héctor Orón Martínez:
>   Please consider the following patch to support usrmerge: (in debdiff form)
> […]
> +---
> + parser/tst/simple_tests/file/allow/ok_append_1.sd  | 10 +++++-----
> + .../file/allow/ok_embedded_spaces_1.sd             |  2 +-
> + .../file/allow/ok_embedded_spaces_2.sd             |  2 +-
> + parser/tst/simple_tests/file/allow/ok_lock_1.sd    | 22 +++++++++++-----------
> + parser/tst/simple_tests/file/allow/ok_mmap_1.sd    | 10 +++++-----
> + parser/tst/simple_tests/file/allow/ok_mmap_2.sd    | 12 ++++++------
> + 6 files changed, 29 insertions(+), 29 deletions(-)

Thanks!

Can you please send this upstream as a merge request there:

  https://gitlab.com/apparmor/apparmor/

?

If you prefer not to, I can forward. But IIRC it's not your first
contribution so on the long term, it would make sense if you would
send your proposed changes directly upstream :)

Cheers,
-- 
intrigeri