glamor-egl: Changes to 'ubuntu'

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

 debian/control |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f1a5e1177da14c75388406364063cd39475dc5c2
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date:   Tue Jan 28 12:42:33 2014 +0100

    fix typo
    
    Oops.

diff --git a/debian/control b/debian/control
index 3dc6ee6..c97268b 100644
--- a/debian/control
+++ b/debian/control
@@ -60,7 +60,7 @@ Depends:
 Pre-Depends: ${misc:Pre-Depends},
 Multi-Arch: same
 Replaces: xserver-xorg-glamoregl
-Conflicts: xserver-xorg-video-glamoregl
+Conflicts: xserver-xorg-glamoregl
 Description: X.Org X server -- graphics acceleration module based on OpenGL
  Glamor is a library for accelerating 2D graphics using GL functions.
  .