xserver-xorg-video-ati: Changes to 'ubuntu'
debian/changelog | 7 +++++++
debian/control | 6 +++---
2 files changed, 10 insertions(+), 3 deletions(-)
New commits:
commit ae870f74fff47950a1175145eb7d8438631363fe
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Mon Oct 13 16:05:51 2014 +0200
release to utopic
diff --git a/debian/changelog b/debian/changelog
index f2185d1..af2e52c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-ati (1:7.4.0-2ubuntu2) UNRELEASED; urgency=low
+xserver-xorg-video-ati (1:7.4.0-2ubuntu2) utopic; urgency=low
* Rebuild for xorg 1.16.
* Remove glamor as depends, part of Xorg in 1.16.
- -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Tue, 29 Jul 2014 14:21:39 +0200
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Wed, 10 Sep 2014 16:57:22 +0200
xserver-xorg-video-ati (1:7.4.0-2ubuntu1) utopic; urgency=medium
commit bafd22d23e7a41488de46ad19ba4fa29a802a161
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Wed Sep 10 16:57:19 2014 +0200
Rebuild for xorg 1.16.
Remove glamor as depends, part of Xorg in 1.16.
diff --git a/debian/changelog b/debian/changelog
index d885ba4..f2185d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-ati (1:7.4.0-2ubuntu2) UNRELEASED; urgency=low
+
+ * Rebuild for xorg 1.16.
+ * Remove glamor as depends, part of Xorg in 1.16.
+
+ -- Maarten Lankhorst <maarten.lankhorst@ubuntu.com> Tue, 29 Jul 2014 14:21:39 +0200
+
xserver-xorg-video-ati (1:7.4.0-2ubuntu1) utopic; urgency=medium
* Merge with released debian unstable.
diff --git a/debian/control b/debian/control
index 81d7716..b0dba0f 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends:
dh-autoreconf,
quilt,
pkg-config,
- xserver-xorg-dev (>= 2:1.14.2.901-2ubuntu4~),
+ xserver-xorg-dev (>= 2:1.15.99.904~),
x11proto-gl-dev,
x11proto-xext-dev,
x11proto-core-dev,
@@ -22,8 +22,9 @@ Build-Depends:
x11proto-dri2-dev,
x11proto-xf86dri-dev,
libudev-dev [linux-any],
- libglamor-dev (>= 0.6.0-0ubuntu3),
xutils-dev (>= 1:7.5+4)
+Build-Conflicts:
+ libglamor-dev,
Standards-Version: 3.9.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-ati
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-ati.git
@@ -34,7 +35,6 @@ Depends:
${shlibs:Depends},
${misc:Depends},
${xviddriver:Depends},
- xserver-xorg-video-glamoregl,
xserver-xorg-video-r128,
xserver-xorg-video-mach64,
xserver-xorg-video-radeon
Reply to: