diff --git a/debian/rules b/debian/rules index 8f04ea0..047f532 100755 --- a/debian/rules +++ b/debian/rules @@ -15,9 +15,10 @@ DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk VER=$(shell dpkg-parsechangelog -SVersion) +SRCNAME=$(shell dpkg-parsechangelog -SSource) override_dh_auto_build: - dh_auto_build -- 'EXTRACFLAGS=-DHTMLPATH=\"/usr/share/dump1090-mutability/html\" -DMODES_DUMP1090_VERSION=\"$(VER)\"' + dh_auto_build -- 'EXTRACFLAGS=-DHTMLPATH=\"/usr/share/dump1090-mutability/html\" -DMODES_DUMP1090_VARIANT=\"$(SRCNAME)\" -DMODES_DUMP1090_VERSION=\"$(VER)\"' override_dh_install: dh_install diff --git a/dump1090.c b/dump1090.c index 7d56416..46a7cdb 100644 --- a/dump1090.c +++ b/dump1090.c @@ -403,7 +403,7 @@ void snipMode(int level) { void showHelp(void) { printf( "-----------------------------------------------------------------------------\n" -"| dump1090 ModeS Receiver %30s |\n" +"| dump1090 ModeS Receiver %45s |\n" "-----------------------------------------------------------------------------\n" "--device-index Select RTL device (default: 0)\n" "--gain Set gain (default: max gain. Use -10 for auto-gain)\n" @@ -458,7 +458,7 @@ void showHelp(void) { " p = Log frames with bad preamble\n" " n = Log network debugging info\n" " j = Log frames to frames.js, loadable by debug.html\n", -"version " MODES_DUMP1090_VERSION +MODES_DUMP1090_VARIANT " " MODES_DUMP1090_VERSION ); } diff --git a/dump1090.h b/dump1090.h index 2fffc3a..4dac2bb 100644 --- a/dump1090.h +++ b/dump1090.h @@ -38,7 +38,11 @@ // DayDate & Year changes for all changes, including for bug fixes. It represent the release date of the update // #ifndef MODES_DUMP1090_VERSION -# define MODES_DUMP1090_VERSION "1.10.3010.14" +# define MODES_DUMP1090_VERSION "1.10.3010.14+mu" +#endif + +#ifndef MODES_DUMP1090_VARIANT +# define MODES_DUMP1090_VARIANT "dump1090-mutability" #endif // ============================= Include files ========================== diff --git a/view1090.c b/view1090.c index 0b9b8b9..d0fc390 100644 --- a/view1090.c +++ b/view1090.c @@ -164,7 +164,7 @@ int setupConnection(struct client *c) { void showHelp(void) { printf( "-----------------------------------------------------------------------------\n" -"| view1090 dump1090 Viewer Ver : "MODES_DUMP1090_VERSION " |\n" +"| view1090 ModeS Viewer %45s |\n" "-----------------------------------------------------------------------------\n" "--interactive Interactive mode refreshing data on screen\n" "--interactive-rows Max number of rows in interactive mode (default: 15)\n" @@ -180,7 +180,8 @@ void showHelp(void) { "--fix Enable single-bits error correction using CRC\n" "--aggressive More CPU for more messages (two bits fixes, ...)\n" "--metric Use metric units (meters, km/h, ...)\n" - "--help Show this help\n" + "--help Show this help\n", + MODES_DUMP1090_VARIANT " " MODES_DUMP1090_VERSION ); }