debuild cleanup

diff --git a/Makefile b/Makefile
index 6649bf93835ebe129e058a34d35e7c97edac8ff4..658b7c73653a7140c67c87e26ba5a66f48e69c1b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,37 +1,46 @@
 # Local building
-default: alsa-dispatcher.8 alsa-dispatcher
+default: alsa-dispatcher.8.gz alsa-dispatcher 
 
 ALSACONF = $(DESTDIR)/etc/alsa/conf.d/51-dispatcher.conf
 
-%.8: %.8.adoc
-       asciidoctor -b manpage $<
+%: %.lsp
+       newlisp -x $< $@
+       chmod a+x $@
+
+%.8.gz: %.8.adoc
+       asciidoctor -b manpage $< -o - | gzip > $@
 
 $(HOME)/.asoundrc: example.alsa.conf
        grep -q ^pcm.dispatch $@ || cat $< >> $@
 
 clean::
-       rm -f alsa-dispatcher alsa-dispatcher.8
+       rm -f alsa-dispatcher alsa-dispatcher.8.gz
 
 # Installation building
-BIN = $(DESTDIR)/usr/bin/alsa-dispatcher
-CFG = $(DESTDIR)/etc/alsa/conf.d/51-alsa-dispatcher.conf
-MAN = $(DESTDIR)/usr/share/man/man8/alsa-dispatcher.8.gz
+BINS = alsa-dispatcher alsa-dispatcher.lsp
+MANS = alsa-dispatcher.8.gz
+CFG = 51-alsa-dispatcher.conf
 
-$(BIN): alsa-dispatcher.lsp
-       mkdir -p $$(dirname $@)
-       newlisp -x $< $@
-       chmod a+x $@
+BINDIR = ${DESTDIR}/usr/bin
+MANDIR = ${DESTDIR}/usr/share/man/man8
+CFGDIR = ${DESTDIR}/etc/alsa/conf.d
+
+INSTALLFILES  = $(addprefix ${BINDIR}/,${BINS})
+INSTALLFILES += $(addprefix ${MANDIR}/,${MANS})
+INSTALLFILES += $(addprefix ${CFGDIR}/,${CFG})
 
-$(MAN): alsa-dispatcher.8.adoc
+${BINDIR}/% ${MANDIR}/%: %
        mkdir -p $$(dirname $@)
-       asciidoctor -b manpage $< -o - | gzip > $@
+       install $< $@
 
-$(CFG): example.alsa.conf
+${CFGDIR}/51-alsa-dispatcher.conf: example.alsa.conf
        mkdir -p $$(dirname $@)
-       cp $< $@
+       install -m 644 $< $@
+
+install: ${INSTALLFILES}
 
-install: $(BIN) $(CFG) $(MAN) 
+GENERATED = debian/alsa-dispatcher debian/.debhelper debian/files
+GENERATED += debian/alsa-dispatcher.substvars debian/debhelper-build-stamp
 
 clean::
-       rm -rf debian/alsa-dispatcher debian/alsa-dispatcher.substvars
-       rm -f debian/files debian/debhelper-build-stamp
+       rm -rf ${GENERATED}

diff --git a/debian/README.Debian b/debian/README.Debian
index 35405066f99c5353bc1b33a0cf94501c80b9d30c..abc001544351bad24690249a0f88cef0c16d63df 100644 (file)
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,6 +1,6 @@
 alsa-dispatcher for Debian
 -------------------------
 
-<possible notes regarding this package - if none, delete this file>
+Written in newlisp for easy modification.
 
- -- Ralph Ronnquist <ralph@localhost>  Sat, 29 Apr 2023 13:18:58 +1000
+ -- Ralph Ronnquist <ralph.ronnquist@gmail.com>  Sat, 29 Apr 2023 13:18:58 +1000

diff --git a/debian/README.source b/debian/README.source
index 3fe60a8df1d2d64af30eb050d1786e954bc7008f..d73ced15cae0120f64d51dd8cfc5a5936259a72e 100644 (file)
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,10 +1,7 @@
 alsa-dispatcher for Debian
 -------------------------
 
-<this file describes information about the source package, see Debian policy
-manual section 4.14. You WILL either need to modify or delete this file>
+Written in newlisp for easy modification.
 
-
-
- -- Ralph Ronnquist <ralph@localhost>  Sat, 29 Apr 2023 13:18:58 +1000
+ -- Ralph Ronnquist <ralph.ronnquist@gmail.com>  Sat, 29 Apr 2023 13:18:58 +1000
 

diff --git a/debian/alsa-dispatcher.links b/debian/alsa-dispatcher.links
new file mode 100644 (file)
index 0000000..38846c4
--- /dev/null
+++ b/debian/alsa-dispatcher.links
@@ -0,0 +1 @@
+ alsa-dispatcher.8.gz usr/share/man/man8/alsa-dispatcher.lsp.8.gz

diff --git a/debian/changelog b/debian/changelog
index f3d52bfba284c2faf9ef6e200bb89fd290a12c83..9d37b8898f781cad3a9ef0d3b6304b9fb7633fbb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-alsa-dispatcher (0.1) unstable; urgency=medium
+alsa-dispatcher (0.1) unreleased; urgency=medium
 
   * Initial Release.
 
- -- Ralph Ronnquist <ralph.ronnquit@gmail.com>  Sat, 29 Apr 2023 13:18:58 +1000
+ -- Ralph Ronnquist <ralph.ronnquist@gmail.com>  Sat, 29 Apr 2023 13:18:58 +1000

diff --git a/debian/control b/debian/control
index dadd3716bc0cb40033627953feaca2f907fc4af4..0fbb5581e1f3913859089075c174725f6ac25ca1 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Source: alsa-dispatcher
-Section: unknown
+Section: sound
 Priority: optional
 Maintainer: Ralph Ronnquist <ralph.ronnquist@gmail.com>
 Build-Depends: debhelper-compat (= 13)
@@ -11,7 +11,7 @@ Rules-Requires-Root: no
 
 Package: alsa-dispatcher
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, newlisp
 Description: ALSA priority dispatcher for occasional playback endpoints.
  This is an ALSA utility that handles dispatch of audio playback via a
  priority list of possible endpoints. The dispatch logic works through

diff --git a/debian/rules b/debian/rules
index 9e711eb57c70544e0b4ea0ef1182bd1764a1837a..4642dd677ecb6b4924f51e054602638327eeadb5 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -12,13 +12,12 @@
 # package maintainers to append LDFLAGS
 #export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
-
 %:
        dh $@
 
+#-# The following is some useful documentation that I want to keep
+#-# exampe for override targets generated by dh_make
+#-# override_dh_auto_configure:
+#-#    dh_auto_configure -- \
+#-#    -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
 
-# dh_make generated override targets
-# This is example for Cmake (See https://bugs.debian.org/641051 )
-#override_dh_auto_configure:
-#      dh_auto_configure -- \
-#      -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)