Merge branch 'logout-manager-bump' into 'master'

Logout manager 0.0.2

See merge request bgstack15/stackrpms!145

21 files changed, 173 insertions, 3 deletions

diff --git a/freefilesync/debian/freefilesync_devuan.dsc b/freefilesync/debian/freefilesync_devuan.dsc
index 80b8697..4a386e8 100644
--- a/freefilesync/debian/freefilesync_devuan.dsc
+++ b/freefilesync/debian/freefilesync_devuan.dsc
@@ -2,7 +2,7 @@ Format: 3.0 (quilt)
 Source: freefilesync
 Binary: freefilesync
 Architecture: any
-Version: 10.20-1+devuan
+Version: 10.22-1+devuan
 Maintainer: B Stack <bgstack15@gmail.com>
 Homepage: https://freefilesync.org/
 Standards-Version: 4.1.4
@@ -10,5 +10,5 @@ Build-Depends: debhelper (>= 12~), imagemagick, libcurl4-openssl-dev, libssh2-1-
 Package-List:
  freefilesync deb utils optional arch=any
 Files:
- 00000000000000000000000000000000 1 freefilesync_10.20.orig.tar.gz
- 00000000000000000000000000000000 1 freefilesync_10.20-1+devuan.debian.tar.xz
+ 00000000000000000000000000000000 1 freefilesync0.orig.tar.gz
+ 00000000000000000000000000000000 1 freefilesync+devuan.debian.tar.xz
diff --git a/logout-manager/README.md b/logout-manager/README.md
new file mode 100644
index 0000000..e2c678d
--- /dev/null
+++ b/logout-manager/README.md
@@ -0,0 +1,21 @@
+# Readme for logout-manager
+
+## Upstream
+[https://gitlab.com/bgstack15/logout-manager](https://gitlab.com/bgstack15/logout-manager)
+
+## Reason for being in stackrpms
+Logout Manager is a homegrown tool and has no place in any official repositories.
+
+## Alternatives
+I did not research any alternatives. The project is based on general ideas such as included in Xfce, where an easy button for similar logout options exists as an option for the Xfce panel.
+
+## Reverse dependency matrix
+Distro     | logout-manager version
+---------- | ----------------
+Devuan     | 0.0.2
+
+## Additional info
+This project also exists as a proof-of-concept for myself, for various combinations of things in Python3, including [svg graphics in tkinter](https://bgstack15.wordpress.com/2019/07/13/display-svg-in-tkinter-python3/), and Gtk3 applications and status icons, and menus with icons on the items.
+
+## Differences from upstream
+None
diff --git a/logout-manager/debian/README.Debian b/logout-manager/debian/README.Debian
new file mode 100644
index 0000000..810fad6
--- /dev/null
+++ b/logout-manager/debian/README.Debian
@@ -0,0 +1,5 @@
+logout-manager for Devuan
+
+No changes
+
+ -- Ben Stack <bgstack15@gmail.com>  Wed, 11 Mar 2020 08:38:11 -0400
diff --git a/logout-manager/debian/changelog b/logout-manager/debian/changelog
new file mode 100644
index 0000000..c5b3678
--- /dev/null
+++ b/logout-manager/debian/changelog
@@ -0,0 +1,13 @@
+logout-manager (0.0.2-1) obs; urgency=medium
+
+  * Add tray icon
+  * Fix #1: logout-manager-cli lock is valid command but still shows
+    help message
+
+ -- Ben Stack <bgstack15@gmail.com>  Fri, 20 Mar 2020 16:33:27 -0400
+
+logout-manager (0.0.1-1) obs; urgency=low
+
+  * Initial release.
+
+ -- Ben Stack <bgstack15@gmail.com>  Wed, 11 Mar 2020 08:38:11 -0400
diff --git a/logout-manager/debian/compat b/logout-manager/debian/compat
new file mode 100644
index 0000000..48082f7
--- /dev/null
+++ b/logout-manager/debian/compat
@@ -0,0 +1 @@
+12
diff --git a/logout-manager/debian/control b/logout-manager/debian/control
new file mode 100644
index 0000000..f7edf05
--- /dev/null
+++ b/logout-manager/debian/control
@@ -0,0 +1,17 @@
+Source: logout-manager
+Section: x11
+Priority: optional
+Maintainer: Ben Stack <bgstack15@gmail.com>
+Build-Depends: debhelper (>=12~)
+Standards-Version: 4.1.4
+Homepage: https://bgstack15.wordpress.com/
+
+Package: logout-manager
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: provide simple menu for logout-type actions
+ Designed for minimal DEs and window managers that 
+ lack a menu for logging out, this tool provides 
+ such a menu.
+ 
diff --git a/logout-manager/debian/copyright b/logout-manager/debian/copyright
new file mode 100644
index 0000000..6b39eaf
--- /dev/null
+++ b/logout-manager/debian/copyright
@@ -0,0 +1,29 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: logout-manager
+Source: <url://example.com>
+#
+# Please double check copyright with the licensecheck(1) command.
+
+Files:     .gitignore
+           README.md
+           src/Makefile
+           src/etc/bash_completion.d/logout-manager
+           src/etc/logout-manager.conf
+           src/etc/sudoers.d/30_logout-manager_sudo
+           src/etc/sysconfig/logout-manager
+           src/usr/bin/logout-manager-cli.py
+           src/usr/bin/logout-manager-gtk.py
+           src/usr/bin/logout-manager-ncurses.py
+           src/usr/bin/logout-manager-tcl.py
+           src/usr/libexec/logout-manager/lm-helper
+           src/usr/share/applications/logout-manager.desktop
+           src/usr/share/doc/logout-manager/README.md
+           src/usr/share/doc/logout-manager/logout-manager.conf.example
+           src/usr/share/logout-manager/__pycache__/lmlib.cpython-37.pyc
+           src/usr/share/logout-manager/lmlib.py
+Copyright: __NO_COPYRIGHT_NOR_LICENSE__
+License:   __NO_COPYRIGHT_NOR_LICENSE__
+
+#----------------------------------------------------------------------------
+# Files marked as NO_LICENSE_TEXT_FOUND may be covered by the following
+# license/copyright files.
diff --git a/logout-manager/debian/do-not-install b/logout-manager/debian/do-not-install
new file mode 100644
index 0000000..e752d8b
--- /dev/null
+++ b/logout-manager/debian/do-not-install
@@ -0,0 +1 @@
+usr/bin/logout-manager
diff --git a/logout-manager/debian/logout-manager.conffiles b/logout-manager/debian/logout-manager.conffiles
new file mode 100644
index 0000000..65e8592
--- /dev/null
+++ b/logout-manager/debian/logout-manager.conffiles
@@ -0,0 +1,2 @@
+etc/logout-manager.conf
+etc/default/logout-manager
diff --git a/logout-manager/debian/logout-manager.dsc b/logout-manager/debian/logout-manager.dsc
new file mode 100644
index 0000000..fcc58c4
--- /dev/null
+++ b/logout-manager/debian/logout-manager.dsc
@@ -0,0 +1,14 @@
+Format: 3.0 (quilt)
+Source: logout-manager
+Binary: logout-manager
+Architecture: all
+Version: 0.0.2-1
+Maintainer: Ben Stack <bgstack15@gmail.com>
+Homepage: https://bgstack15.wordpress.com/
+Standards-Version: 4.1.4
+Build-Depends: debhelper (>= 12~)
+Package-List:
+ logout-manager deb x11 optional arch=all
+Files:
+ 00000000000000000000000000000000 1 logout-manager.orig.tar.gz
+ 00000000000000000000000000000000 1 logout-manager.debian.tar.xz
diff --git a/logout-manager/debian/logout-manager.install b/logout-manager/debian/logout-manager.install
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/logout-manager/debian/logout-manager.install
diff --git a/logout-manager/debian/logout-manager.lintian-overrides b/logout-manager/debian/logout-manager.lintian-overrides
new file mode 100644
index 0000000..7d2a3ca
--- /dev/null
+++ b/logout-manager/debian/logout-manager.lintian-overrides
@@ -0,0 +1,5 @@
+binary-without-manpage
+copyright-has-url-from-dh_make-boilerplate
+copyright-without-copyright-notice
+script-with-language-extension
+desktop-entry-uses-reserved-category TrayIcon usr/share/applications/logout-manager-trayicon.desktop
diff --git a/logout-manager/debian/logout-manager.postinst b/logout-manager/debian/logout-manager.postinst
new file mode 100644
index 0000000..b98d697
--- /dev/null
+++ b/logout-manager/debian/logout-manager.postinst
@@ -0,0 +1,9 @@
+#!/bin/sh -e
+#DEBHELPER#
+case "$1" in
+   configure|abort-upgrade|abort-remove|abort-deconfigure)
+      update-alternatives --install /usr/bin/logout-manager logout-manager /usr/bin/logout-manager-gtk.py 80
+      update-alternatives --install /usr/bin/logout-manager logout-manager /usr/bin/logout-manager-tcl.py 70
+      update-alternatives --install /usr/bin/logout-manager logout-manager /usr/bin/logout-manager-ncurses.py 60
+      ;;
+esac
diff --git a/logout-manager/debian/logout-manager.prerm b/logout-manager/debian/logout-manager.prerm
new file mode 100644
index 0000000..045aace
--- /dev/null
+++ b/logout-manager/debian/logout-manager.prerm
@@ -0,0 +1,12 @@
+#!/bin/sh -e
+#DEBHELPER#
+case "$1" in
+   remove|deconfigure)
+      update-alternatives --remove logout-manager /usr/bin/logout-manager-gtk.py
+      update-alternatives --remove logout-manager /usr/bin/logout-manager-tcl.py
+      update-alternatives --remove logout-manager /usr/bin/logout-manager-ncurses.py
+      ;;
+   upgrade|failed-upgrade)
+      :
+      ;;
+esac
diff --git a/logout-manager/debian/make-dsc-for-obs.sh b/logout-manager/debian/make-dsc-for-obs.sh
new file mode 100755
index 0000000..da1c0b7
--- /dev/null
+++ b/logout-manager/debian/make-dsc-for-obs.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+# Goal: convert the fresh dsc file to a generic one for obs that omits version and checksum info on filenames
+# Use in debian/rules:
+#    APPNAME=name-of-binary-package
+#    override_dh_auto_build:
+#       dh_auto_build
+#       sh debian/make-dsc-for-obs.sh
+tf="../$( find .. -maxdepth 1 -name "${APPNAME}_*dsc" -printf '%T@ %f\n' | sort | tail -n1 | awk '{print $NF}' )"
+of="debian/$( basename "$( readlink -f "${tf}" )" | sed -r -e 's/_[0-9_\.]+[0-9_](-[0-9])?//;' )"
+awk 'BEGIN{a=0} a > 0 {$2="1";gsub(/_[0-9_\.]+[0-9_](-[0-9])?/,"");} /^Files/{a=1} {print}' "${tf}" | sed -r -e '/Checksums-.{0,8}:\s*$/,/^Files/{/Files/!{d};}' -e '/^Files/,${s/^ ?[^\s]{32}/ 00000000000000000000000000000000/;};' > "${of}"
diff --git a/logout-manager/debian/patches/series b/logout-manager/debian/patches/series
new file mode 100644
index 0000000..4a97dfa
--- /dev/null
+++ b/logout-manager/debian/patches/series
@@ -0,0 +1 @@
+# You must remove unused comment lines for the released package.
diff --git a/logout-manager/debian/rules b/logout-manager/debian/rules
new file mode 100755
index 0000000..c8755d8
--- /dev/null
+++ b/logout-manager/debian/rules
@@ -0,0 +1,23 @@
+#!/usr/bin/make -f
+# You must remove unused comment lines for the released package.
+#export DH_VERBOSE = 1
+#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+#export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
+#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+
+export APPNAME=logout-manager
+
+%:
+	dh $@ --sourcedirectory=src
+
+override_dh_auto_build:
+	dh_auto_build
+	sh debian/make-dsc-for-obs.sh
+
+override_dh_auto_install:
+	dh_auto_install -- prefix=/usr DEFAULTDIR='$$(DESTDIR)/etc/default'
+
+override_dh_gencontrol:
+	printf "misc:Depends=" > debian/${APPNAME}.substvars
+	make -C src deplist DISTRO=devuan SEPARATOR=',' | grep -vE 'make\[[0-9]' >> debian/${APPNAME}.substvars
+	dh_gencontrol
diff --git a/logout-manager/debian/source/format b/logout-manager/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/logout-manager/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/logout-manager/debian/source/lintian-overrides b/logout-manager/debian/source/lintian-overrides
new file mode 100644
index 0000000..2da37ed
--- /dev/null
+++ b/logout-manager/debian/source/lintian-overrides
@@ -0,0 +1,2 @@
+file-without-copyright-information
+missing-license-paragraph-in-dep5-copyright
diff --git a/logout-manager/debian/source/local-options b/logout-manager/debian/source/local-options
new file mode 100644
index 0000000..00131ee
--- /dev/null
+++ b/logout-manager/debian/source/local-options
@@ -0,0 +1,2 @@
+#abort-on-upstream-changes
+#unapply-patches
diff --git a/logout-manager/debian/watch b/logout-manager/debian/watch
new file mode 100644
index 0000000..fc70498
--- /dev/null
+++ b/logout-manager/debian/watch
@@ -0,0 +1,2 @@
+# You must remove unused comment lines for the released package.
+version=4