-
Committer:
Bazaar Package Importer
-
Author(s):
Matthias Klose
-
Date:
2010-11-24 18:12:47 UTC
-
mfrom:
(1.2.5 upstream)
(2.1.6 sid)
-
Revision ID:
james.westby@ubuntu.com-20101124181247-2fopr1k0ic1t6svs
Tags: 2.4.5-4ubuntu1
* Merge with Debian; 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.