-
Committer:
Bazaar Package Importer
-
Author(s):
Andres Rodriguez
-
Date:
2009-05-05 14:25:37 UTC
-
mfrom:
(1.1.12 upstream)
(10.1.2 squeeze)
-
Revision ID:
james.westby@ubuntu.com-20090505142537-vq38z4k80bpltxb9
Tags: 2.1~rc15-1ubuntu1
* Merge from debian unstable (LP: #372358), remaining changes:
- debian/openvpn.init.d:
- Do not use start-stop-daemon and use < /dev/null to avoid blocking boot
- show per-VPN result messages
- add "--script-security 2" by default for backwards compatibility
- Added lsb-base>=3.2-14 depend to allow status_of_proc()