debian/changelog | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 9ffebf29ba629214f954fe49e9e593a927ff38e8
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Aug 1 09:49:15 2012 +0200
Update changelog + version, hopefully won't conflict with raof's changes
diff --git a/debian/changelog b/debian/changelog
index d216508..c1e57d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
-xserver-xorg-video-ati (1:6.99.99-1) UNRELEASED; urgency=low
+xserver-xorg-video-ati (1:6.99.99~git20120713.6ef1ad6a-0ubuntu1) UNRELEASED; urgency=low
* KMS-only release, only works with linux-any now.
* Bump to build against xserver 1.13rc1
* Require libdrm 2.6.36
+ * Merge from debian-experimental. Remaining Ubuntu changes:
+ - debian/control:
+ + firmware-linux -> linux-firmware
+ - debian/rules:
+ + Remove reference to radeon-kms.conf
+ - debian/radeon-kms.conf:
+ + Don't install modprobe rule for KMS; the Ubuntu kernel defaults to KMS.
-- Maarten Lankhorst <maarten.lankhorst@canonical.com> Mon, 16 Jul 2012 14:29:26 +0200