update ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 5c6ded726b4a59fda38597ccabb1be6afcaa422a..106bdd179738dc1796cb15c40ab8350df4329f04 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Summary of changes from v125 to v126
+============================================
+
+Kay Sievers (4):
+      delete all Makefiles and move udev source to udev/
+      use autotools
+      rules: mode 0660 for group "disk"
+      rules: update Fedora rules
+
+Thomas Koeller (1):
+      use proper directory lib/lib64 for libvolume_id
+
+
 Summary of changes from v124 to v125
 ============================================
 

diff --git a/Makefile.am b/Makefile.am
index 8152af012da030575f60dabb4f626a65f211acb8..60f54ea9e4118488d09284691e61457ac3590e30 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,16 +20,17 @@ distclean-local:
        rm -rf udev-test-install
        rm -f udev-$(VERSION).tar.gz udev-$(VERSION).tar.bz2
 
-ChangeLog:
-       @ mv $@ $@.tmp
-       @ echo "Summary of changes from v$(shell echo $$(($(VERSION) - 1))) to v$(VERSION)" >> $@
-       @ echo "============================================" >> $@
-       @ echo >> $@
-       @ git log --pretty=short $(shell echo $$(($(VERSION) - 1)))..HEAD | git shortlog  >> $@
-       @ echo >> $@
-       @ cat $@
-       @ cat $@.tmp >> $@
-       @ rm $@.tmp
+changelog:
+       @ head -1 ChangeLog | grep -q "to v$(shell echo $$(($(VERSION) - 1)))"
+       @ mv ChangeLog ChangeLog.tmp
+       @ echo "Summary of changes from v$(shell echo $$(($(VERSION) - 1))) to v$(VERSION)" >> ChangeLog
+       @ echo "============================================" >> ChangeLog
+       @ echo >> ChangeLog
+       @ git log --pretty=short $(shell echo $$(($(VERSION) - 1)))..HEAD | git shortlog  >> ChangeLog
+       @ echo >> ChangeLog
+       @ cat ChangeLog
+       @ cat ChangeLog.tmp >> ChangeLog
+       @ rm ChangeLog.tmp
 
 test-run:
        cd test && ./udev-test.pl