← Back to branch summary

~ubuntu-branches/ubuntu/trusty/hardening-wrapper/trusty-proposed

« back to all changes in this revision

Viewing changes to debian/rules

  • Committer: Bazaar Package Importer
  • Author(s): Kees Cook
  • Date: 2011-01-11 07:54:28 UTC
  • Revision ID: james.westby@ubuntu.com-20110111075428-sztsflsswmaz7cvt
Tags: 1.30
http://bugs.debian.org/592847
http://bugs.debian.org/592846
* debian/README.Debian: update for gcc versions, include minimal
  notes on hardening-includes (Closes: 592847, 592846).
* debian/rules, debian/hardening-wrapper.{prerm,postinst}: add gcc-4.6
  to the diversion list.
* debian/control: remove binutils-multiarch conflict now that ld.bfd
  is no longer diverted.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/rules
61
61
        install -m644 debian/lintian.overrides debian/hardening-wrapper/usr/share/lintian/overrides/hardening-wrapper
62
62
        install build-tree/hardened-cc build-tree/hardened-c++ build-tree/hardened-ld debian/hardening-wrapper/usr/bin
63
63
        # programatically build links (change debian/h-w.{preinst,postrm} too)
64
 
        for ver in 4.1 4.2 4.3 4.4 4.5; do dh_link -phardening-wrapper \
 
64
        for ver in 4.1 4.2 4.3 4.4 4.5 4.6; do dh_link -phardening-wrapper \
65
65
                usr/bin/hardened-cc usr/bin/gcc-$$ver \
66
66
                usr/bin/hardened-c++ usr/bin/g++-$$ver \
67
67
                ;\