AFG/dump1090
3
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Move to a simpler versioning scheme (the one derived from upstream

Browse source 
is going to break the ordering that Debian expects very soon).

When building from source not via debian/rules, derive a version from
git describe.
This commit is contained in:
Oliver Jowett 2015-01-22 13:19:15 +00:00
parent ada188a1c8
commit af3eb3df2b
4 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -4,18 +4,22 @@
# #
PROGNAME=dump1090 PROGNAME=dump1090
ifndef DUMP1090_VERSION
DUMP1090_VERSION=$(shell git describe --tags)
endif
ifdef PREFIX ifdef PREFIX
BINDIR=$(PREFIX)/bin BINDIR=$(PREFIX)/bin
SHAREDIR=$(PREFIX)/share/$(PROGNAME) SHAREDIR=$(PREFIX)/share/$(PROGNAME)
EXTRACFLAGS=-DHTMLPATH=\"$(SHAREDIR)\" EXTRACFLAGS=-DHTMLPATH=\"$(SHAREDIR)\"
endif endif
CPPFLAGS+=-DMODES_DUMP1090_VERSION=\"$(DUMP1090_VERSION)\"
CFLAGS+=-O2 -g -Wall -Werror -W `pkg-config --cflags librtlsdr` CFLAGS+=-O2 -g -Wall -Werror -W `pkg-config --cflags librtlsdr`
LIBS=-lpthread -lm -lrt LIBS=-lpthread -lm -lrt
LIBS_RTL=`pkg-config --libs librtlsdr` LIBS_RTL=`pkg-config --libs librtlsdr`
CC=gcc CC=gcc
all: dump1090 view1090 all: dump1090 view1090
%.o: %.c dump1090.h %.o: %.c dump1090.h

2
debian/changelog vendored
View file

@ -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" * Fix stable sort of rows with no sortable values (would cause "jumping"
rows at the end of the table) rows at the end of the table)

4
debian/rules vendored
View file

@ -14,11 +14,11 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
DPKG_EXPORT_BUILDFLAGS = 1 DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk 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') SRCNAME=$(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
override_dh_auto_build: 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: override_dh_install:
dh_install dh_install

10
dump1090.h
View file

@ -50,15 +50,9 @@
#ifndef __DUMP1090_H #ifndef __DUMP1090_H
#define __DUMP1090_H #define __DUMP1090_H
// File Version number // Default version number, if not overriden by the Makefile
// ====================
// 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
//
#ifndef MODES_DUMP1090_VERSION #ifndef MODES_DUMP1090_VERSION
# define MODES_DUMP1090_VERSION "1.10.3010.14+mu" # define MODES_DUMP1090_VERSION "v1.13-custom"
#endif #endif
#ifndef MODES_DUMP1090_VARIANT #ifndef MODES_DUMP1090_VARIANT