Merge branch 'xdgmenumaker-bump' into 'master'

xdgmenumaker 1.6

See merge request bgstack15/stackrpms!189

5 files changed, 11 insertions, 4 deletions

diff --git a/xdgmenumaker/README.md b/xdgmenumaker/README.md
index 5e9aa56..af7f1f9 100644
--- a/xdgmenumaker/README.md
+++ b/xdgmenumaker/README.md
@@ -23,7 +23,7 @@ https://wiki.archlinux.org/index.php/Xdg-menu
 # Reverse dependency matrix
 Distro     | xdgmenumaker version
 ---------- | ----------------
-All        | 1.5
+All        | 1.6
 
 # Differences from upstream
 None
diff --git a/xdgmenumaker/debian/changelog b/xdgmenumaker/debian/changelog
index 1b9715f..a960442 100644
--- a/xdgmenumaker/debian/changelog
+++ b/xdgmenumaker/debian/changelog
@@ -1,3 +1,9 @@
+xdgmenumaker (1.6-1+devuan) obs; urgency=medium
+
+  * Handle OnlyShowIn and NotShowIn better patch merged into upstream
+
+ -- Ben Stack <bgstack15@gmail.com>  Thu, 17 Sep 2020 10:00:05 -0400
+
 xdgmenumaker (1.5-5+devuan) obs; urgency=medium
 
   * Suppress minor warnings during dpkg-trigger
diff --git a/xdgmenumaker/debian/control b/xdgmenumaker/debian/control
index 384cccf..29a70cb 100644
--- a/xdgmenumaker/debian/control
+++ b/xdgmenumaker/debian/control
@@ -25,7 +25,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends},
 #   python2
 #   python-gi
 #   python-gtk2
-Suggests:
+Recommends:
 # for python3:
    python3-pil
 # for python2:
diff --git a/xdgmenumaker/debian/xdgmenumaker_devuan.dsc b/xdgmenumaker/debian/xdgmenumaker+devuan.dsc
index de1eb65..7386485 100644
--- a/xdgmenumaker/debian/xdgmenumaker_devuan.dsc
+++ b/xdgmenumaker/debian/xdgmenumaker+devuan.dsc
@@ -2,7 +2,7 @@ Format: 3.0 (quilt)
 Source: xdgmenumaker
 Binary: xdgmenumaker
 Architecture: any
-Version: 1.5-5+devuan
+Version: 1.6-1+devuan
 Maintainer: B Stack <bgstack15@gmail.com>
 Homepage: https://github.com/gapan/xdgmenumaker
 Standards-Version: 4.1.4
@@ -10,5 +10,5 @@ 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.orig.tar.gz
  00000000000000000000000000000000 1 xdgmenumaker_devuan.debian.tar.xz
diff --git a/xdgmenumaker/debian/xdgmenumaker-user-fluxbox.desktop b/xdgmenumaker/debian/xdgmenumaker-user-fluxbox.desktop
index 2064c6f..348f6dc 100644
--- a/xdgmenumaker/debian/xdgmenumaker-user-fluxbox.desktop
+++ b/xdgmenumaker/debian/xdgmenumaker-user-fluxbox.desktop
@@ -10,3 +10,4 @@ StartupNotify=true
 Terminal=false
 Type=Application
 Version=1.0
+OnlyShowIn=Fluxbox;