[Pkg-libvirt-maintainers] libvirt + AppArmor in Stretch vs. merged-/usr

[Guido Günther]

On Sun, Dec 18, 2016 at 11:18:20AM +0100, intrigeri wrote:
> Guido Günther:
> >> Will Stretch be shipped with an AppArmor newer than 2.5, or should
> >> I prepare a branch that imports these commits in debian/patches/?
> 
> > I was aiming for 2.6 but it depends a bit when it will be released.
> 
> OK. So I've cherry-picked the most important commit among those I've
> mentioned, see attached patch against Vcs-Git debian/sid branch.
> Please consider applying it (against sid's 2.4 or experimental's 2.5,
> as you see fit) so we're sure we have it in Stretch, regardless of the
> 2.6 timing.

Thanks but it does not apply to debian/experimental:

$ git am /tmp/0001-AppArmor-policy-support-merged-usr.patch-new-patch-c.patch
Applying: AppArmor-policy-support-merged-usr.patch: new patch, cherry-picked from upstream, that makes the AppArmor policy support merged-/usr systems.
.git/rebase-apply/patch:31: trailing whitespace.
 
.git/rebase-apply/patch:39: trailing whitespace.
 
.git/rebase-apply/patch:43: trailing whitespace.
 
.git/rebase-apply/patch:52: trailing whitespace.
 
.git/rebase-apply/patch:56: trailing whitespace.
 
error: patch failed: debian/patches/series:17
error: debian/patches/series: patch does not apply
Patch failed at 0001 AppArmor-policy-support-merged-usr.patch: new patch, cherry-picked from upstream, that makes the AppArmor policy support merged-/usr systems.
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".


Could you respin?
 -- Guido