← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/apparmor/oneiric-updates

« back to all changes in this revision

Viewing changes to utils/Makefile

  • Committer: Bazaar Package Importer
  • Author(s): Kees Cook
  • Date: 2011-08-10 18:12:34 UTC
  • mfrom: (1.1.19 upstream) (8.1.5 oneiric)
  • Revision ID: james.westby@ubuntu.com-20110810181234-0ph4qatrdx2xskzg
Tags: 2.7.0~beta1+bzr1774-1
* New upstream devel snapshot:
  - drop 0002-lp750381.patch, taken upstream.
  - drop 0004-lp754889.patch, taken upstream.
  - drop 0005-lp761217.patch, taken upstream.
  - drop 0100-manpage-typo.patch, taken upstream.
  - drop 0101-declarations.patch, solved differently upstream.
  - drop 0102-manpage-release-name.patch, taken upstream.
  - drop 0103-kfreebsd-compile.patch, taken upstream.
  - drop define-path-max.patch, taken upstream.
  - drop indep-build.patch, taken upstream.
  - debian/libapparmor1.manpages: add new function man pages.
* Merge with Ubuntu:
  - drop 0104-python-aa-status.patch, taken upstream.
  - drop 0105-lightdm.patch, taken upstream.
  - drop 0106-lp810270.patch, taken upstream.
  - drop 0107-lp767308.patch, taken upstream.
  - drop 0108-gnome-mimeinfo.patch, taken upstream.
  - drop 0109-add-profile-repo-info.patch, taken upstream.
* Add af_names-generation.patch to allow arbitrary socket.h file location.

Show diffs side-by-side

added added

removed removed

Lines of Context:
utils/Makefile
28
28
 
29
29
MODDIR = Immunix
30
30
PERLTOOLS = aa-genprof aa-logprof aa-autodep aa-audit aa-complain aa-enforce \
31
 
        aa-unconfined aa-status aa-notify aa-disable
32
 
TOOLS = ${PERLTOOLS} aa-decode
 
31
        aa-unconfined aa-notify aa-disable
 
32
TOOLS = ${PERLTOOLS} aa-decode aa-status
33
33
MODULES = ${MODDIR}/AppArmor.pm ${MODDIR}/Repository.pm \
34
34
        ${MODDIR}/Config.pm ${MODDIR}/Severity.pm
35
35