diff --git a/ChangeLog.txt b/ChangeLog.txt
index 8b9e3ce4..c0bd0cb4 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -35,6 +35,8 @@ Broker:
after a SIGHUP.
- mosquitto_passwd now supports -b (batch mode) to allow the password to be
provided at the command line.
+- Removed $SYS/broker/changeset. This was intended for use with debugging, but
+ in practice is of no use.
Clients:
- Both clients can now load default configuration options from a file.
diff --git a/Makefile b/Makefile
index ffc0a472..d55486fe 100644
--- a/Makefile
+++ b/Makefile
@@ -49,9 +49,8 @@ uninstall :
dist : reallyclean
set -e; for d in ${DISTDIRS}; do $(MAKE) -C $${d} dist; done
- echo $$(hg log -r . --template "{node}") > changeset
mkdir -p dist/mosquitto-${VERSION}
- cp -r client changeset examples installer lib logo man misc security service src test ChangeLog.txt CMakeLists.txt LICENSE.txt LICENSE-3rd-party.txt Makefile compiling.txt config.h config.mk readme.txt readme-windows.txt mosquitto.conf aclfile.example pskfile.example pwfile.example dist/mosquitto-${VERSION}/
+ cp -r client examples installer lib logo man misc security service src test ChangeLog.txt CMakeLists.txt LICENSE.txt LICENSE-3rd-party.txt Makefile compiling.txt config.h config.mk readme.txt readme-windows.txt mosquitto.conf aclfile.example pskfile.example pwfile.example dist/mosquitto-${VERSION}/
cd dist; tar -zcf mosquitto-${VERSION}.tar.gz mosquitto-${VERSION}/
set -e; for m in man/*.xml; \
do \
diff --git a/changeset b/changeset
deleted file mode 100644
index 27434235..00000000
--- a/changeset
+++ /dev/null
@@ -1 +0,0 @@
-b216c4246a7e9ff2be360ca2a7d102c5ea101f04
diff --git a/man/mosquitto.8.xml b/man/mosquitto.8.xml
index d88fb7af..302049ed 100644
--- a/man/mosquitto.8.xml
+++ b/man/mosquitto.8.xml
@@ -102,13 +102,6 @@
started.
-
-
-
- The repository changeset (revision) associated with
- this build. Static.
-
-
(deprecated)
diff --git a/src/Makefile b/src/Makefile
index 6131d43c..1b439199 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -10,7 +10,7 @@ mosquitto : mosquitto.o bridge.o conf.o context.o database.o logging.o loop.o me
${CROSS_COMPILE}${CC} $^ -o $@ ${LDFLAGS} $(BROKER_LIBS)
mosquitto.o : mosquitto.c mosquitto_broker.h
- ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ -DCHANGESET=\"$$(cat ../changeset)\"
+ ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@
bridge.o : bridge.c mosquitto_broker.h
${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@
diff --git a/src/mosquitto.c b/src/mosquitto.c
index 8d7f7255..fe09509d 100644
--- a/src/mosquitto.c
+++ b/src/mosquitto.c
@@ -254,10 +254,6 @@ int main(int argc, char *argv[])
mqtt3_db_messages_easy_queue(&int_db, NULL, "$SYS/broker/version", 2, strlen(buf), buf, 1);
snprintf(buf, 1024, "%s", TIMESTAMP);
mqtt3_db_messages_easy_queue(&int_db, NULL, "$SYS/broker/timestamp", 2, strlen(buf), buf, 1);
-#ifdef CHANGESET
- snprintf(buf, 1024, "%s", CHANGESET);
- mqtt3_db_messages_easy_queue(&int_db, NULL, "$SYS/broker/changeset", 2, strlen(buf), buf, 1);
-#endif
}
#endif