Merge branch 'keyboard-leds-trayicons-bump' into 'master'

keyboard-leds-trayicons 0.0.2: upstream Makefile

See merge request bgstack15/stackrpms!142

9 files changed, 39 insertions, 15 deletions

diff --git a/keyboard-leds-trayicons/debian/changelog b/keyboard-leds-trayicons/debian/changelog
index b888959..0ee9921 100644
--- a/keyboard-leds-trayicons/debian/changelog
+++ b/keyboard-leds-trayicons/debian/changelog
@@ -1,3 +1,10 @@
+keyboard-leds-trayicons (0.0.2-1+devuan) obs; urgency=medium
+
+  * Add xdg autostart and menu icons
+  * Use Unix makefile
+
+ -- Ben Stack <bgstack15@gmail.com>  Tue, 17 Mar 2020 10:17:18 -0400
+
 keyboard-leds-trayicons (0.0.1-1+devuan) obs; urgency=low
 
   * Initial release.
diff --git a/keyboard-leds-trayicons/debian/control b/keyboard-leds-trayicons/debian/control
index 4dff3a7..b5a4c55 100644
--- a/keyboard-leds-trayicons/debian/control
+++ b/keyboard-leds-trayicons/debian/control
@@ -3,6 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Ben Stack <bgstack15@gmail.com>
 Build-Depends: debhelper (>=12~),
+   go-md2man,
    graphicsmagick-imagemagick-compat
 Standards-Version: 4.1.4
 Homepage: https://gitlab.com/bgstack15/keyboard-leds-trayicons
@@ -11,8 +12,5 @@ Package: keyboard-leds-trayicons
 Architecture: all
 Multi-Arch: foreign
 Depends: ${misc:Depends}, ${shlibs:Depends},
-   mktrayicon,
-   mawk | gawk,
-   x11-xserver-utils
 Description: show keyboard leds on system tray
  Show capslock and numlock indicator icons on system tray.
