From a689165b5a140cd7d5fdd63cacf8fce2f275033d Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers@vrfy.org>
Date: Fri, 29 Aug 2008 21:22:24 +0200
Subject: [PATCH] libudev: require LIBUDEV_I_KNOW_THE_API_IS_SUBJECT_TO_CHANGE

---
 NEWS                                    | 17 +++++++++++++----
 rules/rules.d/60-persistent-input.rules |  1 +
 udev/lib/Makefile.am                    |  3 ++-
 udev/lib/libudev.h                      |  5 +++++
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index 1a9aa6905..db7631503 100644
--- a/NEWS
+++ b/NEWS
@@ -2,11 +2,20 @@ udev 127
 ========
 Bugfixes.
 
-A shared library "libudev" will be installed now, to access udev
-device information. DeviceKit, the successor of HAL, will need this
-library to access the udev database and search sysfs for devices.
+Optical drives media is no longer probed for raid signatures,
+reading the end of the device causes some devices to malfunction. 
+Also the offset of the last session is used to probe for the
+filesystem
+
+The volume_id library got a major version number update to 1,
+some deprecated functions are removed.
+
+A shared library "libudev" gets installed now, to provide access
+to udev device information. DeviceKit, the successor of HAL, will
+need this library to access the udev database and search sysfs for
+devices.
 The library is currently in an experimental state, also the API is
-expected to change, as long as the DeviceKit integration isn't
+expected to change, as long as the DeviceKit integration is not
 finished.
 
 udev 126
diff --git a/rules/rules.d/60-persistent-input.rules b/rules/rules.d/60-persistent-input.rules
index 34d5ef155..9405b7301 100644
--- a/rules/rules.d/60-persistent-input.rules
+++ b/rules/rules.d/60-persistent-input.rules
@@ -14,6 +14,7 @@ DRIVERS=="pcspkr", ENV{ID_CLASS}="spkr"
 DRIVERS=="atkbd", ENV{ID_CLASS}="kbd"
 DRIVERS=="psmouse", ENV{ID_CLASS}="mouse"
 ATTRS{name}=="*dvb*|*DVB*|* IR *", ENV{ID_CLASS}="ir"
+# joystick (ABS_X || ABS_WHEEL || ABS_THROTTLE) && !BTN_TOUCH
 ATTRS{modalias}=="input:*-*a[068],*|input:*-*a*,[68],*m*", ATTRS{modalias}!="input:*-*k*14A,*r*", ENV{ID_CLASS}="joystick"
 
 # fill empty serial number
diff --git a/udev/lib/Makefile.am b/udev/lib/Makefile.am
index 430472735..dadcd55f0 100644
--- a/udev/lib/Makefile.am
+++ b/udev/lib/Makefile.am
@@ -1,6 +1,7 @@
 AM_CPPFLAGS = \
 	-DSYSCONFDIR=\""$(sysconfdir)"\" \
-	-DUDEV_PREFIX=\""$(udev_prefix)"\"
+	-DUDEV_PREFIX=\""$(udev_prefix)"\" \
+	-DLIBUDEV_COMPILATION
 
 noinst_PROGRAMS = \
 	test-libudev
diff --git a/udev/lib/libudev.h b/udev/lib/libudev.h
index 1eb3745e6..cd366c7df 100644
--- a/udev/lib/libudev.h
+++ b/udev/lib/libudev.h
@@ -20,6 +20,11 @@
 #ifndef _LIBUDEV_H_
 #define _LIBUDEV_H_
 
+/* this will stay as long as the DeviceKit integration of udev is work in progress */
+#if !defined LIBUDEV_COMPILATION && !defined LIBUDEV_I_KNOW_THE_API_IS_SUBJECT_TO_CHANGE
+#error "#define LIBUDEV_I_KNOW_THE_API_IS_SUBJECT_TO_CHANGE is needed to use this experimental library version"
+#endif
+
 struct udev;
 struct udev_device;
 struct udev_monitor;
-- 
2.30.2