Branches for Karmic

Author: Daniel Hahler
Revision Date: 2009-10-19 23:22:06 UTC

* Merge from debian unstable (LP: #450874), remaining changes:
  - Install html files.
    - debian/dirs: Add 'var/www/nginx-default'.
    - debian/nginx.install: Add 'html/* var/www/nginx-default'.
  - Added a UFW profile set: (LP: #308695)
    + debian/nginx.ufw.profile: Added.
    + debian/control: nginx: Suggests ufw.
    + debian/dirs: Added 'etc/ufw/applications.d'
    + debian/rules: Added install rule for the nginx UFW profile.
* Closes: LP: #260005, LP: #440888