From 7867cb5aba31df0960b4c99185c097b93011269e Mon Sep 17 00:00:00 2001 From: Oliver Jowett Date: Sun, 7 Dec 2014 13:12:20 +0000 Subject: [PATCH] Update packaging to produce dump1090-flightaware & faup1090 packages. --- debian/changelog | 21 +++---------------- debian/control | 18 +++++++++++----- debian/copyright | 6 +++--- ...r.default => dump1090-flightaware.default} | 10 ++++----- ...1090-mr.init => dump1090-flightaware.init} | 10 ++++----- debian/dump1090-flightaware.install | 3 +++ ...grotate => dump1090-flightaware.logrotate} | 2 +- debian/dump1090-flightaware.manpages | 1 + ...postinst => dump1090-flightaware.postinst} | 2 +- debian/dump1090-mr.install | 1 - debian/faup1090.install | 1 + debian/rules | 13 ++++++++---- 12 files changed, 45 insertions(+), 43 deletions(-) rename debian/{dump1090-mr.default => dump1090-flightaware.default} (92%) rename debian/{dump1090-mr.init => dump1090-flightaware.init} (95%) create mode 100644 debian/dump1090-flightaware.install rename debian/{dump1090-mr.logrotate => dump1090-flightaware.logrotate} (50%) create mode 100644 debian/dump1090-flightaware.manpages rename debian/{dump1090-mr.postinst => dump1090-flightaware.postinst} (90%) delete mode 100644 debian/dump1090-mr.install create mode 100644 debian/faup1090.install diff --git a/debian/changelog b/debian/changelog index 3220d2b..bc402af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,20 +1,5 @@ -dump1090-mr (1.08.2302.14+1-3) UNRELEASED; urgency=medium +dump1090-flightaware (0.18+mu1-1) UNRELEASED; urgency=medium - * Remove spurious dependencies on net-tools + * Initial release. - -- Oliver Jowett Sun, 07 Dec 2014 12:21:18 +0000 - -dump1090-mr (1.08.2302.14+1-2) unstable; urgency=medium - - * Pass --name / --user to start-stop-daemon when starting - * Log to /var/log/dump1090-mr.log (configurable via LOGFILE) - * Log stats once an hour by default (configurable via STATS_INTERVAL) - * Include a logrotate configuration - - -- Oliver Jowett Sat, 06 Dec 2014 18:37:12 +0000 - -dump1090-mr (1.08.2302.14+1-1) unstable; urgency=medium - - * Initial package release. - - -- Oliver Jowett Fri, 05 Dec 2014 22:55:41 +0000 + -- Oliver Jowett Sun, 07 Dec 2014 12:38:49 +0000 diff --git a/debian/control b/debian/control index 4e8cacc..a8c6705 100644 --- a/debian/control +++ b/debian/control @@ -1,13 +1,13 @@ -Source: dump1090-mr +Source: dump1090-flightaware Section: embedded Priority: extra Maintainer: Oliver Jowett Build-Depends: debhelper(>=8), librtlsdr-dev Standards-Version: 3.9.3 -Homepage: https://github.com/MalcolmRobb/dump1090 -Vcs-Git: https://github.com/mutability/dump1090.git -b mr-pi-package +Homepage: https://github.com/flightaware/dump1090_mr +Vcs-Git: https://github.com/mutability/dump1090.git -b fa-pi-package -Package: dump1090-mr +Package: dump1090-flightaware Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, adduser Description: ADS-B Ground Station System for RTL-SDR @@ -17,4 +17,12 @@ Description: ADS-B Ground Station System for RTL-SDR Includes a mini-webserver that you can access to see aircraft in the vicinity of your receiver. . - This is a packaging of MalcomRobb's fork of the original dump1090 version. + This is a packaging of the FlightAware fork of dump1090, adding support for + the "fatsv" protocol used by FlightAware. + +Package: faup1090 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, adduser +Description: ADS-B protocol adaptor for FlightAware + This is a packaging of a FlightAware utility based on dump1090 that generates + FlightAware's "fatsv" protocol from AVR or Beast format ADS-B data. diff --git a/debian/copyright b/debian/copyright index ce72a3f..c2a26be 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,10 +1,10 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: dump1090 -Upstream-Contact: https://github.com/MalcolmRobb -Source: https://github.com/MalcolmRobb/dump1090 +Upstream-Contact: FlightAware Developers +Source: https://github.com/flightaware/dump1090_mr Files: * -Copyright: Salvatore Sanfilippo, Malcom Robb and other contributors. +Copyright: Salvatore Sanfilippo, Malcom Robb, FlightAware LLC and other contributors. License: BSD-3-Clause Files: debian/* diff --git a/debian/dump1090-mr.default b/debian/dump1090-flightaware.default similarity index 92% rename from debian/dump1090-mr.default rename to debian/dump1090-flightaware.default index c5a4cce..2797ce6 100644 --- a/debian/dump1090-mr.default +++ b/debian/dump1090-flightaware.default @@ -1,4 +1,4 @@ -# Defaults for dump1090-mr +# Defaults for dump1090-flightaware # This is a POSIX shell fragment # Set to "yes" to start dump1090 on boot. @@ -8,7 +8,7 @@ START_DUMP1090="no" DUMP1090_USER="dump1090" # Logfile to log to -#LOGFILE="/var/log/dump1090-mr.log" +#LOGFILE="/var/log/dump1090-flightaware.log" # # The following options are all optional - defaults if not provided are @@ -58,6 +58,9 @@ DUMP1090_USER="dump1090" # Port to listen on for HTTP connections. 0 disables. #HTTP_PORT=8080 +# Port to listen on for FlightAware "fatsv" output connections. 0 disables. +#FATSV_OUTPUT_PORT=10001 + # Port to listen on for raw (AVR-format) input connections. 0 disables. #RAW_INPUT_PORT=30001 @@ -85,9 +88,6 @@ DUMP1090_USER="dump1090" # TCP buffer size order. Power-of-two based - buffer size is 2^(n+16). #NET_BUFFER=0 -# Bind ports on a particular address. If unset, binds to all interfaces. -#BIND_ADDRESS= - # # Misc options # diff --git a/debian/dump1090-mr.init b/debian/dump1090-flightaware.init similarity index 95% rename from debian/dump1090-mr.init rename to debian/dump1090-flightaware.init index 77e70fc..7668774 100644 --- a/debian/dump1090-mr.init +++ b/debian/dump1090-flightaware.init @@ -1,6 +1,6 @@ #!/bin/sh ### BEGIN INIT INFO -# Provides: dump1090-mr +# Provides: dump1090-flightaware # Required-Start: $remote_fs # Required-Stop: $remote_fs # Default-Start: 2 3 4 5 @@ -15,8 +15,8 @@ # PATH should only include /usr/* if it runs after the mountnfs.sh script PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="dump1090-mr daemon" -NAME=dump1090-mr +DESC="dump1090-flightaware daemon" +NAME=dump1090-flightaware DAEMON=/usr/bin/$NAME ARGS="--quiet" PIDFILE=/var/run/$NAME.pid @@ -38,6 +38,7 @@ AGGRESSIVE=no LAT= LON= HTTP_PORT=8080 +FATSV_OUTPUT_PORT=10001 RAW_INPUT_PORT=30001 RAW_OUTPUT_PORT=30002 SBS_OUTPUT_PORT=30003 @@ -47,7 +48,6 @@ NET_HEARTBEAT=60 NET_OUTPUT_SIZE=5 NET_OUTPUT_RATE=5 NET_BUFFER=0 -BIND_ADDRESS= STATS_INTERVAL=3600 EXTRA_ARGS= @@ -78,6 +78,7 @@ if [ -n "$LON" ]; then ARGS="$ARGS --lon $LON"; fi # net: if [ "x$HTTP_PORT" != "x8080" ]; then ARGS="$ARGS --net-http-port $HTTP_PORT"; fi +if [ "x$FATSV_OUTPUT_PORT" != "x10001" ]; then ARGS="$ARGS --net-fatsv-port $FATSV_OUTPUT_PORT"; fi if [ "x$RAW_INPUT_PORT" != "x30001" ]; then ARGS="$ARGS --net-ri-port $RAW_INPUT_PORT"; fi if [ "x$RAW_OUTPUT_PORT" != "x30002" ]; then ARGS="$ARGS --net-ro-port $RAW_OUTPUT_PORT"; fi if [ "x$SBS_OUTPUT_PORT" != "x30003" ]; then ARGS="$ARGS --net-sbs-port $SBS_OUTPUT_PORT"; fi @@ -87,7 +88,6 @@ if [ "x$NET_HEARTBEAT" != "x60" ]; then ARGS="$ARGS --net-heartbeat $NET_HEARTBE if [ "x$NET_OUTPUT_SIZE" != "x0" ]; then ARGS="$ARGS --net-ro-size $NET_OUTPUT_SIZE"; fi if [ "x$NET_OUTPUT_RATE" != "x0" ]; then ARGS="$ARGS --net-ro-rate $NET_OUTPUT_RATE"; fi if [ "x$NET_BUFFER" != "x0" ]; then ARGS="$ARGS --net-buffer $NET_BUFFER"; fi -if [ -n "$BIND_ADDRESS" ]; then ARGS="$ARGS --net-bind-address $BIND_ADDRESS"; fi # misc: if [ "x$STATS_INTERVAL" != "x0" ]; then ARGS="$ARGS --stats-every $STATS_INTERVAL"; fi diff --git a/debian/dump1090-flightaware.install b/debian/dump1090-flightaware.install new file mode 100644 index 0000000..1880175 --- /dev/null +++ b/debian/dump1090-flightaware.install @@ -0,0 +1,3 @@ +dump1090-flightaware usr/bin +view1090-flightaware usr/bin +public_html/* usr/share/dump1090-flightaware diff --git a/debian/dump1090-mr.logrotate b/debian/dump1090-flightaware.logrotate similarity index 50% rename from debian/dump1090-mr.logrotate rename to debian/dump1090-flightaware.logrotate index f421184..bab2f00 100644 --- a/debian/dump1090-mr.logrotate +++ b/debian/dump1090-flightaware.logrotate @@ -1,4 +1,4 @@ -/var/log/dump1090-mr.log { +/var/log/dump1090-flightaware.log { weekly rotate 4 copytruncate diff --git a/debian/dump1090-flightaware.manpages b/debian/dump1090-flightaware.manpages new file mode 100644 index 0000000..bcaf781 --- /dev/null +++ b/debian/dump1090-flightaware.manpages @@ -0,0 +1 @@ +debian/tmp/dump1090-flightaware.1 diff --git a/debian/dump1090-mr.postinst b/debian/dump1090-flightaware.postinst similarity index 90% rename from debian/dump1090-mr.postinst rename to debian/dump1090-flightaware.postinst index e727c02..27a2ca7 100644 --- a/debian/dump1090-mr.postinst +++ b/debian/dump1090-flightaware.postinst @@ -20,7 +20,7 @@ set -e case "$1" in configure) - adduser --system --home /usr/share/dump1090-mr --no-create-home --quiet dump1090 + adduser --system --home /usr/share/dump1090-flightaware --no-create-home --quiet dump1090 ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/dump1090-mr.install b/debian/dump1090-mr.install deleted file mode 100644 index 8feea8a..0000000 --- a/debian/dump1090-mr.install +++ /dev/null @@ -1 +0,0 @@ -public_html/* usr/share/dump1090-mr diff --git a/debian/faup1090.install b/debian/faup1090.install new file mode 100644 index 0000000..ee7727b --- /dev/null +++ b/debian/faup1090.install @@ -0,0 +1 @@ +faup1090 usr/bin diff --git a/debian/rules b/debian/rules index 38f129b..84ec655 100755 --- a/debian/rules +++ b/debian/rules @@ -15,13 +15,18 @@ DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk override_dh_auto_build: - dh_auto_build -- 'EXTRACFLAGS=-DHTMLPATH=\"/usr/share/dump1090-mr\"' + dh_auto_build -- 'EXTRACFLAGS=-DHTMLPATH=\"/usr/share/dump1090-flightaware\"' + dh_auto_build -- -f makefaup1090 'EXTRACFLAGS=-DHTMLPATH=\"/usr/share/dump1090-flightaware\"' faup1090 + +override_dh_auto_install: + # we don't want to use the Makefile auto-install here, we handle it in dh_install override_dh_install: + mkdir -p debian/tmp + cp -a doc/dump1090.1 debian/tmp/dump1090-flightaware.1 + cp -a dump1090 debian/tmp/dump1090-flightaware + cp -a view1090 debian/tmp/view1090-flightaware dh_install - install -d debian/dump1090-mr/usr/bin - cp -a dump1090 debian/dump1090-mr/usr/bin/dump1090-mr - cp -a view1090 debian/dump1090-mr/usr/bin/view1090-mr %: dh $@