Merge branch 'xdgmenumaker-bump' into 'master'

xdgmenumaker 2.0

See merge request bgstack15/stackrpms!314

10 files changed, 33 insertions, 28 deletions

diff --git a/xdgmenumaker/debian/changelog b/xdgmenumaker/debian/changelog
index a960442..88530b9 100644
--- a/xdgmenumaker/debian/changelog
+++ b/xdgmenumaker/debian/changelog
@@ -1,35 +1,45 @@
+xdgmenumaker (2.0-1+devuan) obs; urgency=medium
+
+  * New upstream version
+    * Use python3 now
+  * Remove 0001-force-python3.patch
+  * Improve lintian overrides
+  * rename xdgmenumaker-user.sh to omit .sh
+
+ -- B. Stack <bgstack15@gmail.com>  Thu, 28 Jul 2022 20:06:28 -0400
+
 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
+ -- B. 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
 
- -- Ben Stack <bgstack15@gmail.com>  Wed, 11 Mar 2020 14:21:04 -0400
+ -- B. Stack <bgstack15@gmail.com>  Wed, 11 Mar 2020 14:21:04 -0400
 
 xdgmenumaker (1.5-4+devuan) obs; urgency=medium
 
   * Add some runtime dependencies
 
- -- Ben Stack <bgstack15@gmail.com>  Wed, 26 Feb 2020 09:53:50 -0500
+ -- B. Stack <bgstack15@gmail.com>  Wed, 26 Feb 2020 09:53:50 -0500
 
 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
+ -- B. 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
 
- -- B Stack <bgstack15@gmail.com>  Tue, 07 Jan 2020 15:16:14  -0500
+ -- B. Stack <bgstack15@gmail.com>  Tue, 07 Jan 2020 15:16:14  -0500
 
 xdgmenumaker (1.5-1+devuan) manual; urgency=low
 
   * Initial release
 
- -- B Stack <bgstack15@gmail.com>  Sun, 05 Jan 2020 08:33:14 -0500
+ -- B. Stack <bgstack15@gmail.com>  Sun, 05 Jan 2020 08:33:14 -0500
diff --git a/xdgmenumaker/debian/install b/xdgmenumaker/debian/install
index 8b285ef..20ea002 100644
--- a/xdgmenumaker/debian/install
+++ b/xdgmenumaker/debian/install
@@ -1,4 +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            /usr/bin
 debian/xdgmenumaker-user.png        /usr/share/icons/hicolor/48x48/apps
diff --git a/xdgmenumaker/debian/patches/0001-force-python3.patch b/xdgmenumaker/debian/patches/0001-force-python3.patch
deleted file mode 100644
index 2379e7d..0000000
--- a/xdgmenumaker/debian/patches/0001-force-python3.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -x '.git*' -x '*.swp' -x '*.orig' -x '*.rej' -Naur xdgmenumaker-1.5/src/xdgmenumaker xdgmenumaker-1.5.debian/src/xdgmenumaker
---- xdgmenumaker-1.5/src/xdgmenumaker	2018-09-16 15:42:50.000000000 -0400
-+++ xdgmenumaker-1.5.debian/src/xdgmenumaker	2020-01-05 08:52:55.880931853 -0500
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # coding: utf-8
- # vim:et:sta:sts=4:sw=4:ts=8:tw=79:
- 
-@@ -151,7 +151,7 @@
- terminal_app = os.getenv("XDGMENUMAKERTERM")
- if not terminal_app:
-     try:
--        config = cp.SafeConfigParser()
-+        config = cp.ConfigParser()
-         config.read(os.path.expanduser('~/.config/xdgmenumaker.cfg'))
-         terminal_app = config.get('Terminal', 'terminal')
-     # if there isn't, on debian and debian-likes, use the alternatives
diff --git a/xdgmenumaker/debian/patches/series b/xdgmenumaker/debian/patches/series
index ca9469e..e69de29 100644
--- a/xdgmenumaker/debian/patches/series
+++ b/xdgmenumaker/debian/patches/series
@@ -1 +0,0 @@
-0001-force-python3.patch
diff --git a/xdgmenumaker/debian/postinst b/xdgmenumaker/debian/postinst
index c475148..018ff59 100644
--- a/xdgmenumaker/debian/postinst
+++ b/xdgmenumaker/debian/postinst
@@ -1,6 +1,8 @@
 #!/bin/sh
 # xdgmenumaker postinst
 
+#DEBHELPER#
+
 case "$1" in
    triggered)
       {
diff --git a/xdgmenumaker/debian/prerm b/xdgmenumaker/debian/prerm
index 81b3333..ca421b5 100644
--- a/xdgmenumaker/debian/prerm
+++ b/xdgmenumaker/debian/prerm
@@ -1,4 +1,7 @@
 #!/bin/sh -e
+
+#DEBHELPER#
+
 case "$1" in
 
    remove|purge)
diff --git a/xdgmenumaker/debian/source/lintian-overrides b/xdgmenumaker/debian/source/lintian-overrides
new file mode 100644
index 0000000..cf4ca8c
--- /dev/null
+++ b/xdgmenumaker/debian/source/lintian-overrides
@@ -0,0 +1,3 @@
+invalid-devuan-version
+invalid-field-for-derivative
+syntax-error-in-dep5-copyright Continuation line not in paragraph (line 199). Missing a dot on the previous line? [debian/copyright]
diff --git a/xdgmenumaker/debian/xdgmenumaker+devuan.dsc b/xdgmenumaker/debian/xdgmenumaker+devuan.dsc
index 7386485..ca4ae48 100644
--- a/xdgmenumaker/debian/xdgmenumaker+devuan.dsc
+++ b/xdgmenumaker/debian/xdgmenumaker+devuan.dsc
@@ -2,8 +2,8 @@ Format: 3.0 (quilt)
 Source: xdgmenumaker
 Binary: xdgmenumaker
 Architecture: any
-Version: 1.6-1+devuan
-Maintainer: B Stack <bgstack15@gmail.com>
+Version: 2.0-1+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
diff --git a/xdgmenumaker/debian/xdgmenumaker-user.sh b/xdgmenumaker/debian/xdgmenumaker-user
index cbf8a33..cbf8a33 100755
--- a/xdgmenumaker/debian/xdgmenumaker-user.sh
+++ b/xdgmenumaker/debian/xdgmenumaker-user
diff --git a/xdgmenumaker/debian/xdgmenumaker.lintian-overrides b/xdgmenumaker/debian/xdgmenumaker.lintian-overrides
new file mode 100644
index 0000000..d7f223d
--- /dev/null
+++ b/xdgmenumaker/debian/xdgmenumaker.lintian-overrides
@@ -0,0 +1,6 @@
+copyright-file-contains-full-gpl-license
+copyright-not-using-common-license-for-gpl
+copyright-has-url-from-dh_make-boilerplate
+maintainer-script-ignores-errors
+no-manual-page [usr/bin/xdgmenumaker-user]
+desktop-command-not-in-package