~ubuntu-branches/ubuntu/karmic/resolvconf/karmic

Viewing all changes in revision 15.

  • Committer: Bazaar Package Importer
  • Author(s): Nick Ellery
  • Date: 2008-12-07 15:12:34 UTC
  • mfrom: (1.1.4 squeeze)
  • Revision ID: james.westby@ubuntu.com-20081207151234-7bgqj0fy56zsw96y
Tags: 1.43ubuntu1
* Merge from debian unstable, remaining changes (LP: #306092):
  - bin/resolvconf: 
    + fail with non-zero exit code when /etc/resolv.conf is not a symlink.
  - debian/postinst:
    + use default /var/run.
  - debian/rules:
    + don't install the init script in runlevels 0 and 6.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: