pass make distcheck

diff --git a/NEWS b/NEWS
index 35b57a3b4e2944b64b55aba775e5c8ca94cd6ea8..289db9c8ec2b394f57b0fb79112683fcced3e614 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+udev 131
+========
+Bugfixes.
+
 udev 130
 ========
 Bugfixes.

diff --git a/TODO b/TODO
index e1ef804319103f509de62bff59806f0685d2d915..7cbe9163babc62cecfc9d98a251d2e96bc1818b8 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,11 +1,8 @@
   o add DVB variables to kernel, and drop shell script rule
-  o use libudev device in udev_rules.c
-      get rid of udevice, store rule matching state in rule iterator
   o rework rules to a match-action list, instead of a rules array
-  o add watershed extra
   o DEVTYPE for disks is set by the kernel, they will be removed from
     the default rules
   o "udevadm control" commands will only accept the --<command> syntax
   o symlink names to udevadm will no longer be resolved to old command names
-  o remove "udevinfo -V"
+  o fix "udevadm info -V" format
   o get distros to agree on a default set of rules

diff --git a/configure.ac b/configure.ac
index 6e98f37fbac8681a8408e737a6460a501edb6e1a..5c96bb9277d9fe43be4ae90a50c0de77c4ded914 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT([udev],
-       [130],
+       [131],
        [kay.sievers@vrfy.org])
 AC_PREREQ(2.60)
 AC_CONFIG_SRCDIR([udev/udevd.c])
@@ -11,7 +11,7 @@ AC_PROG_LIBTOOL
 
 dnl /* libudev version */
 LIBUDEV_LT_CURRENT=0
-LIBUDEV_LT_REVISION=3
+LIBUDEV_LT_REVISION=4
 LIBUDEV_LT_AGE=0
 AC_SUBST(LIBUDEV_LT_CURRENT)
 AC_SUBST(LIBUDEV_LT_REVISION)
@@ -19,7 +19,7 @@ AC_SUBST(LIBUDEV_LT_AGE)
 
 dnl /* libvolume_id version */
 VOLID_LT_CURRENT=1
-VOLID_LT_REVISION=3
+VOLID_LT_REVISION=4
 VOLID_LT_AGE=0
 AC_SUBST(VOLID_LT_CURRENT)
 AC_SUBST(VOLID_LT_REVISION)

diff --git a/extras/collect/Makefile.am b/extras/collect/Makefile.am
index 78eb5c75918e56aee30f0300b0edb00773da1fa2..895f1b7f0b150aa63ba43f6dbde54cd292b81f4c 100644 (file)
--- a/extras/collect/Makefile.am
+++ b/extras/collect/Makefile.am
@@ -6,7 +6,6 @@ udevhome_PROGRAMS = \
 
 collect_SOURCES = \
        collect.c \
-       ../../udev/lib/libudev \
        ../../udev/lib/libudev-private.h \
        ../../udev/lib/libudev.c \
        ../../udev/lib/libudev-util.c \