add initial debuild stuff

   move bash completion to recommended one from lint
   improve make deplist with SEPARATOR

4 files changed, 9 insertions, 9 deletions

diff --git a/src/Makefile b/src/Makefile
index fa385cb..1ef600d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -30,7 +30,7 @@ LIBEXECDIR = $(DESTDIR)$(prefix)/libexec
 DOCDIR     = $(SHAREDIR)/doc/$(APPNAME)
 APPDIR     = $(SHAREDIR)/$(APPNAME)
 APPSDIR    = $(SHAREDIR)/applications
-BASHCDIR   = $(SYSCONFDIR)/bash_completion.d
+BASHCDIR   = $(SHAREDIR)/bash-completion/completions
 SUDOERSDIR = $(SYSCONFDIR)/sudoers.d
 
 awkbin     :=$(shell which awk)
@@ -57,7 +57,7 @@ list:
 
 deplist:
 	@if test -z "$(DISTRO)" ; then ${echobin} "Please run \`make deplist\` with DISTRO= one of: `make deplist_opts 2>&1 1>/dev/null | ${xargsbin}`. Aborted." ; exit 1 ; fi
-	@${grepbin} -h --exclude='Makefile' --exclude-dir='doc' -A5 -riIE dependencies $(SRCDIR) | ${awkbin} -v 'distro=$(DISTRO)' 'tolower($$0) ~ distro {$$1="";$$2="";print}' | awk 'BEGIN{cmd="${xargsbin} -n1"} $$0 !~ /\(/{print $$0 | cmd ; close(cmd);} $$0 ~ /\(/{print;}' | ${sortbin} | ${uniqbin} | ${xargsbin}
+	@${grepbin} -h --exclude='Makefile' --exclude-dir='doc' -A5 -riIE dependencies $(SRCDIR) | ${awkbin} -v 'distro=$(DISTRO)' 'tolower($$0) ~ distro {$$1="";$$2="";print}' | awk 'BEGIN{cmd="${xargsbin} -n1"} $$0 !~ /\(/{print $$0 | cmd ; close(cmd);} $$0 ~ /\(/{print;}' | ${sortbin} | ${uniqbin} | ${sedbin} -r -e 's/$$/$(SEPARATOR)/' | ${xargsbin}
 
 deplist_opts:
 	@${echobin} "el7" 1>&2
@@ -67,12 +67,12 @@ install:
 	@${echobin} Installing files to ${DESTDIR}
 	${installbin} -d ${SYSCONFDIR} ${DEFAULTDIR} ${BINDIR} ${APPSDIR} ${APPDIR} ${DOCDIR} ${BASHCDIR} ${SUDOERSDIR}
 	${cpbin} -pr ${SRCDIR}/etc/*.* ${SYSCONFDIR}
-	${cpbin} -pr ${SRCDIR}/etc/bash_completion.d/* ${BASHCDIR}
 	${cpbin} -pr ${SRCDIR}/etc/sysconfig/* ${DEFAULTDIR}
 	${cpbin} -pr ${SRCDIR}/usr/bin/* ${BINDIR}
 	${cpbin} -pr ${SRCDIR}/usr/share/applications/* ${APPSDIR}
 	${cpbin} -pr ${SRCDIR}/usr/share/${APPNAME}/*.* ${APPDIR}
 	${cpbin} -pr ${SRCDIR}/usr/share/doc/${APPNAME}/* ${DOCDIR}
+	${installbin} -m 0644 -t ${BASHCDIR} ${SRCDIR}/usr/share/bash-completion/completions/*
 	${installbin} -m 0640 -t ${SUDOERSDIR} ${SRCDIR}/etc/sudoers.d/*
 	# symlink, when alternatives is not being used
 	${lnbin} -s logout-manager-gtk.py ${BINDIR}/logout-manager
diff --git a/src/usr/bin/logout-manager-cli.py b/src/usr/bin/logout-manager-cli.py
index db754b6..64ea133 100755
--- a/src/usr/bin/logout-manager-cli.py
+++ b/src/usr/bin/logout-manager-cli.py
@@ -13,7 +13,7 @@
 #    https://stackoverflow.com/questions/3061/calling-a-function-of-a-module-by-using-its-name-a-string/12025554#12025554
 # Improve:
 # Dependencies:
-#    Devuan: python3-dotenv
+#    Devuan: python3-dotenv python3
 # Documentation:
 
 import os, platform, sys, argparse
diff --git a/src/etc/bash_completion.d/logout-manager b/src/usr/share/bash-completion/completions/logout-manager
index fd1267f..fd1267f 100644
--- a/src/etc/bash_completion.d/logout-manager
+++ b/src/usr/share/bash-completion/completions/logout-manager
diff --git a/src/usr/share/doc/logout-manager/README.md b/src/usr/share/doc/logout-manager/README.md
index cfc3843..d34f02c 100644
--- a/src/usr/share/doc/logout-manager/README.md
+++ b/src/usr/share/doc/logout-manager/README.md
@@ -9,6 +9,7 @@ Logout Manager is a python3 utility that provides a simple menu for logout-type
 
 ## Customization
 The `lm-helper` logout command needs to be customized for every desktop environment. Some may need extra configurationon the window manager/desktop environment side.
+
 ### Fluxbox
 For Fluxbox, you need to set a value in ~/.fluxbox/init
 
@@ -29,12 +30,11 @@ This project is partially a programming playground for the [original author](htt
 
 ## Upsides
 * This project is the first to [demonstrate SVG images in tkinter in python3](https://bgstack15.wordpress.com/2019/07/13/display-svg-in-tkinter-python3/) that I could find on the Internet.
+* This project demonstrates how to have the Makefile and debian/rules build a dependency list, from the Dependencies tags of the files themselves.
 * I have learned how to work with ncurses, gtk, and tcl in python3.
 * This will make Fluxbox systems easier to use for general users.
+* Does not use dbus!
 
 ## Downsides
-This whole thing is more complex than just logging out of my user session, and selecting a logout-type action from the display manager.
-
-## Improve
-* add debian/ dir
-  * and dsc file
+* This whole thing is more complex than just logging out of my user session, and selecting a logout-type action from the display manager.
+* Depends on sudo instead of using native tools.