From 7b4838575da113a564a1cd8fe386121de7400563 Mon Sep 17 00:00:00 2001 From: Ralph Ronnquist Date: Mon, 1 Aug 2022 19:45:56 +1000 Subject: [PATCH] Edits and additions to satisfy lintian. --- Makefile | 17 ++++++++++++----- debian/control | 2 +- hourglass-site.8.adoc | 22 ++++++++++++++++++++++ hourglass-web.8.adoc | 21 +++++++++++++++++++++ 4 files changed, 56 insertions(+), 6 deletions(-) create mode 100644 hourglass-site.8.adoc create mode 100644 hourglass-web.8.adoc diff --git a/Makefile b/Makefile index e320708..b5bcebd 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ MAIN = command.lsp LSP = $(filter-out $(MAIN),$(wildcard *.lsp)) BIN = hourglass hourglass-web hourglass-site DOCS = hourglass-guide.html hourglass-guide.pdf -MANPGS = hourglass.8 +MANPGS = hourglass.8 hourglass-site.8 hourglass-web.8 IMGS = $(wildcard *.png) OTHER = setup.sh hourglass.conf VERSION = 0.1 @@ -22,7 +22,7 @@ hourglass-site: sitetool mv sitetool/sitetool $@ %.html: %.adoc - asciidoctor $< > $@ + asciidoctor -a 'webfonts!' $< > $@ %.pdf: %.adoc | $(IMGS) asciidoctor-pdf $< > $@ @@ -43,8 +43,8 @@ hourglass-$(VERSION).tgz: $(BIN) $(OTHER) $(DOCS) $(MANPGS) $(IMGS) dist: hourglass-$(VERSION).tgz ######################################################## -BINDIR = $(DESTDIR)/usr/local/bin -MANDIR = $(DESTDIR)/usr/local/man/man8 +BINDIR = $(DESTDIR)/usr/bin +MANDIR = $(DESTDIR)/usr/share/man/man8 RUNDIR = $(DESTDIR)/var/lib/hourglass DOCDIR = $(DESTDIR)/usr/share/hourglass @@ -53,8 +53,15 @@ INSTALLTARGETS += $(addprefix $(MANDIR)/,$(MANPGS)) INSTALLTARGETS += $(addprefix $(DOCDIR)/,$(DOCS)) INSTALLTARGETS += $(addprefix $(RUNDIR)/,$(OTHER)) +$(RUNDIR)/%.conf: %.conf + install -D -T $< $@ + chmod a-x $@ + +$(MANDIR)/% $(DOCDIR)/%:% + install -D -T $< $@ + chmod a-x $@ -$(BINDIR)/% $(MANDIR)/% $(RUNDIR)/% $(DOCDIR)/%: % +$(BINDIR)/% $(RUNDIR)/%: % install -D -T $< $@ install: $(INSTALLTARGETS) diff --git a/debian/control b/debian/control index 17e3790..765e471 100644 --- a/debian/control +++ b/debian/control @@ -1,5 +1,5 @@ Source: hourglass -Section: unknown +Section: misc Priority: optional Maintainer: Ralph Ronnquist Build-Depends: debhelper-compat (= 13) diff --git a/hourglass-site.8.adoc b/hourglass-site.8.adoc new file mode 100644 index 0000000..29984d6 --- /dev/null +++ b/hourglass-site.8.adoc @@ -0,0 +1,22 @@ += hourglass-site(8) +:doctype: manpage +:revdate: {sys:date "+%Y-%m-%d %H:%M:%S"} +:COLON: : +:EQUALS: = + +== NAME +hourglass-site - Gui tool for editing the Hourglass site configuration. + +== SYNOPSIS +hourglass-site + +== DESCRIPTION + +A simple Graphical editor for the site configuration variables. + +== FILES + +hourglass.conf[] is the sie configuration. + +== AUTHOR +Ralph Rönnquist diff --git a/hourglass-web.8.adoc b/hourglass-web.8.adoc new file mode 100644 index 0000000..318180e --- /dev/null +++ b/hourglass-web.8.adoc @@ -0,0 +1,21 @@ += hourglass-web(8) +:doctype: manpage +:revdate: {sys:date "+%Y-%m-%d %H:%M:%S"} +:COLON: : +:EQUALS: = + +== NAME +hourglass-web - An HTTP server for reviewing and changing the +Hourglass schedule remotely. + +== SYNOPSIS +hourglass-web + +== DESCRIPTION + +This is a simple HTTP server for reviewing and changing the +Hourglass schedule remotely. + + +== AUTHOR +Ralph Rönnquist -- 2.39.2