From da7edd244263826ea020166086d4eca4ddffe766 Mon Sep 17 00:00:00 2001
From: Bryan Stine <battousai@gentoo.org>
Date: Sat, 5 Apr 2008 04:32:05 +0000
Subject: HAL policy 10-synaptics.fdi -> 11-x11-synaptics.fdi. Suggested in bug
 #215903. (Portage version: 2.1.4.4)

---
 x11-drivers/synaptics/ChangeLog                  |  7 ++++++-
 x11-drivers/synaptics/files/10-synaptics.fdi     | 13 -------------
 x11-drivers/synaptics/files/11-x11-synaptics.fdi | 13 +++++++++++++
 x11-drivers/synaptics/synaptics-0.14.6-r2.ebuild |  4 ++--
 4 files changed, 21 insertions(+), 16 deletions(-)
 delete mode 100644 x11-drivers/synaptics/files/10-synaptics.fdi
 create mode 100644 x11-drivers/synaptics/files/11-x11-synaptics.fdi

(limited to 'x11-drivers')

diff --git a/x11-drivers/synaptics/ChangeLog b/x11-drivers/synaptics/ChangeLog
index 1ca17299a27e..6438ecfa0ce0 100644
--- a/x11-drivers/synaptics/ChangeLog
+++ b/x11-drivers/synaptics/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/synaptics
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/ChangeLog,v 1.34 2008/04/02 03:52:01 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/ChangeLog,v 1.35 2008/04/05 04:32:04 battousai Exp $
+
+  05 Apr 2008; Bryan Stine <battousai@gentoo.org> -files/10-synaptics.fdi,
+  +files/11-x11-synaptics.fdi, synaptics-0.14.6-r2.ebuild:
+  Move HAL policy from 10-synaptics.fdi to 11-x11-synaptics.fdi to ensure it
+  gets parsed after other osvendor X11 policies. Suggested in bug #215903.
 
   02 Apr 2008; Bryan Stine <battousai@gentoo.org> +files/10-synaptics.fdi,
   synaptics-0.14.6-r2.ebuild:
diff --git a/x11-drivers/synaptics/files/10-synaptics.fdi b/x11-drivers/synaptics/files/10-synaptics.fdi
deleted file mode 100644
index 05c84286da42..000000000000
--- a/x11-drivers/synaptics/files/10-synaptics.fdi
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<deviceinfo version="0.2">
-  <device>
-    <match key="info.capabilities" contains="input.touchpad">
-      <match key="info.product" contains="Synaptics TouchPad">
-	<merge key="input.x11_driver" type="string">synaptics</merge>
-      </match>
-      <match key="info.product" contains="AlpsPS/2 ALPS">
-	<merge key="input.x11_driver" type="string">synaptics</merge>
-      </match>
-    </match>
-  </device>
-</deviceinfo>
diff --git a/x11-drivers/synaptics/files/11-x11-synaptics.fdi b/x11-drivers/synaptics/files/11-x11-synaptics.fdi
new file mode 100644
index 000000000000..05c84286da42
--- /dev/null
+++ b/x11-drivers/synaptics/files/11-x11-synaptics.fdi
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<deviceinfo version="0.2">
+  <device>
+    <match key="info.capabilities" contains="input.touchpad">
+      <match key="info.product" contains="Synaptics TouchPad">
+	<merge key="input.x11_driver" type="string">synaptics</merge>
+      </match>
+      <match key="info.product" contains="AlpsPS/2 ALPS">
+	<merge key="input.x11_driver" type="string">synaptics</merge>
+      </match>
+    </match>
+  </device>
+</deviceinfo>
diff --git a/x11-drivers/synaptics/synaptics-0.14.6-r2.ebuild b/x11-drivers/synaptics/synaptics-0.14.6-r2.ebuild
index 5f25879a88e6..6966f3d09792 100644
--- a/x11-drivers/synaptics/synaptics-0.14.6-r2.ebuild
+++ b/x11-drivers/synaptics/synaptics-0.14.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/synaptics-0.14.6-r2.ebuild,v 1.2 2008/04/02 03:52:01 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/synaptics/synaptics-0.14.6-r2.ebuild,v 1.3 2008/04/05 04:32:04 battousai Exp $
 
 inherit toolchain-funcs eutils linux-info
 
@@ -91,6 +91,6 @@ src_install() {
 	if use hal ; then
 		# Have HAL assign this driver to supported touchpads.
 		insinto /usr/share/hal/fdi/policy/10osvendor
-		doins "${FILESDIR}"/10-synaptics.fdi
+		doins "${FILESDIR}"/11-x11-synaptics.fdi
 	fi
 }
-- 
cgit v1.2.3-65-gdbad