Only the previously implemented state of it.
For that, I guess I should have added the file in debian/apparmor-profile-anondist.displace.
Here is what I did:
- renamed abstractions/consoles to abstractions/consoles.anondist-orig
- created abstractions/consoles.anondist
- created consoles/consoles symlink
- reloaded AppArmor ("sudo service apparmor reload", not "restart" in case you don't know),
When I was happy, I reverted to the original configuration, I git added the files in "etc/apparmor.d/abstarctions", committed and ran "sudo make install".
During "sudo make install" you won't notice that this won't work in the final package ("make deb-icup"). Because "make install" only simply copies files to "$DESTDIR" (defaults to /) [implemented in Makefile and make-helper.bsh] and does not check conflicts with existing deb packages as dpkg would do and by design not run any deb package maintainer scripts. You can open the .deb (make deb-pkg) and see what it actually contains. Includes as well maintainer scripts, that include auto-generated code by config-package-dev. So while "make install" is required by debhelper and useful for manual use, it cannot replace trying to install the whole package. But don't worry too much about that stuff, I usually "make deb-icup" packages and see if they still work and we'd also notice a build error as last resort if there are any conflicts with other packages (you may not overwrite files by other packages, unless specifically implemented [ex: config-package-dev]) or dpkg will stop installing the package).
I suppose fetch/merge (or pull)?. At the moment, I have fetched the origin (yours), and diff shows the right changes: the additions in debian/apparmor-profile-anondist.displace and debian/changelog, and the removal of consoles and consoles.anondist-orig. It should be safe to merge.
This is insufficient.
When you run.
git diff origin/master troubadoour/master
git diff whonix/master troubadoour/master
(Depending on your "git remote -v" naming scheme.)
You'll see there is still a difference.
What could be done...
git revert 7aa12d2c7c1c7bde72b2ed579e92f991474545e5
Then this reverted change would end up in Whonix/apparmor-profile-anondist history as well next time I merge troubadoour/master. I wouldn't mind, but other projects might nitpick about this.
(Which is the easy way. The more nitpicky way would be to point your local master to origin/master and to git push --force. And since --force is "evil", the even more correct nitpicky way would be to not commit to master for experimental changes, have a separate branches suggest the change, merge into master if okay (or I would have to suggest an alternative branch and merge that). Just explaining this to give a little more background on git in case you ever want to use it for profession. I don't want to waste time on nitpicking git workflows that are used by huge projects with loads of contributors, where a clean git history might actually matter, so going for the easy revert way should more than suffice.)