-
Committer:
Package Import Robot
-
Author(s):
Chuck Short
-
Date:
2011-12-31 04:55:56 UTC
-
mfrom:
(1.1.18)
(10.2.16 sid)
-
Revision ID:
package-import@ubuntu.com-20111231045556-3fwmrbggevr9iqxd
Tags: 2.2.1-3ubuntu1
* Merge from Debian testing. 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)