Merge branch 'updates' into 'master'

veracrypt, xdgmenumaker, ublock-origin, notepadpp, palemoon, xseticon dpkg

Closes #16

See merge request bgstack15/stackrpms!122

11 files changed, 71 insertions, 3 deletions

diff --git a/xdgmenumaker/debian/README.Debian b/xdgmenumaker/debian/README.Debian
index 76201e7..c0d72f4 100644
--- a/xdgmenumaker/debian/README.Debian
+++ b/xdgmenumaker/debian/README.Debian
@@ -1,7 +1,17 @@
 xdgmenumaker for Devuan
 
+You can take advantage of xdgmenumaker as a Fluxbox user, by configuring ~/.fluxbox/menu to include this line:
+
+    [include] (.fluxbox/xdg-menu)
+
+And use the "Update xdg menu (fluxbox)" menu option which calls this command:
+
+    /usr/bin/xdgmenumaker -f fluxbox -i > "${HOME}/.fluxbox/xdg-menu"
+
 Initial build
 References include:
    https://stackoverflow.com/questions/1908610/how-to-get-pid-of-background-process/1911387#1911387
 
+Icon courtesy of [Top Menu icon](https://icons8.com/icons/set/top-menu") icon by [Icons8](https://icons8.com)
+
  -- B Stack <bgstack15@gmail.com> Sun, 05 Jan 2020 08:33:14 -0500
diff --git a/xdgmenumaker/debian/changelog b/xdgmenumaker/debian/changelog
index 18ed8ef..3536062 100644
--- a/xdgmenumaker/debian/changelog
+++ b/xdgmenumaker/debian/changelog
@@ -1,3 +1,9 @@
+xdgmenumaker (1.5-3+devuan) obs; urgency=medium
+
+  * Add desktop file for a script which updates user-specific xdg menu for fluxbox
+
+ -- Ben Stack <bgstack15@gmail.com>  Tue, 11 Feb 2020 14:33:14 -0500
+
 xdgmenumaker (1.5-2+devuan) obs; urgency=low
 
   * Add triggers to generate a fluxbox menu
diff --git a/xdgmenumaker/debian/install b/xdgmenumaker/debian/install
new file mode 100644
index 0000000..8b285ef
--- /dev/null
+++ b/xdgmenumaker/debian/install
@@ -0,0 +1,4 @@
+debian/xdgmenumaker-user-fluxbox.desktop /usr/share/applications
+debian/xdgmenumaker-user-fluxbox.desktop /etc/xdg/autostart
+debian/xdgmenumaker-user.sh         /usr/bin
+debian/xdgmenumaker-user.png        /usr/share/icons/hicolor/48x48/apps
diff --git a/xdgmenumaker/debian/postinst b/xdgmenumaker/debian/postinst
index bcb1008..3e20d56 100644
--- a/xdgmenumaker/debian/postinst
+++ b/xdgmenumaker/debian/postinst
@@ -8,7 +8,7 @@ case "$1" in
       export DISPLAY=:18
       for word in fluxbox ;
       do
-         /usr/bin/xdgmenumaker -f "${word}" -i > "/etc/xdgmenumaker/${word}" 2>/dev/null
+         xdgmenumaker -f "${word}" -i > "/etc/xdgmenumaker/${word}" 2>/dev/null
       done
       kill $result
       ;;
diff --git a/xdgmenumaker/debian/prerm b/xdgmenumaker/debian/prerm
new file mode 100644
index 0000000..81b3333
--- /dev/null
+++ b/xdgmenumaker/debian/prerm
@@ -0,0 +1,8 @@
+#!/bin/sh -e
+case "$1" in
+
+   remove|purge)
+      rm -f /etc/xdgmenumaker/* 2>/dev/null
+      ;;
+
+esac
diff --git a/xdgmenumaker/debian/source/include-binaries b/xdgmenumaker/debian/source/include-binaries
new file mode 100644
index 0000000..25583fc
--- /dev/null
+++ b/xdgmenumaker/debian/source/include-binaries
@@ -0,0 +1 @@
+debian/xdgmenumaker-user.png
diff --git a/xdgmenumaker/debian/watch b/xdgmenumaker/debian/watch
index 427067e..731a85b 100644
--- a/xdgmenumaker/debian/watch
+++ b/xdgmenumaker/debian/watch
@@ -1,5 +1,4 @@
 # You must remove unused comment lines for the released package.
 version=4
-opts=filenamemangle=s/.+\/@PACKAGE@-?(\d\S+)\.tar\.gz/xdgmenumaker-$1\.tar\.gz/ \
+#opts=filenamemangle=s/.+\/@PACKAGE@-?(\d\S+)\.tar\.gz/xdgmenumaker-$1\.tar\.gz/ \
   https://github.com/gapan/xdgmenumaker/tags .*/v?(\d\S+)\.tar\.gz
