-
Committer:
Bazaar Package Importer
-
Author(s):
Chuck Short
-
Date:
2011-06-16 18:33:37 UTC
-
mfrom:
(1.1.17 upstream)
(10.2.13 sid)
-
Revision ID:
james.westby@ubuntu.com-20110616183337-fv50u3kmiabewjq0
Tags: 2.2.0-2ubuntu1
* Merge from debian unstable. Remaining changes:
+ debian/openvpn.init.d:
- Do not use start-stop-daemon and </dev/null to avoid blocking boot.
- Show per-VPN result messages.
- Add "--script-security 2" by default for backwards compatabliity.
+ debian/control: Add lsb-base >= 3.2-14 to allow status_of_proc()
+ debian/update-resolv-conf: Support multiple domains.
+ fix bug where '--script-security 2' would be passed for all
daemons after the first. (LP: #794916