[hamradio-commits] [dump1090] 352/373: checkpoint before merging upstream

Thu Oct 23 14:58:36 UTC 2014

This is an automated email from the git hooks/post-receive script.

mernisse-guest pushed a commit to branch backport
in repository dump1090.

commit f4fc4c243186be243b09f39d4ba24157589bc67d
Author: Matthew Ernisse <mernisse at ub3rgeek.net>
Date:   Fri Oct 17 13:43:15 2014 -0400

    checkpoint before merging upstream
---
 Makefile                        | 30 +++++++++++++++++++++---------
 debian/binary.lintian-overrides |  2 --
 debian/dump1090.1               |  4 ++--
 debian/patches/series           |  1 +
 public_html/gmap.html           |  6 +++---
 5 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index 6bfe9ee..72e861d 100644
--- a/Makefile
+++ b/Makefile
@@ -4,18 +4,21 @@
 #
 PROGNAME=dump1090
 
-ifdef PREFIX
-BINDIR=$(PREFIX)/bin
-SHAREDIR=$(PREFIX)/share/$(PROGNAME)
-EXTRACFLAGS=-DHTMLPATH=\"$(SHAREDIR)\"
-endif
-
-CFLAGS=-O2 -g -Wall -W `pkg-config --cflags librtlsdr`
-LIBS=`pkg-config --libs librtlsdr` -lpthread -lm
+BINDIR=$(DESTDIR)/usr/bin
+SBINDIR=$(DESTDIR)/usr/sbin
+SHAREDIR=$(DESTDIR)/usr/share/$(PROGNAME)
+EXTRACFLAGS=-DHTMLPATH=\"$(SHAREDIR)/public_html\"
+
+CFLAGS=-O2 -g -Wall -W $(shell pkg-config --cflags librtlsdr)
+CFLAGS += $(shell dpkg-buildflags --get CFLAGS)
+CFLAGS += $(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS += $(shell dpkg-buildflags --get CXXFLAGS)
+LIBS=$(shell pkg-config --libs librtlsdr) -lpthread -lm
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
 CC=gcc
 
-
 all: dump1090 view1090
+install: installbin installhtml
 
 %.o: %.c
 	$(CC) $(CFLAGS) $(EXTRACFLAGS) -c $<
@@ -28,3 +31,12 @@ view1090: view1090.o anet.o interactive.o mode_ac.o mode_s.o net_io.o
 
 clean:
 	rm -f *.o dump1090 view1090
+
+installbin:
+	install -m755 dump1090 $(SBINDIR)
+	install -m755 view1090 $(BINDIR)
+
+installhtml:
+	install -d -m 755 $(SHAREDIR)/public_html
+	cp -R public_html/* $(SHAREDIR)/public_html
+
diff --git a/debian/binary.lintian-overrides b/debian/binary.lintian-overrides
deleted file mode 100644
index 8efebe2..0000000
--- a/debian/binary.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# The web UI uses Google Maps, which cannot be served locally.
-dump1090 binary: privacy-breach-generic usr/share/dump1090/public_html/gmap.html
diff --git a/debian/dump1090.1 b/debian/dump1090.1
index f7c9744..ef55512 100644
--- a/debian/dump1090.1
+++ b/debian/dump1090.1
@@ -42,7 +42,7 @@
 .SH DESCRIPTION
 \fBdump1090\fP receives and decodes Mode S packets using the Realtek RTL2832
 software defined radio interface.  It provides the ability to decode
-multiple frame types as well as correct bit errors using the embeded
+multiple frame types as well as correct bit errors using the embedded
 24-bit CRC.  Results can be viewed using a text client, via the built-
 in HTTP server or forwarded off to other locations for collection.
 .PP
@@ -210,7 +210,7 @@ The Debug mode is a visual help to improve the detection algorithm or to
 understand why the program is not working for a given input.
 .PP
 In this mode messages are displayed in an ASCII-art style graphical
-representation, where the individial magnitude bars sampled at 2Mhz are
+representation, where the individual magnitude bars sampled at 2MHz are
 displayed.
 .PP
 An index shows the sample number, where 0 is the sample where the first Mode S
diff --git a/debian/patches/series b/debian/patches/series
index 60f8f85..56fd378 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 00-makefile.patch
+01-jquery.patch
diff --git a/public_html/gmap.html b/public_html/gmap.html
index 80afe02..800e7c8 100644
--- a/public_html/gmap.html
+++ b/public_html/gmap.html
@@ -1,9 +1,9 @@
 <html>
 	<head>
 		<link rel="stylesheet" type="text/css" href="style.css" />
-		<link rel="stylesheet" href="http://code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css" />
-		<script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
-		<script src="http://code.jquery.com/ui/1.10.3/jquery-ui.js"></script>
+		<link rel="stylesheet" href="jquery-ui.css" />
+		<script src="jquery.min.js"></script>
+		<script src="jquery-ui.js"></script>
 		<script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?sensor=false&libraries=geometry"></script>
 		<script type="text/javascript" src="config.js"></script>
 		<script type="text/javascript" src="planeObject.js"></script>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/dump1090.git

