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

Logout manager 0.0.4

See merge request bgstack15/stackrpms!147

7 files changed, 34 insertions, 12 deletions

diff --git a/logout-manager/debian/changelog b/logout-manager/debian/changelog
index c5b3678..4ef6c6a 100644
--- a/logout-manager/debian/changelog
+++ b/logout-manager/debian/changelog
@@ -1,3 +1,21 @@
+logout-manager (0.0.4-1+devuan) obs; urgency=medium
+
+  * To avoid OBS rebuild problems on version 0.0.3.
+
+ -- Ben Stack <bgstack15@gmail.com>  Fri, 03 Apr 2020 10:15:21 -0400
+
+logout-manager (0.0.3-1+devuan) obs; urgency=medium
+
+  * Fix #2: AttributeError: module 'platform' has no attribute 'dist'
+  * Fix #3: for Devuan Ceres 4: platform.platform() does not show "Devuan"
+  * Fix #4: fix rest of frontends for python 3.8 distro
+  * Fix #5: logout-manager-cli: multiple problems
+  * Fix #6: lm-helper: xscreensaver invocation is incorrect
+  * add man pages
+  * drop .py from names
+
+ -- Ben Stack <bgstack15@gmail.com>  Fri, 03 Apr 2020 09:41:13 -0400
+
 logout-manager (0.0.2-1) obs; urgency=medium
 
   * Add tray icon
diff --git a/logout-manager/debian/control b/logout-manager/debian/control
index f7edf05..2add5d5 100644
--- a/logout-manager/debian/control
+++ b/logout-manager/debian/control
@@ -2,7 +2,8 @@ Source: logout-manager
 Section: x11
 Priority: optional
 Maintainer: Ben Stack <bgstack15@gmail.com>
-Build-Depends: debhelper (>=12~)
+Build-Depends: debhelper (>=12~),
+   go-md2man
 Standards-Version: 4.1.4
 Homepage: https://bgstack15.wordpress.com/
 
diff --git a/logout-manager/debian/logout-manager.dsc b/logout-manager/debian/logout-manager+devuan.dsc
index fcc58c4..d02ef6f 100644
--- a/logout-manager/debian/logout-manager.dsc
+++ b/logout-manager/debian/logout-manager+devuan.dsc
@@ -2,13 +2,13 @@ Format: 3.0 (quilt)
 Source: logout-manager
 Binary: logout-manager
 Architecture: all
-Version: 0.0.2-1
+Version: 0.0.4-1+devuan
 Maintainer: Ben Stack <bgstack15@gmail.com>
 Homepage: https://bgstack15.wordpress.com/
 Standards-Version: 4.1.4
-Build-Depends: debhelper (>= 12~)
+Build-Depends: debhelper (>= 12~), go-md2man
 Package-List:
  logout-manager deb x11 optional arch=all
 Files:
  00000000000000000000000000000000 1 logout-manager.orig.tar.gz
- 00000000000000000000000000000000 1 logout-manager.debian.tar.xz
+ 00000000000000000000000000000000 1 logout-manager+devuan.debian.tar.xz
diff --git a/logout-manager/debian/logout-manager.install b/logout-manager/debian/logout-manager.install
deleted file mode 100644
index e69de29..0000000
--- a/logout-manager/debian/logout-manager.install
+++ /dev/null
diff --git a/logout-manager/debian/logout-manager.lintian-overrides b/logout-manager/debian/logout-manager.lintian-overrides
index 7d2a3ca..fce85db 100644
--- a/logout-manager/debian/logout-manager.lintian-overrides
+++ b/logout-manager/debian/logout-manager.lintian-overrides
@@ -1,5 +1,3 @@
-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
index b98d697..82376ab 100644
--- a/logout-manager/debian/logout-manager.postinst
+++ b/logout-manager/debian/logout-manager.postinst
@@ -2,8 +2,11 @@
 #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
+      update-alternatives --install /usr/bin/logout-manager logout-manager /usr/bin/logout-manager-gtk 80 \
+         --slave /usr/share/man/man1/logout-manager.1.gz logout-manager.1.gz /usr/share/man/man1/logout-manager-gtk.1.gz
+      update-alternatives --install /usr/bin/logout-manager logout-manager /usr/bin/logout-manager-tcl 70 \
+         --slave /usr/share/man/man1/logout-manager.1.gz logout-manager.1.gz /usr/share/man/man1/logout-manager-tcl.1.gz
+      update-alternatives --install /usr/bin/logout-manager logout-manager /usr/bin/logout-manager-ncurses 60 \
+         --slave /usr/share/man/man1/logout-manager.1.gz logout-manager.1.gz /usr/share/man/man1/logout-manager-ncurses.1.gz
       ;;
 esac
diff --git a/logout-manager/debian/logout-manager.prerm b/logout-manager/debian/logout-manager.prerm
index 045aace..8d71190 100644
--- a/logout-manager/debian/logout-manager.prerm
+++ b/logout-manager/debian/logout-manager.prerm
@@ -2,9 +2,11 @@
 #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
+      {
+         update-alternatives --remove logout-manager /usr/bin/logout-manager-gtk
+         update-alternatives --remove logout-manager /usr/bin/logout-manager-tcl
+         update-alternatives --remove logout-manager /usr/bin/logout-manager-ncurses
+      } | grep -vE 'update-alternatives:.*-(tcl|ncurses)' || :
       ;;
    upgrade|failed-upgrade)
       :