-
Committer:
Bazaar Package Importer
-
Author(s):
Angel Abad
-
Date:
2011-02-03 13:16:46 UTC
-
mfrom:
(2.1.7 sid)
-
Revision ID:
james.westby@ubuntu.com-20110203131646-8ufsnzvibm4vxavq
Tags: 2.4.5-5ubuntu1
* Merge from debian unstable. (LP: #712419) Remaining changes:
- /etc/ppp/options: default is noauth instead of auth.
- extra/pon: Perform ppp_on_boot migration from pppoe package.
- debian/ppp.postinst: init script migration for version before
2.4.5~git20081126t100229-0ubuntu2.
- debian/ppp.pppd-dns: Update LSB header.
- Provide pppoe_on_boot file.
- Move pppd-dns script to S45.
- debian/patches/load_ppp_generic_if_needed: load ppp_generic kernel
module if needed.