xserver-xorg-video-ati: Changes to 'ubuntu'

[Maarten Lankhorst <mlankhorst-guest@moszumanska.debian.org>]

 debian/control |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit de1ab9bea441d49cf34c8278567475bd425483fe
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date:   Thu Jul 17 14:06:13 2014 +0200

    remove libglamor-dev as dependency, part of core X now

diff --git a/debian/control b/debian/control
index b0e8539..2155e36 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