-
diff --git a/xdgmenumaker/debian/xdgmenumaker-user-fluxbox.desktop b/xdgmenumaker/debian/xdgmenumaker-user-fluxbox.desktop
new file mode 100644
index 0000000..2064c6f
--- /dev/null
+++ b/xdgmenumaker/debian/xdgmenumaker-user-fluxbox.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Categories=Settings;DesktopSettings;
+Comment=Update current user's fluxbox xdg menu
+Exec=/usr/bin/xdgmenumaker-user.sh fluxbox
+GenericName=Update xdg menu
+Icon=xdgmenumaker-user
+Keywords=menu;xdg;
+Name=Update xdg menu (fluxbox)
+StartupNotify=true
+Terminal=false
+Type=Application
+Version=1.0
diff --git a/xdgmenumaker/debian/xdgmenumaker-user.png b/xdgmenumaker/debian/xdgmenumaker-user.png
new file mode 100644
index 0000000..d353275
--- /dev/null
+++ b/xdgmenumaker/debian/xdgmenumaker-user.png
diff --git a/xdgmenumaker/debian/xdgmenumaker-user.sh b/xdgmenumaker/debian/xdgmenumaker-user.sh
new file mode 100755
index 0000000..cbf8a33
--- /dev/null
+++ b/xdgmenumaker/debian/xdgmenumaker-user.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+# Startdate: 2020-02-11
+
+echo " $* " | grep -qE -e "\<fluxbox\>" && _XDG_REQUESTED_DESKTOP=fluxbox
+
+case "${_XDG_REQUESTED_DESKTOP}" in
+   fluxbox)
+      /usr/bin/xdgmenumaker -f fluxbox -i > "${HOME}/.fluxbox/xdg-menu"
+      ;;
+   *)
+      echo "Gotta say unh. Feature \"$*\" not yet implemented." 1>&2
+      exit 1
+      ;;
+esac
diff --git a/xdgmenumaker/debian/xdgmenumaker_1.5-3+devuan.dsc b/xdgmenumaker/debian/xdgmenumaker_1.5-3+devuan.dsc
new file mode 100644
index 0000000..1402c66
--- /dev/null
+++ b/xdgmenumaker/debian/xdgmenumaker_1.5-3+devuan.dsc
@@ -0,0 +1,14 @@
+Format: 3.0 (quilt)
+Source: xdgmenumaker
+Binary: xdgmenumaker
+Architecture: any
+Version: 1.5-3+devuan
+Maintainer: B Stack <bgstack15@gmail.com>
+Homepage: https://github.com/gapan/xdgmenumaker
+Standards-Version: 4.1.4
+Build-Depends: debhelper (>= 12~), dh-python, txt2tags
+Package-List:
+ xdgmenumaker deb x11 optional arch=any
+Files:
+ 00000000000000000000000000000000 1 xdgmenumaker_1.5.orig.tar.gz
+ 00000000000000000000000000000000 1 xdgmenumaker_1.5-3+devuan.debian.tar.xz