-
Committer:
Bazaar Package Importer
-
Author(s):
Chuck Short
-
Date:
2011-05-17 02:14:39 UTC
-
mfrom:
(10.2.12 sid)
-
Revision ID:
james.westby@ubuntu.com-20110517021439-vqo5yodqu2ukdx67
Tags: 2.1.3-4.1ubuntu1
* 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.