diff -Nru wavemon-0.7.6/debian/changelog wavemon-0.7.6/debian/changelog --- wavemon-0.7.6/debian/changelog 2014-03-19 19:03:39.000000000 +0000 +++ wavemon-0.7.6/debian/changelog 2014-03-23 01:17:05.000000000 +0000 @@ -1,8 +1,12 @@ -wavemon (0.7.6-1ubuntu1) trusty; urgency=low +wavemon (0.7.6-2) unstable; urgency=medium - * Use autotools-dev helper for arm64, resolving FTBFS. + * d/patches: Drop 01-remove-extra-copyright-file.patch; replace with + 01-patch-makefile.in-to-not-install-docs.patch + - Add d/wavemon.docs to manually install docs (Closes: #736932) + * d/{control,rules}: Switch from dh-autoreconf to autotools-dev + - Fixes FTBFS on Ubuntu arm64 - -- Daniel T Chen Wed, 19 Mar 2014 15:03:06 -0400 + -- Jonathan McCrohan Sun, 23 Mar 2014 01:17:05 +0000 wavemon (0.7.6-1) unstable; urgency=low diff -Nru wavemon-0.7.6/debian/control wavemon-0.7.6/debian/control --- wavemon-0.7.6/debian/control 2014-03-19 19:03:04.000000000 +0000 +++ wavemon-0.7.6/debian/control 2014-03-22 17:16:13.000000000 +0000 @@ -1,10 +1,9 @@ Source: wavemon Section: net Priority: extra -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Jonathan McCrohan -Build-Depends: dh-autoreconf, libncurses5-dev, - debhelper (>= 9), linux-libc-dev, autotools-dev +Maintainer: Jonathan McCrohan +Build-Depends: autotools-dev, libncurses5-dev, + debhelper (>= 9), linux-libc-dev Standards-Version: 3.9.5 Homepage: http://www.erg.abdn.ac.uk/ergcms/wavemon/ diff -Nru wavemon-0.7.6/debian/patches/01-patch-makefile.in-to-not-install-docs.patch wavemon-0.7.6/debian/patches/01-patch-makefile.in-to-not-install-docs.patch --- wavemon-0.7.6/debian/patches/01-patch-makefile.in-to-not-install-docs.patch 1970-01-01 00:00:00.000000000 +0000 +++ wavemon-0.7.6/debian/patches/01-patch-makefile.in-to-not-install-docs.patch 2014-03-23 01:04:49.000000000 +0000 @@ -0,0 +1,31 @@ +From: Jonathan McCrohan +Date: Sun, 23 Mar 2014 01:02:44 +0000 +Subject: Patch Makefile.in to not install docs; install using dh instead + +diff --git a/Makefile.in b/Makefile.in +index 0b27ad7..3cc8acc 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -22,7 +22,6 @@ MAIN = @PACKAGE_NAME@.c + HEADERS = @PACKAGE_NAME@.h llist.h iw_if.h + PURESRC = $(filter-out $(MAIN),$(wildcard *.c)) + OBJS = $(PURESRC:.c=.o) +-DOCS = README NEWS THANKS AUTHORS COPYING ChangeLog + + %.o: %.c $(HEADERS) + $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(DEFS) -c -o $@ $< +@@ -49,13 +48,11 @@ install-suid-root install-binaries: all + $(INSTALL) -m 0755 -d $(DESTDIR)$(bindir) + $(INSTALL) -m $(exec_perms) @PACKAGE_NAME@ $(DESTDIR)$(bindir) + +-install-docs: @PACKAGE_NAME@.1 @PACKAGE_NAME@rc.5 $(DOCS) ++install-docs: @PACKAGE_NAME@.1 @PACKAGE_NAME@rc.5 + $(INSTALL) -m 0755 -d $(DESTDIR)$(mandir)/man1 + $(INSTALL) -m 0644 @PACKAGE_NAME@.1 $(DESTDIR)$(mandir)/man1 + $(INSTALL) -m 0755 -d $(DESTDIR)$(mandir)/man5 + $(INSTALL) -m 0644 @PACKAGE_NAME@rc.5 $(DESTDIR)$(mandir)/man5 +- $(INSTALL) -m 0755 -d $(DESTDIR)$(datadir) +- $(INSTALL) -m 0644 $(DOCS) $(DESTDIR)$(datadir) + + uninstall: + @$(RM) $(bindir)/@PACKAGE_NAME@ diff -Nru wavemon-0.7.6/debian/patches/01-remove-extra-copyright-file.patch wavemon-0.7.6/debian/patches/01-remove-extra-copyright-file.patch --- wavemon-0.7.6/debian/patches/01-remove-extra-copyright-file.patch 2014-01-25 00:43:05.000000000 +0000 +++ wavemon-0.7.6/debian/patches/01-remove-extra-copyright-file.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -From: Jonathan McCrohan -Date: Sun, 10 Jun 2012 00:31:09 +0100 -Subject: Remove extra copyright file from Makefile -Last-Update: 2014-01-25 - -diff --git a/Makefile.in b/Makefile.in -index 0b27ad7..e48e174 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -22,7 +22,7 @@ MAIN = @PACKAGE_NAME@.c - HEADERS = @PACKAGE_NAME@.h llist.h iw_if.h - PURESRC = $(filter-out $(MAIN),$(wildcard *.c)) - OBJS = $(PURESRC:.c=.o) --DOCS = README NEWS THANKS AUTHORS COPYING ChangeLog -+DOCS = README NEWS THANKS AUTHORS ChangeLog - - %.o: %.c $(HEADERS) - $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(DEFS) -c -o $@ $< diff -Nru wavemon-0.7.6/debian/patches/series wavemon-0.7.6/debian/patches/series --- wavemon-0.7.6/debian/patches/series 2014-01-26 14:09:50.000000000 +0000 +++ wavemon-0.7.6/debian/patches/series 2014-03-23 01:06:36.000000000 +0000 @@ -1 +1 @@ -01-remove-extra-copyright-file.patch +01-patch-makefile.in-to-not-install-docs.patch diff -Nru wavemon-0.7.6/debian/rules wavemon-0.7.6/debian/rules --- wavemon-0.7.6/debian/rules 2014-03-19 19:02:51.000000000 +0000 +++ wavemon-0.7.6/debian/rules 2014-03-23 01:01:53.000000000 +0000 @@ -3,4 +3,4 @@ export DEB_CFLAGS_MAINT_APPEND=-pthread %: - dh $@ --with autotools_dev,autoreconf + dh $@ --with autotools_dev diff -Nru wavemon-0.7.6/debian/wavemon.docs wavemon-0.7.6/debian/wavemon.docs --- wavemon-0.7.6/debian/wavemon.docs 1970-01-01 00:00:00.000000000 +0000 +++ wavemon-0.7.6/debian/wavemon.docs 2014-03-23 00:54:28.000000000 +0000 @@ -0,0 +1,4 @@ +AUTHORS +NEWS +README +THANKS