diff -ruN gnome-screensaver-2.20.0.orig/debian/control gnome-screensaver-2.20.0/debian/control
--- gnome-screensaver-2.20.0.orig/debian/control	2008-01-25 14:19:42.000000000 +0100
+++ gnome-screensaver-2.20.0/debian/control	2008-01-25 14:36:57.000000000 +0100
@@ -23,8 +23,8 @@
                libxxf86misc-dev,
                gnome-pkg-tools (>= 0.10),
                libgl1-mesa-dev | libgl1-mesa-swx11-dev,
-               libgnomekbdui-dev (>= 0.1),
                libnotify-dev
+Build-Conflicts: libxklavier11-dev, libgnomekbd-dev, libgnomekbdui-dev
 Standards-Version: 3.7.3
 
 Package: gnome-screensaver
diff -ruN gnome-screensaver-2.20.0.orig/debian/control.in gnome-screensaver-2.20.0/debian/control.in
--- gnome-screensaver-2.20.0.orig/debian/control.in	2008-01-25 14:19:42.000000000 +0100
+++ gnome-screensaver-2.20.0/debian/control.in	2008-01-25 14:36:48.000000000 +0100
@@ -23,8 +23,8 @@
                libxxf86misc-dev,
                gnome-pkg-tools (>= 0.10),
                libgl1-mesa-dev | libgl1-mesa-swx11-dev,
-               libgnomekbdui-dev (>= 0.1),
                libnotify-dev
+Build-Conflicts: libxklavier11-dev, libgnomekbd-dev, libgnomekbdui-dev
 Standards-Version: 3.7.3
 
 Package: gnome-screensaver