From 2eec3b4d3f0fa85a1e69ad27e77733ca52500b5d Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Sun, 22 Dec 2013 00:44:24 +0100
Subject: [xorg] Remove xprintidle as idleaction now ships its own version

---
 remote/modules/xorg/xorg.conf          | 17 ++++++++---------
 remote/modules/xorg/xorg.conf.opensuse |  1 -
 remote/modules/xorg/xorg.conf.ubuntu   |  5 ++---
 3 files changed, 10 insertions(+), 13 deletions(-)

(limited to 'remote')

diff --git a/remote/modules/xorg/xorg.conf b/remote/modules/xorg/xorg.conf
index c0885cbb..b99f0e2a 100644
--- a/remote/modules/xorg/xorg.conf
+++ b/remote/modules/xorg/xorg.conf
@@ -1,17 +1,16 @@
-REQUIRED_BINARIES="	
+REQUIRED_BINARIES="
 			X
 			Xorg
 			gtf
-			cvt  
-			setxkbmap 
-			xkbvleds 
-			xkbprint 
-			xkbwatch 
-			xkbbell 
-			xkbevd 
+			cvt
+			setxkbmap
+			xkbvleds
+			xkbprint
+			xkbwatch
+			xkbbell
+			xkbevd
 			xrandr
 			xkbcomp
-			xprintidle
 			vmmouse_detect
 "
 REQUIRED_DIRECTORIES="
diff --git a/remote/modules/xorg/xorg.conf.opensuse b/remote/modules/xorg/xorg.conf.opensuse
index 9051f24b..ef353a4c 100644
--- a/remote/modules/xorg/xorg.conf.opensuse
+++ b/remote/modules/xorg/xorg.conf.opensuse
@@ -1,6 +1,5 @@
 # xkbutils, xkbprint, setxkbmap, xkbevd for 64-bit openSuse
 REQUIRED_INSTALLED_PACKAGES="
-			xprintidle
 "
 REQUIRED_CONTENT_PACKAGES="
 			xorg-x11
diff --git a/remote/modules/xorg/xorg.conf.ubuntu b/remote/modules/xorg/xorg.conf.ubuntu
index b1c26ae9..e62a50f8 100644
--- a/remote/modules/xorg/xorg.conf.ubuntu
+++ b/remote/modules/xorg/xorg.conf.ubuntu
@@ -1,7 +1,6 @@
 REQUIRED_INSTALLED_PACKAGES="
-			xprintidle
 "
-REQUIRED_CONTENT_PACKAGES="	
+REQUIRED_CONTENT_PACKAGES="
 			xserver-xorg$UBUNTU_XORG_PKG_SUFFIX
 			xserver-xorg-core$UBUNTU_XORG_PKG_SUFFIX
 			libgl1-mesa-dri$UBUNTU_XORG_PKG_SUFFIX
@@ -37,6 +36,6 @@ REQUIRED_CONTENT_PACKAGES="
 			xprintidle
 "
 REQUIRED_DIRECTORIES+="
-			/usr/lib 
+			/usr/lib
 "
 REQUIRED_FILES=""
-- 
cgit v1.2.3-55-g7522