From ce9c03a7418478d1bc636348cb7ae213838c7931 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Tue, 12 Jan 2016 23:07:15 +0100
Subject: include manpage shipped from upstream

---
 Makefile                          | 17 ++++++++++++-----
 debian/acmetool.docs              |  1 +
 debian/acmetool.lintian-overrides |  1 -
 debian/acmetool.manpages          |  1 +
 debian/changelog                  |  6 ++++++
 debian/rules                      |  4 ++--
 6 files changed, 22 insertions(+), 8 deletions(-)
 create mode 100644 debian/acmetool.docs
 create mode 100644 debian/acmetool.manpages

diff --git a/Makefile b/Makefile
index b4febb8..d354129 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,22 @@
 VERSION := 0.0.34
 DEBARCHS := amd64 i386 armhf arm64
-EXECUTEABLES := $(DEBARCHS:%=acmetool.%)
+EXECUTEABLES := $(DEBARCHS:%=bin/acmetool.%)
+GITHUB_BASEURL := "https://github.com/hlandau/acme/releases/download"
 
 all: $(EXECUTEABLES)
 
-acmetool.%: acmetool-v$(VERSION)-linux_%.tar.gz
-	tar -xzf $< -O > $@
+bin/acmetool.%: acmetool-v$(VERSION)-linux_%.tar.gz
+	@echo "extracting files... from $<"
+	@tar -xzf $< --strip-components=1
+	@mv bin/acmetool $@
 
+acmetool-v$(VERSION)-linux_%.tar.gz: URL = "$(GITHUB_BASEURL)/v$(VERSION)/$(shell echo $@ | sed s/i386/386/ | sed s/armhf/arm/)"
 acmetool-v$(VERSION)-linux_%.tar.gz:
-	wget -nc "https://github.com/hlandau/acme/releases/download/v$(VERSION)/$(shell echo $@ | sed s/i386/386/ | sed s/armhf/arm/)" -O $@
+	@echo "fetching file: $(URL)"
+	@wget -nc "$(URL)" -O $@ > /dev/null 2>&1
 
 clean:
-	rm -f acmetool.*
+	rm -rf bin/
+	rm -rf doc/
+	rm -f README.md
 	rm -f acmetool-*.tar.gz
diff --git a/debian/acmetool.docs b/debian/acmetool.docs
new file mode 100644
index 0000000..42061c0
--- /dev/null
+++ b/debian/acmetool.docs
@@ -0,0 +1 @@
+README.md
\ No newline at end of file
diff --git a/debian/acmetool.lintian-overrides b/debian/acmetool.lintian-overrides
index 11d6828..17f7559 100644
--- a/debian/acmetool.lintian-overrides
+++ b/debian/acmetool.lintian-overrides
@@ -1,3 +1,2 @@
 acmetool: embedded-library usr/bin/acmetool: libyaml
 acmetool: statically-linked-binary usr/bin/acmetool
-acmetool: binary-without-manpage usr/bin/acmetool
diff --git a/debian/acmetool.manpages b/debian/acmetool.manpages
new file mode 100644
index 0000000..b42c379
--- /dev/null
+++ b/debian/acmetool.manpages
@@ -0,0 +1 @@
+doc/acmetool.8
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index 2754371..ad4a238 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+acmetool (0.0.34-2) unstable; urgency=medium
+
+  * upstream now ships a manpage
+
+ -- Christian Pointner <equinox@spreadspace.org>  Tue, 12 Jan 2016 23:03:53 +0100
+
 acmetool (0.0.34-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/rules b/debian/rules
index 7b881e1..c80d624 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,10 +5,10 @@
 override_dh_auto_configure:
 
 override_dh_auto_build:
-	make acmetool.$(DEB_BUILD_ARCH)
+	make bin/acmetool.$(DEB_BUILD_ARCH)
 
 override_dh_auto_install:
 	install -d $$(pwd)/debian/tmp/usr/bin/
-	install -m 755 $$(pwd)/acmetool.$(DEB_BUILD_ARCH) $$(pwd)/debian/tmp/usr/bin/acmetool
+	install -m 755 $$(pwd)/bin/acmetool.$(DEB_BUILD_ARCH) $$(pwd)/debian/tmp/usr/bin/acmetool
 	install -d $$(pwd)/debian/tmp/etc/default/
 	install -m 644 $$(pwd)/acme-reload.default $$(pwd)/debian/tmp/etc/default/acme-reload
-- 
cgit v1.2.3