-
Committer:
Bazaar Package Importer
-
Author(s):
Bhavani Shankar
-
Date:
2009-07-24 19:22:13 UTC
-
mfrom:
(1.1.13 upstream)
(10.1.3 sid)
-
Revision ID:
james.westby@ubuntu.com-20090724192213-cy0pox13ulk4hdam
Tags: 2.1~rc19-1ubuntu1
* Merge from debian unstable (LP: #404099), 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()