Merge branch 'mktrayicon-bump' into 'master'

Add mktrayicon (my fork) and keyboard-leds-trayicons

Closes #15

See merge request bgstack15/stackrpms!125

23 files changed, 174 insertions, 19 deletions

diff --git a/keyboard-leds-trayicons/debian/README.Debian b/keyboard-leds-trayicons/debian/README.Debian
new file mode 100644
index 0000000..8ce6c02
--- /dev/null
+++ b/keyboard-leds-trayicons/debian/README.Debian
@@ -0,0 +1,8 @@
+keyboard-leds-trayicons for Devuan
+
+No changes.
+
+References:
+   convert svg to png with transparency; order of flags https://stackoverflow.com/questions/9530524/convert-svg-to-transparent-png-with-antialiasing-using-imagemagick#comment46053012_18579465
+
+ -- Ben Stack <bgstack15@gmail.com>  Thu, 13 Feb 2020 19:27:59 -0500
diff --git a/keyboard-leds-trayicons/debian/changelog b/keyboard-leds-trayicons/debian/changelog
new file mode 100644
index 0000000..b888959
--- /dev/null
+++ b/keyboard-leds-trayicons/debian/changelog
@@ -0,0 +1,5 @@
+keyboard-leds-trayicons (0.0.1-1+devuan) obs; urgency=low
+
+  * Initial release.
+
+ -- Ben Stack <bgstack15@gmail.com>  Thu, 13 Feb 2020 19:27:59 -0500
diff --git a/keyboard-leds-trayicons/debian/compat b/keyboard-leds-trayicons/debian/compat
new file mode 100644
index 0000000..48082f7
--- /dev/null
+++ b/keyboard-leds-trayicons/debian/compat
@@ -0,0 +1 @@
+12
diff --git a/keyboard-leds-trayicons/debian/control b/keyboard-leds-trayicons/debian/control
new file mode 100644
index 0000000..4dff3a7
--- /dev/null
+++ b/keyboard-leds-trayicons/debian/control
@@ -0,0 +1,18 @@
+Source: keyboard-leds-trayicons
+Section: x11
+Priority: optional
+Maintainer: Ben Stack <bgstack15@gmail.com>
+Build-Depends: debhelper (>=12~),
+   graphicsmagick-imagemagick-compat
+Standards-Version: 4.1.4
+Homepage: https://gitlab.com/bgstack15/keyboard-leds-trayicons
+
+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/copyright b/keyboard-leds-trayicons/debian/copyright
new file mode 100644
index 0000000..4685f26
--- /dev/null
+++ b/keyboard-leds-trayicons/debian/copyright
@@ -0,0 +1,22 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: keyboard-leds-trayicons
+Source: <url://example.com>
+#
+# Please double check copyright with the licensecheck(1) command.
+
+Files:     README.md
+           src/etc/keyboard-leds-trayicons.conf
+           src/usr/bin/keyboard-leds-trayicons.sh
+Copyright: __NO_COPYRIGHT_NOR_LICENSE__
+License:   __NO_COPYRIGHT_NOR_LICENSE__
+
+#----------------------------------------------------------------------------
+# xml and html files (skipped):
+#         src/usr/share/icons/hicolor/scalable/status/numlock-off.svg
+#         src/usr/share/icons/hicolor/scalable/status/numlock-on.svg
+#         src/usr/share/icons/hicolor/scalable/status/capslock-off.svg
+#         src/usr/share/icons/hicolor/scalable/status/capslock-on.svg
+
+#----------------------------------------------------------------------------
+# Files marked as NO_LICENSE_TEXT_FOUND may be covered by the following
+# license/copyright files.
diff --git a/keyboard-leds-trayicons/debian/docs b/keyboard-leds-trayicons/debian/docs
new file mode 100644
index 0000000..b43bf86
--- /dev/null
+++ b/keyboard-leds-trayicons/debian/docs
@@ -0,0 +1 @@
+README.md
diff --git a/keyboard-leds-trayicons/debian/install b/keyboard-leds-trayicons/debian/install
new file mode 100644
index 0000000..2dfcee8
--- /dev/null
+++ b/keyboard-leds-trayicons/debian/install
@@ -0,0 +1,3 @@
+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.lintian-overrides b/keyboard-leds-trayicons/debian/keyboard-leds-trayicons.lintian-overrides
new file mode 100644
index 0000000..bc20712
--- /dev/null
+++ b/keyboard-leds-trayicons/debian/keyboard-leds-trayicons.lintian-overrides
@@ -0,0 +1 @@
+script-with-language-extension
diff --git a/keyboard-leds-trayicons/debian/keyboard-leds-trayicons_devuan.dsc b/keyboard-leds-trayicons/debian/keyboard-leds-trayicons_devuan.dsc
new file mode 100644
index 0000000..62cf13c
--- /dev/null
+++ b/keyboard-leds-trayicons/debian/keyboard-leds-trayicons_devuan.dsc
@@ -0,0 +1,14 @@
+Format: 3.0 (quilt)
+Source: keyboard-leds-trayicons
+Binary: keyboard-leds-trayicons
+Architecture: all
+Version: 0.0.1-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
+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
diff --git a/keyboard-leds-trayicons/debian/patches/series b/keyboard-leds-trayicons/debian/patches/series
new file mode 100644
index 0000000..4a97dfa
--- /dev/null
+++ b/keyboard-leds-trayicons/debian/patches/series
@@ -0,0 +1 @@
+# You must remove unused comment lines for the released package.
diff --git a/keyboard-leds-trayicons/debian/rules b/keyboard-leds-trayicons/debian/rules
new file mode 100755
index 0000000..71c2727
--- /dev/null
+++ b/keyboard-leds-trayicons/debian/rules
@@ -0,0 +1,49 @@
+#!/usr/bin/make -f
+# You must remove unused comment lines for the released package.
+#export DH_VERBOSE = 1
+#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+#export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
+#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+
+export name=keyboard-leds-trayicons
+export debuilddir="debian"
+export buildroot="${debuilddir}/${name}"
+export _datadir="/usr/share"
+export _bindir="/usr/bin"
+export _indir="/usr/share/icons/hicolor/scalable/status"
+
+%:
+	dh $@
+
+override_dh_auto_install:
+	dh_auto_install
+
+	mkdir -p ${buildroot}${_datadir}/icons/hicolor/16x16/status
+	mkdir -p ${buildroot}${_datadir}/icons/hicolor/32x32/status
+	mkdir -p ${buildroot}${_datadir}/icons/hicolor/48x48/status
+	mkdir -p ${buildroot}${_datadir}/icons/hicolor/64x64/status
+	mkdir -p ${buildroot}${_datadir}/icons/hicolor/128x128/status
+
+	convert -filter Lanczos -resize 16x16 -background none -antialias src${_indir}/capslock-on.svg ${buildroot}${_datadir}/icons/hicolor/16x16/status/capslock-on.png
+	convert -filter Lanczos -resize 32x32 -background none -antialias src${_indir}/capslock-on.svg ${buildroot}${_datadir}/icons/hicolor/32x32/status/capslock-on.png
+	convert -filter Lanczos -resize 48x48 -background none -antialias src${_indir}/capslock-on.svg ${buildroot}${_datadir}/icons/hicolor/48x48/status/capslock-on.png
+	convert -filter Lanczos -resize 64x64 -background none -antialias src${_indir}/capslock-on.svg ${buildroot}${_datadir}/icons/hicolor/64x64/status/capslock-on.png
+	convert -filter Lanczos -resize 128x128 -background none -antialias src${_indir}/capslock-on.svg ${buildroot}${_datadir}/icons/hicolor/128x128/status/capslock-on.png
+
+	convert -filter Lanczos -resize 16x16 -background none -antialias src${_indir}/capslock-off.svg ${buildroot}${_datadir}/icons/hicolor/16x16/status/capslock-off.png
+	convert -filter Lanczos -resize 32x32 -background none -antialias src${_indir}/capslock-off.svg ${buildroot}${_datadir}/icons/hicolor/32x32/status/capslock-off.png
+	convert -filter Lanczos -resize 48x48 -background none -antialias src${_indir}/capslock-off.svg ${buildroot}${_datadir}/icons/hicolor/48x48/status/capslock-off.png
+	convert -filter Lanczos -resize 64x64 -background none -antialias src${_indir}/capslock-off.svg ${buildroot}${_datadir}/icons/hicolor/64x64/status/capslock-off.png
+	convert -filter Lanczos -resize 128x128 -background none -antialias src${_indir}/capslock-off.svg ${buildroot}${_datadir}/icons/hicolor/128x128/status/capslock-off.png
+
+	convert -filter Lanczos -resize 16x16 -background none -antialias src${_indir}/numlock-on.svg ${buildroot}${_datadir}/icons/hicolor/16x16/status/numlock-on.png
+	convert -filter Lanczos -resize 32x32 -background none -antialias src${_indir}/numlock-on.svg ${buildroot}${_datadir}/icons/hicolor/32x32/status/numlock-on.png
+	convert -filter Lanczos -resize 48x48 -background none -antialias src${_indir}/numlock-on.svg ${buildroot}${_datadir}/icons/hicolor/48x48/status/numlock-on.png
+	convert -filter Lanczos -resize 64x64 -background none -antialias src${_indir}/numlock-on.svg ${buildroot}${_datadir}/icons/hicolor/64x64/status/numlock-on.png
+	convert -filter Lanczos -resize 128x128 -background none -antialias src${_indir}/numlock-on.svg ${buildroot}${_datadir}/icons/hicolor/128x128/status/numlock-on.png
+
+	convert -filter Lanczos -resize 16x16 -background none -antialias src${_indir}/numlock-off.svg ${buildroot}${_datadir}/icons/hicolor/16x16/status/numlock-off.png
+	convert -filter Lanczos -resize 32x32 -background none -antialias src${_indir}/numlock-off.svg ${buildroot}${_datadir}/icons/hicolor/32x32/status/numlock-off.png
+	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
diff --git a/keyboard-leds-trayicons/debian/source/format b/keyboard-leds-trayicons/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/keyboard-leds-trayicons/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/keyboard-leds-trayicons/debian/source/lintian-overrides b/keyboard-leds-trayicons/debian/source/lintian-overrides
new file mode 100644
index 0000000..aa10b71
--- /dev/null
+++ b/keyboard-leds-trayicons/debian/source/lintian-overrides
@@ -0,0 +1 @@
+file-without-copyright-information
diff --git a/keyboard-leds-trayicons/debian/source/local-options b/keyboard-leds-trayicons/debian/source/local-options
new file mode 100644
index 0000000..00131ee
--- /dev/null
+++ b/keyboard-leds-trayicons/debian/source/local-options
@@ -0,0 +1,2 @@
+#abort-on-upstream-changes
+#unapply-patches
diff --git a/keyboard-leds-trayicons/debian/watch b/keyboard-leds-trayicons/debian/watch
new file mode 100644
index 0000000..8c60b19
--- /dev/null
+++ b/keyboard-leds-trayicons/debian/watch
@@ -0,0 +1,4 @@
+# You must remove unused comment lines for the released package.
+version=4
+https://gitlab.com/bgstack15/keyboard-leds-trayicons/tags?sort=updated_desc .*/archive/(\d\S+)/.*\.tar\.gz.*
+
diff --git a/mktrayicon/README.md b/mktrayicon/README.md
new file mode 100644
index 0000000..d62688d
--- /dev/null
+++ b/mktrayicon/README.md
@@ -0,0 +1,20 @@
+# Readme for mktrayicon
+
+## mktrayicon upstream
+[https://gitlab.com/bgstack15/mktrayicon/](https://gitlab.com/bgstack15/mktrayicon/)
+
+## Alternatives
+This package is based on my fork of an [original upstream](https://github.com/jonhoo/mktrayicon). I still monitor that one a little bit, but this fork is also distinctly my own.
+
+## Reason for being in stackrpms
+No one packages this small project for any distros that I know of.
+
+## Reverse dependency matrix
+Distro     | mktrayicon version
+---------- | ---------------
+All dpkg   | 0.0.1
+
+## Differences from upstream
+My version of mktrayicon includes a few merge requests that have been ignored by the original upstream:
+* middle-click and scroll
+* separators in menu
diff --git a/mktrayicon/debian/README.Debian b/mktrayicon/debian/README.Debian
index 799ae81..8bf9d80 100644
--- a/mktrayicon/debian/README.Debian
+++ b/mktrayicon/debian/README.Debian
@@ -1,8 +1,5 @@
-mktrayicon for Debian
+mktrayicon for Devuan
 
-Please edit this to provide information specific to
-this mktrayicon Debian package.
+No upstream packages available. This is an original dpkg of mktrayicon.
 
-    (Automatically generated by debmake Version 4.3.1)
-
- -- Ben Stack <bgstack15@gmail.com>  Wed, 05 Feb 2020 09:25:31 -0500
+ -- Ben Stack <bgstack15@gmail.com>  Thu, 13 Feb 2020 09:53:31 -0500
diff --git a/mktrayicon/debian/changelog b/mktrayicon/debian/changelog
index 4238567..63454a1 100644
--- a/mktrayicon/debian/changelog
+++ b/mktrayicon/debian/changelog
@@ -1,5 +1,5 @@
-mktrayicon (0.0~git-1) UNRELEASED; urgency=low
+mktrayicon (0.0.1-1+devuan) obs; urgency=low
 
   * Initial release.
 
- -- Ben Stack <bgstack15@gmail.com>  Wed, 05 Feb 2020 09:25:31 -0500
+ -- Ben Stack <bgstack15@gmail.com>  Thu, 13 Feb 2020 09:53:31 -0500
diff --git a/mktrayicon/debian/control b/mktrayicon/debian/control
index 0dcaa7c..6876968 100644
--- a/mktrayicon/debian/control
+++ b/mktrayicon/debian/control
@@ -2,7 +2,7 @@ Source: mktrayicon
 Section: x11
 Priority: optional
 Maintainer: Ben Stack <bgstack15@gmail.com>
-Build-Depends: debhelper (>=11~),
+Build-Depends: debhelper (>=12~),
    go-md2man,
    libgtk-3-dev,
    libx11-dev
diff --git a/mktrayicon/debian/mktrayicon_0.0.1-1+devuan.dsc b/mktrayicon/debian/mktrayicon_0.0.1-1+devuan.dsc
new file mode 100644
index 0000000..fb9d780
--- /dev/null
+++ b/mktrayicon/debian/mktrayicon_0.0.1-1+devuan.dsc
@@ -0,0 +1,14 @@
+Format: 3.0 (quilt)
+Source: mktrayicon
+Binary: mktrayicon
+Architecture: any
+Version: 0.0.1-1+devuan
+Maintainer: Ben Stack <bgstack15@gmail.com>
+Homepage: https://github.com/jonhoo/mktrayicon/
+Standards-Version: 4.1.4
+Build-Depends: debhelper (>= 12~), go-md2man, libgtk-3-dev, libx11-dev
+Package-List:
+ mktrayicon deb x11 optional arch=any
+Files:
+ 00000000000000000000000000000000 1 mktrayicon_0.0.1.orig.tar.gz
+ 00000000000000000000000000000000 1 mktrayicon_0.0.1-1+devuan.debian.tar.xz
diff --git a/mktrayicon/debian/patches/Makefile.patch b/mktrayicon/debian/patches/Makefile.patch
deleted file mode 100644
index 25460fa..0000000
--- a/mktrayicon/debian/patches/Makefile.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -2,4 +2,4 @@ mktrayicon: mktrayicon.c
- 	${CC} `pkg-config --cflags gtk+-3.0` -o $@ $< `pkg-config --libs gtk+-3.0` `pkg-config --cflags --libs x11`
- 
- clean:
--	rm mktrayicon
-+	rm -f mktrayicon || :
diff --git a/mktrayicon/debian/patches/series b/mktrayicon/debian/patches/series
index cc55c1d..4a97dfa 100644
--- a/mktrayicon/debian/patches/series
+++ b/mktrayicon/debian/patches/series
@@ -1,2 +1 @@
 # You must remove unused comment lines for the released package.
-Makefile.patch
diff --git a/mktrayicon/debian/watch b/mktrayicon/debian/watch
index 76575dc..f6521f7 100644
--- a/mktrayicon/debian/watch
+++ b/mktrayicon/debian/watch
@@ -1,2 +1,4 @@
 # You must remove unused comment lines for the released package.
-version=3
+version=4
+#opts=filenamemangle=s/.*\/archive\/(\d\S+)\/mktra.*\.tar\.gz/systemdtl-$1\.tar\.gz/g \
+  https://gitlab.com/bgstack15/mktrayicon/tags?sort=updated_desc .*/archive/(\d\S+)/.*\.tar\.gz.*