diff --git a/keyboard-leds-trayicons/debian/docs b/keyboard-leds-trayicons/debian/docs
deleted file mode 100644
index b43bf86..0000000
--- a/keyboard-leds-trayicons/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-README.md
diff --git a/keyboard-leds-trayicons/debian/install b/keyboard-leds-trayicons/debian/install
deleted file mode 100644
index 2dfcee8..0000000
--- a/keyboard-leds-trayicons/debian/install
+++ /dev/null
@@ -1,3 +0,0 @@
-src/etc/*   /etc
-src/usr/bin/*  /usr/bin
-src/usr/share/icons/hicolor/scalable/status/*   /usr/share/icons/hicolor/scalable/status
diff --git a/keyboard-leds-trayicons/debian/keyboard-leds-trayicons_devuan.dsc b/keyboard-leds-trayicons/debian/keyboard-leds-trayicons+devuan.dsc
index 62cf13c..fddc007 100644
--- a/keyboard-leds-trayicons/debian/keyboard-leds-trayicons_devuan.dsc
+++ b/keyboard-leds-trayicons/debian/keyboard-leds-trayicons+devuan.dsc
@@ -2,13 +2,13 @@ Format: 3.0 (quilt)
 Source: keyboard-leds-trayicons
 Binary: keyboard-leds-trayicons
 Architecture: all
-Version: 0.0.1-1+devuan
+Version: 0.0.2-1+devuan
 Maintainer: Ben Stack <bgstack15@gmail.com>
 Homepage: https://gitlab.com/bgstack15/keyboard-leds-trayicons
 Standards-Version: 4.1.4
-Build-Depends: debhelper (>= 12~), graphicsmagick-imagemagick-compat
+Build-Depends: debhelper (>= 12~), go-md2man, graphicsmagick-imagemagick-compat
 Package-List:
  keyboard-leds-trayicons deb x11 optional arch=all
 Files:
- 00000000000000000000000000000000 1 keyboard-leds-trayicons_0.0.1.orig.tar.gz
- 00000000000000000000000000000000 1 keyboard-leds-trayicons_0.0.1-1+devuan.debian.tar.xz
+00000000000000000000000000000000 1 keyboard-leds-trayicons.orig.tar.gz
+00000000000000000000000000000000 1 keyboard-leds-trayicons+devuan.debian.tar.xz
diff --git a/keyboard-leds-trayicons/debian/keyboard-leds-trayicons.lintian-overrides b/keyboard-leds-trayicons/debian/keyboard-leds-trayicons.lintian-overrides
index bc20712..26d4024 100644
--- a/keyboard-leds-trayicons/debian/keyboard-leds-trayicons.lintian-overrides
+++ b/keyboard-leds-trayicons/debian/keyboard-leds-trayicons.lintian-overrides
@@ -1 +1,4 @@
 script-with-language-extension
+copyright-has-url-from-dh_make-boilerplate
+copyright-without-copyright-notice
+desktop-entry-uses-reserved-category
diff --git a/keyboard-leds-trayicons/debian/make-dsc-for-obs.sh b/keyboard-leds-trayicons/debian/make-dsc-for-obs.sh
new file mode 100644
index 0000000..088b548
--- /dev/null
+++ b/keyboard-leds-trayicons/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])?//;' )"
+sed -r -e '/Checksums-.{0,8}:\s*$/,/^Files/{/Files/!{d};}' -e 's/^ [^\s]{32}/ 00000000000000000000000000000000/;' "${tf}" | awk 'BEGIN{a=0;cmd="tr -d '[0-9_+]'"} a > 0 {$2="1";gsub(/_[0-9_\.]+[0-9_](-[0-9])?/,"");} /^Files/{a=1} {print}' > "${of}"
diff --git a/keyboard-leds-trayicons/debian/rules b/keyboard-leds-trayicons/debian/rules
index 71c2727..55ac4b8 100755
--- a/keyboard-leds-trayicons/debian/rules
+++ b/keyboard-leds-trayicons/debian/rules
@@ -5,18 +5,22 @@
 #export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
 #export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
-export name=keyboard-leds-trayicons
+export APPNAME=keyboard-leds-trayicons
 export debuilddir="debian"
-export buildroot="${debuilddir}/${name}"
+export buildroot="${debuilddir}/${APPNAME}"
 export _datadir="/usr/share"
 export _bindir="/usr/bin"
 export _indir="/usr/share/icons/hicolor/scalable/status"
 
 %:
-	dh $@
+	dh $@ --sourcedirectory=src
+
+override_dh_auto_build:
+	dh_auto_build
+	sh debian/make-dsc-for-obs.sh
 
 override_dh_auto_install:
-	dh_auto_install
+	dh_auto_install -- prefix=/usr DEFAULTDIR='$$(DESTDIR)/etc/default'
 
 	mkdir -p ${buildroot}${_datadir}/icons/hicolor/16x16/status
 	mkdir -p ${buildroot}${_datadir}/icons/hicolor/32x32/status
@@ -47,3 +51,8 @@ override_dh_auto_install:
 	convert -filter Lanczos -resize 48x48 -background none -antialias src${_indir}/numlock-off.svg ${buildroot}${_datadir}/icons/hicolor/48x48/status/numlock-off.png
 	convert -filter Lanczos -resize 64x64 -background none -antialias src${_indir}/numlock-off.svg ${buildroot}${_datadir}/icons/hicolor/64x64/status/numlock-off.png
 	convert -filter Lanczos -resize 128x128 -background none -antialias src${_indir}/numlock-off.svg ${buildroot}${_datadir}/icons/hicolor/128x128/status/numlock-off.png
+
+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/keyboard-leds-trayicons/debian/source/lintian-overrides b/keyboard-leds-trayicons/debian/source/lintian-overrides
index aa10b71..2da37ed 100644
--- a/keyboard-leds-trayicons/debian/source/lintian-overrides
+++ b/keyboard-leds-trayicons/debian/source/lintian-overrides
@@ -1 +1,2 @@
 file-without-copyright-information
+missing-license-paragraph-in-dep5-copyright