erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-05 00:15:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

chore(linux): Fix lintian warnings

Browse source 
Also improve upload script to force push changelog branches.
Lintian v2.115 (which is run on Debian servers) still produces
pedantic warnings, but there seems to be a bug - no matter what
pattern I add to `lintian-overrides`, I can't get it to ignore
the files. The following version v2.116 has these rules built in,
so we don't need `lintian-overrides` anymore.

(cherry picked from commit 134e084b80)
This commit is contained in:
Eberhard Beilharz 2023-02-02 10:46:26 +01:00
parent 157b5aa49e
commit d1cd46be41
No known key found for this signature in database
GPG key ID: E9140597606020D3
4 changed files with 10 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
docs/settings/linux/extensions.json
View file

@ -9,5 +9,6 @@
"timonwong.shellcheck",
"maelvalais.autoconf",
"webfreak.debug",
"dawidd6.debian-vscode",
]
}

14
linux/debian/copyright
View file

@ -4,24 +4,24 @@ Upstream-Contact: Keyman team <support@keyman.com>
Source: https://github.com/keymanapp/keyman
Files: *
Copyright: 2018-2022 SIL International
Copyright: 2018-2023 SIL International
License: MIT
Files: linux/ibus-keyman/*
Copyright: 2004-2022 SIL International
Copyright: 2004-2023 SIL International
License: GPL-2+
Files: linux/ibus-keyman/src/keymanutil.c
linux/ibus-keyman/src/keymanutil.h
linux/ibus-keyman/src/kmpdetails.c
linux/ibus-keyman/src/kmpdetails.h
Copyright: 2009-2022 SIL International
Copyright: 2009-2023 SIL International
License: GPL-2+ or MIT
Files: linux/ibus-keyman/src/keyman-service.c
linux/ibus-keyman/src/keyman-service.h
linux/keyman-config/buildtools/help2md
Copyright: 2018-2022 SIL International
Copyright: 2018-2023 SIL International
License: GPL-3+
Files: linux/ibus-keyman/config.rpath
@ -49,7 +49,7 @@ Files: linux/ibus-keyman/Makefile.am
linux/ibus-keyman/tests/Makefile.am
linux/ibus-keyman/tests/Makefile.in
Copyright: 1994-2017, Free Software Foundation, Inc.
2009-2022, SIL International
2009-2023, SIL International
License: GPL-2+
Files: linux/ibus-keyman/m4/gettext.m4
@ -87,7 +87,7 @@ Copyright: 2008-2010, Peng Huang <shawn.p.huang@gmail.com>
2008-2013, Peng Huang <shawn.p.huang@gmail.com>
2008-2021, Red Hat, Inc.
2015-2021, Takao Fujiwara <takao.fujiwara1@gmail.com>
2021-2022, SIL International
2021-2023, SIL International
License: LGPL-2.1+
Files: linux/keyman-config/buildtools/help2man
@ -97,7 +97,7 @@ License: GPL-3+
Files: debian/com.keyman.config.appdata.xml
debian/com.keyman.ibus_keyman.metainfo.xml
Copyright: 2019 Daniel Glassey <wdg@debian.org>
2022 SIL International
2022-2023 SIL International
License: MIT
License: MIT

10
linux/debian/source/lintian-overrides
View file

@ -1,10 +0,0 @@
# Lintian overrides
keyman source: very-long-line-length-in-source-file CONTRIBUTING.md *
keyman source: very-long-line-length-in-source-file linux/ibus-keyman/configure *
keyman source: very-long-line-length-in-source-file linux/ibus-keyman/m4/* *
keyman source: very-long-line-length-in-source-file linux/ibus-keyman/tests/Makefile.in *
keyman source: very-long-line-length-in-source-file resources/standards-data/langtags/langtags.json *
# Looks like /usr/libexec/ibus-engine-keyman is not recognized as binary for the man page,
# so ignore that rule
spare-manual-page

4
linux/scripts/upload-to-debian.sh
View file

@ -104,7 +104,7 @@ cp debianpackage/keyman-*/debian/changelog debian/
git add debian/changelog
git commit -m "chore(linux): Update debian changelog"
if [ -n "$PUSH" ]; then
$NOOP git push origin chore/linux/changelog
$NOOP git push --force-with-lease origin chore/linux/changelog
fi
if $ISBETA; then
@ -116,7 +116,7 @@ fi
git checkout -B chore/linux/cherry-pick/changelog ${CLBRANCH}
git cherry-pick -x chore/linux/changelog
if [ -n "$PUSH" ]; then
$NOOP git push origin chore/linux/cherry-pick/changelog
$NOOP git push --force-with-lease origin chore/linux/cherry-pick/changelog
fi
echo_heading "Finishing"