[hamradio-commits] [dump1090] 361/373: continue pacakge cleanups, remove some of the Makefile patching

[Matthew Ernisse]

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

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

commit e03d1b352d44d60d6bd68d6cb94f8b4abce1b44f
Author: Matthew Ernisse <mernisse at ub3rgeek.net>
Date:   Sat Oct 18 18:09:54 2014 -0400

    continue pacakge cleanups, remove some of the Makefile patching
---
 debian/changelog                 |  6 +++++-
 debian/dump1090.install          |  3 +++
 debian/patches/00-makefile.patch | 24 ++++--------------------
 3 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bbb3014..29864dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 dump1090 (1.09.1007.14+dfsg-1) unstable; urgency=low
+
   * Merge changes from upstream.
-  * Remove external dependancies on jQuery.
+  * Depend on jQuery and jQuery UI to remove links from gmap.html to the
+    Google CDN.  Remove associated lintian overrides.
   * Repack upstream to remove closed-source blob.
   * Update packaging to reflect Debian Hamradio Maintainers standards.
+  * Patch less of the stock Makefile by using dh_install helper.
+  * Remove broken watch file.
 
  -- Matthew Ernisse <mernisse at ub3rgeek.net>  Fri, 17 Oct 2014 17:52:56 +0000
 
diff --git a/debian/dump1090.install b/debian/dump1090.install
new file mode 100644
index 0000000..a41cd11
--- /dev/null
+++ b/debian/dump1090.install
@@ -0,0 +1,3 @@
+dump1090 /usr/sbin
+view1090 /usr/bin
+public_html/* /usr/share/dump1090/public_html
diff --git a/debian/patches/00-makefile.patch b/debian/patches/00-makefile.patch
index 2df68a3..2d2d470 100644
--- a/debian/patches/00-makefile.patch
+++ b/debian/patches/00-makefile.patch
@@ -4,7 +4,7 @@ Forwarded: not-needed
 
 --- a/Makefile
 +++ b/Makefile
-@@ -4,18 +4,21 @@
+@@ -4,17 +4,19 @@
  #
  PROGNAME=dump1090
  
@@ -13,14 +13,13 @@ Forwarded: not-needed
 -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 `pkg-config --cflags librtlsdr`
+-LIBS=`pkg-config --libs librtlsdr` -lpthread -lm
 +CFLAGS=-O2 -g -Wall -W $(shell pkg-config --cflags librtlsdr)
 +CFLAGS += $(shell dpkg-buildflags --get CFLAGS)
 +CFLAGS += $(shell dpkg-buildflags --get CPPFLAGS)
@@ -31,20 +30,5 @@ Forwarded: not-needed
  
 -
  all: dump1090 view1090
-+install: installbin installhtml
  
  %.o: %.c
- 	$(CC) $(CFLAGS) $(EXTRACFLAGS) -c $<
-@@ -28,3 +31,12 @@
- 
- 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
-+

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