-
Committer:
Bazaar Package Importer
-
Author(s):
Martin Pitt
-
Date:
2008-05-06 08:22:30 UTC
-
mfrom:
(1.1.1 upstream)
-
Revision ID:
james.westby@ubuntu.com-20080506082230-d1phz6kocr5xlvjk
Tags: 1.1.0-1ubuntu1
* Merge with Debian unstable. Most of our modifications are upstream/in
Debian now and could be dropped.
* Drop debian/patches/98-unload_network_modules.patch: Unloading all network
modules during suspend is a blunt hack and won't be accepted/supported by
upstream. The few modules which need it should be fixed in the kernel
(only known one is e1000 on some systems on 2.6.24).
* 99-fixup-ubuntu-behaviour.patch: Drop --quirk-reset-brightness backport
(upstream now) and shopt fix (not needed with this upstream version).
Split the remaining bits into:
- 01-fix-vberestore.patch: Fix VBE mode restoration; mode 3 special casing
by Matthew Garrett, copy&paste fix by Martin Pitt; forwarded upstream to
FD#15840.
- 99-ubuntu-acpi-support-vbestate.patch: Change the path of the VBE state
dump to where acpi-support writes it to. (Ubuntu specific; unclear, if
still needed)