061 release061

3 files changed, 28 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index d2e641fc4..4ecd186f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+Summary of changes from v060 to v061
+============================================
+
+Greg Kroah-Hartman:
+  Sync up the Debian rules files
+  fix cdrom symlink problem in gentoo rules
+  Fix ChangeLog titles
+
+Kay Sievers:
+  update RELEASE-NOTES
+  we want to provide OPTFLAGS
+  rename ALARM_TIMEOUT to UDEV_ALARM_TIMEOUT
+  udevd: optimize env-key parsing
+  don't resolve OWNER, GROUP on precompile if string contains %, $
+  set default device node to /dev
+  create udevdb files only if somehting interesting happened
+  pack parsed rules list
+  replace useless defines by inline text
+  move rule matches to function
+  add usb_id program to generate usb-storage device identifiers
+  add IEEE1394 rules to the gentoo rule file
+  fake also kernel-name if we renamed a netif
+  allow OPTIONS to be recognized for /sys/modules /sys/devices events
+  switch gentoo rules to new operators
+
+
 Summary of changes from v059 to v060
 ============================================
 
diff --git a/Makefile b/Makefile
index fd2a3f2b4..1db74b038 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,7 @@ EXTRAS=
 # make the build silent. Set this to something else to make it noisy again.
 V=false
 
-VERSION =	060
+VERSION =	061
 ROOT =		udev
 DAEMON =	udevd
 SENDER =	udevsend
diff --git a/udev.spec b/udev.spec
index d56a43ce7..11cc2430f 100644
--- a/udev.spec
+++ b/udev.spec
@@ -29,7 +29,7 @@
 
 Summary: A userspace implementation of devfs
 Name: udev
-Version: 059
+Version: 061
 Release: 1
 License: GPL
 Group: Utilities/System