-
Committer:
Bazaar Package Importer
-
Author(s):
Robert Hooker
-
Date:
2010-07-08 16:45:59 UTC
-
mfrom:
(1.1.34 upstream)
(0.2.8 sid)
-
Revision ID:
james.westby@ubuntu.com-20100708164559-t1gwcpobj4n39lhf
Tags: 1:6.13.1-1ubuntu1
* Merge from Debian Unstable. Remainning Ubuntu changes:
+ debian/control:
- Add quilt to build-depends for Ubuntu patches
+ debian/patches/100_radeon-6.9.0-bgnr-enable.patch:
- Smooth plymouth transition enablement patch
+ debian/rules:
- Add xsfbs patchsys
- Drop /etc/modprobe.d/radeon-kms.conf install.
+ debian/xserver-xorg-video-ati.{pre,post}inst.in:
- Clean existing /etc/modprobe.d/radeon-kms.conf on install.
At best this does nothing (KMS is the default for our kernel)
and at worst it makes it harder to disable KMS.
* Add debian/gbp.conf pointing to Ubuntu branch to make git-buildpackage
less narky.
* Drop 102-no-xv-rn50.patch and 103_new_pci_ids.patch from previous
Ubuntu releases, they are upstream now.