* Backport 2.5.1-0ubuntu0.10.10.1 from maverick for userspace tools to work with newer kernels (LP: #660077) NOTE: user-tmp now uses 'owner' match, so non-default profiles will have to be adjusted when 2 separately confined applications that both use the user-tmp abstraction depend on being able to cooperatively share files with each other in /tmp or /var/tmp. * remove the following patches (features not appropriate for SRU): - 0002-add-chromium-browser.patch - 0003-local-includes.patch - 0004-ubuntu-abstractions-updates.patch * debian/rules (this makes it the same as what was shipped in 10.04 LTS release): - don't ship aa-update-browser and its man page (requires 0004-ubuntu-abstractions-updates.patch) - don't ship apparmor.d/local/ (requires 0003-local-includes.patch) - don't use dh_apparmor (not in Ubuntu 10.04 LTS) - don't ship chromium profile * remove debian/profiles/chromium-browser * remove debian/aa-update-browser* * debian/apparmor-profiles.postinst: revert to that in lucid release (requires dh_apparmor and 0002-add-chromium-browser.patch) * remove debian/apparmor-profiles.postrm: doesn't make sense without 0002-add-chromium-browser.patch * debian/control: - revert Build-Depends on debhelper (>= 5) - revert Standards-Version to 3.8.4 - revert Vcs-Bzr - use Conflicts/Replaces version that was in Ubuntu 10.04 LTS * debian/patches/0011-lucid-compat-dbus.patch: move /var/lib/dbus/machine-id back into dbus, since profiles on 10.04 LTS expect it there * debian/patches/0012-lucid-compat-kde.patch: add kde4-config to kde abstraction, since the firefox profile on Ubuntu 10.04 LTS expects it to be there