[Pkg-privacy-maintainers] Fwd: [Pkg-privacy-commits] [onioncircuits] 02/02: Add AppArmor profile for onioncircuits and install it.

[Sascha Steinbiss]

Hi U,

>> However, I was wondering why you added the apparmor profile to
>> upstream's code in master? As it is a Debian/Tails specific addition, I
> 
> As I said, I have made the exact same commit on upstream's master
> branch. So that profile is already part of the upstream code.

Yes, but it's not part of a release yet, is it? Since we usually base
Debian packages on upstream releases, we can only consider something as
part of upstream code if it's included in a versioned release, whose
tarball we can then import into the packaging repo.
At least that's how I usually do it ;) If the team has a different
opinion I'd be happy to discuss.

>> would have expected it to be somewhere under debian/ and installed from
>> there. Placing it outside debian/ breaks building with
>> --git-pristine-tar for me as the contents of master no longer match
>> what's in the tarball:
>> I guess might also help contacting Alan to include the profile in future
>> upstream releases.
> 
> I understand that this creates an issue for building from master, but
> not from the previous tag, or am I mistaken? 

Not sure what you mean... if something is changed in the packaging
repo's master branch that makes its contents diverge from upstream's
last imported tarball contents (in the pristine-tar branch), one will
run into the problem I mentioned.

AFAICS this can be avoided by either:

 - including the new file in debian/ and installing it from there
   (hence not touching upstream's code in git, probably the
   best option), or
 - introducing the new file in the upstream space via a patch if it
   really needs to be there.

Once there is a new release including the profile file, this addition
can then be dropped from the Debian packaging code.

> I mostly thought it was the best choice to make that commit
> regardless, so that it would be in the Debian Git repo and that you'd
> be aware of the existence of that file.

I see, that makes sense of course :)

Cheers
Sascha