-
Committer:
Package Import Robot
-
Author(s):
Adam Conrad, Ubuntu Merge-o-Matic
-
Date:
2012-12-02 03:57:07 UTC
-
mfrom:
(2.1.8 sid)
-
Revision ID:
package-import@ubuntu.com-20121202035707-0sww1ej0uow6ze5w
Tags: 2.4.5-5.1ubuntu1
[ Ubuntu Merge-o-Matic ]
* Merge from Debian unstable. 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.
- Fix FTBFS with linux 3.5 headers.