libudev: require LIBUDEV_I_KNOW_THE_API_IS_SUBJECT_TO_CHANGE

diff --git a/NEWS b/NEWS
index 1a9aa69059066e2ec031c5ccecc00a90f8d6e8ae..db763150343c1c41405c431897907bdf566b777f 100644 (file)
--- 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 34d5ef1557640a7fc1021a5fc49e87fe1516272c..9405b7301106a93967db0f0c2184b09dcff67b9b 100644 (file)
--- 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 430472735be481efb1bd37347d1cfb0d9ca47b3b..dadcd55f0fcb84188a1a6322473174534b943b70 100644 (file)
--- 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 1eb3745e6ffa51abcc070f9e49ba984e27795c41..cd366c7dfca81692abed23551094dda12227a432 100644 (file)
--- 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;