release 126

4 files changed, 22 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 1e6afb3224..2c2272ec15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,19 @@
 Summary of changes from v125 to v126
 ============================================
 
-Kay Sievers (6):
+Kay Sievers (9):
       delete all Makefiles and move udev source to udev/
       use autotools
       rules: mode 0660 for group "disk"
       rules: update Fedora rules
       update ChangeLog
       INSTALL: --enable-selinux not --with-selinux
+      volume_id: move static lib to $prefix
+      volume_id: create relative links
+      rules: run vol_id on opticals only if media is found
+
+Marco d'Itri (1):
+      rules: Debian update
 
 Thomas Koeller (1):
       use proper directory lib/lib64 for libvolume_id
diff --git a/Makefile.am b/Makefile.am
index 60f54ea9e4..ae21bca16c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,3 +40,11 @@ test-install:
 	make DESTDIR=$(PWD)/udev-test-install install
 	tree $(PWD)/udev-test-install/
 
+git-release:
+	head -1 ChangeLog | grep -q "to v$(VERSION)"
+	head -1 NEWS | grep -q "udev $(VERSION)"
+	git commit -a -m "release $(VERSION)"
+	cat .git/refs/heads/master > .git/refs/tags/$(VERSION)
+	git gc
+	git prune
+	git-update-server-info
diff --git a/NEWS b/NEWS
index a7a5579de9..f0615d53b3 100644
--- a/NEWS
+++ b/NEWS
@@ -16,11 +16,15 @@ options are:
     --disable-logging
         disable all logging and compile-out all log strings
     --with-selinux
-        link against SELInux libraries to set the expected context
+        link against SELInux libraries, to set the expected context
         for created files
 
-No symlinks to udevadm are installed anymore, if still neded, the
-package should create them.
+In the default rules, the group "disk" gets permissions 0660 instead
+of 0640. One small step closer to unify distro rules. Some day, all
+distros hopefully end up with the same set of rules.
+
+No symlinks to udevadm are installed anymore, if they are still needed,
+they should be provided by the package.
 
 udev 125
 ========
diff --git a/TODO b/TODO
index 46af966c40..a78e551f11 100644
--- a/TODO
+++ b/TODO
@@ -4,4 +4,3 @@ These things will change in future udev versions:
   o --device-id-of-file will print '5:8' instead of '5 8'
 
 These things are deprecated and scheduled for removal in a future udev version:
-  o the installation of symlinks to udevadm