From e4255f115330b949c1caeb561cbe0e39f5225f50 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers@vrfy.org>
Date: Wed, 3 Sep 2008 23:33:06 +0200
Subject: [PATCH] udevadm: rename source files

---
 NEWS                                      |  4 ++++
 udev/Makefile.am                          | 12 ++++++------
 udev/{udevcontrol.c => udevadm-control.c} |  0
 udev/{udevinfo.c => udevadm-info.c}       |  0
 udev/{udevmonitor.c => udevadm-monitor.c} |  0
 udev/{udevsettle.c => udevadm-settle.c}   |  0
 udev/{udevtest.c => udevadm-test.c}       |  0
 udev/{udevtrigger.c => udevadm-trigger.c} |  0
 udev/udevd.h                              |  2 +-
 9 files changed, 11 insertions(+), 7 deletions(-)
 rename udev/{udevcontrol.c => udevadm-control.c} (100%)
 rename udev/{udevinfo.c => udevadm-info.c} (100%)
 rename udev/{udevmonitor.c => udevadm-monitor.c} (100%)
 rename udev/{udevsettle.c => udevadm-settle.c} (100%)
 rename udev/{udevtest.c => udevadm-test.c} (100%)
 rename udev/{udevtrigger.c => udevadm-trigger.c} (100%)

diff --git a/NEWS b/NEWS
index 70cd0debb..8f7871d56 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,10 @@ The udevadm info --device-id-of-file= output has changed to use
 the obvious format. Possible current users should use the --export
 option which is not affected.
 
+The old udev commands symlinks to udevadm are not installed since
+a while, if these symlinks are used, a deprecation warning to stderr
+is printed.
+
 udev 127
 ========
 Bugfixes.
diff --git a/udev/Makefile.am b/udev/Makefile.am
index 4a7c7855c..d123c0b3f 100644
--- a/udev/Makefile.am
+++ b/udev/Makefile.am
@@ -55,12 +55,12 @@ udevd_LDADD = \
 udevadm_SOURCES = \
 	$(common_files) \
 	udevadm.c \
-	udevinfo.c \
-	udevcontrol.c \
-	udevtest.c \
-	udevmonitor.c \
-	udevsettle.c \
-	udevtrigger.c
+	udevadm-info.c \
+	udevadm-control.c \
+	udevadm-test.c \
+	udevadm-monitor.c \
+	udevadm-settle.c \
+	udevadm-trigger.c
 
 udevadm_LDADD = \
 	$(common_ldadd)
diff --git a/udev/udevcontrol.c b/udev/udevadm-control.c
similarity index 100%
rename from udev/udevcontrol.c
rename to udev/udevadm-control.c
diff --git a/udev/udevinfo.c b/udev/udevadm-info.c
similarity index 100%
rename from udev/udevinfo.c
rename to udev/udevadm-info.c
diff --git a/udev/udevmonitor.c b/udev/udevadm-monitor.c
similarity index 100%
rename from udev/udevmonitor.c
rename to udev/udevadm-monitor.c
diff --git a/udev/udevsettle.c b/udev/udevadm-settle.c
similarity index 100%
rename from udev/udevsettle.c
rename to udev/udevadm-settle.c
diff --git a/udev/udevtest.c b/udev/udevadm-test.c
similarity index 100%
rename from udev/udevtest.c
rename to udev/udevadm-test.c
diff --git a/udev/udevtrigger.c b/udev/udevadm-trigger.c
similarity index 100%
rename from udev/udevtrigger.c
rename to udev/udevadm-trigger.c
diff --git a/udev/udevd.h b/udev/udevd.h
index 7405704c7..a22bc96e5 100644
--- a/udev/udevd.h
+++ b/udev/udevd.h
@@ -32,7 +32,7 @@
 #define UEVENT_NUM_ENVP			32
 
 #define UDEVD_CTRL_SOCK_PATH		"@" UDEV_PREFIX "/org/kernel/udev/udevd"
-#define UDEVD_CTRL_MAGIC		"udevd_" VERSION
+#define UDEVD_CTRL_MAGIC		"udevd-128"
 
 enum udevd_ctrl_msg_type {
 	UDEVD_CTRL_UNKNOWN,
-- 
2.30.2