diff --git a/Makefile b/Makefile index 0800f0d..83bf0d1 100644 --- a/Makefile +++ b/Makefile @@ -4,18 +4,22 @@ # PROGNAME=dump1090 +ifndef DUMP1090_VERSION +DUMP1090_VERSION=$(shell git describe --tags) +endif + ifdef PREFIX BINDIR=$(PREFIX)/bin SHAREDIR=$(PREFIX)/share/$(PROGNAME) EXTRACFLAGS=-DHTMLPATH=\"$(SHAREDIR)\" endif +CPPFLAGS+=-DMODES_DUMP1090_VERSION=\"$(DUMP1090_VERSION)\" CFLAGS+=-O2 -g -Wall -Werror -W `pkg-config --cflags librtlsdr` LIBS=-lpthread -lm -lrt LIBS_RTL=`pkg-config --libs librtlsdr` CC=gcc - all: dump1090 view1090 %.o: %.c dump1090.h diff --git a/debian/changelog b/debian/changelog index d3a9ea3..0c37883 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dump1090-mutability (1.10.3010.14mu-13) UNRELEASED; urgency=medium +dump1090-mutability (1.13) UNRELEASED; urgency=medium * Fix stable sort of rows with no sortable values (would cause "jumping" rows at the end of the table) diff --git a/debian/rules b/debian/rules index dc9e15b..46a3aec 100755 --- a/debian/rules +++ b/debian/rules @@ -14,11 +14,11 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk -VER=$(shell dpkg-parsechangelog | sed -n 's/^Version: //p') +export DUMP1090_VERSION=$(shell dpkg-parsechangelog | sed -n 's/^Version: /v/p') SRCNAME=$(shell dpkg-parsechangelog | sed -n 's/^Source: //p') override_dh_auto_build: - dh_auto_build -- 'EXTRACFLAGS=-DHTMLPATH=\"/usr/share/dump1090-mutability/html\" -DMODES_DUMP1090_VARIANT=\"$(SRCNAME)\" -DMODES_DUMP1090_VERSION=\"$(VER)\"' + dh_auto_build -- 'EXTRACFLAGS=-DHTMLPATH=\"/usr/share/dump1090-mutability/html\" -DMODES_DUMP1090_VARIANT=\"$(SRCNAME)\"' override_dh_install: dh_install diff --git a/dump1090.h b/dump1090.h index 659c081..c949f14 100644 --- a/dump1090.h +++ b/dump1090.h @@ -50,15 +50,9 @@ #ifndef __DUMP1090_H #define __DUMP1090_H -// File Version number -// ==================== -// Format is : MajorVer.MinorVer.DayMonth.Year" -// MajorVer changes only with significant changes -// MinorVer changes when additional features are added, but not for bug fixes (range 00-99) -// DayDate & Year changes for all changes, including for bug fixes. It represent the release date of the update -// +// Default version number, if not overriden by the Makefile #ifndef MODES_DUMP1090_VERSION -# define MODES_DUMP1090_VERSION "1.10.3010.14+mu" +# define MODES_DUMP1090_VERSION "v1.13-custom" #endif #ifndef MODES_DUMP1090_VARIANT