diff -Nru onboard-keyman-1.4.1/debian/changelog onboard-keyman-1.4.2+onboard1.4.1/debian/changelog --- onboard-keyman-1.4.1/debian/changelog 2020-12-03 15:49:30.000000000 +0000 +++ onboard-keyman-1.4.2+onboard1.4.1/debian/changelog 2022-01-14 13:39:22.000000000 +0000 @@ -1,14 +1,19 @@ -onboard-keyman (1.4.1-5.0~bionic) bionic; urgency=medium +onboard-keyman (1.4.2+onboard1.4.1-5.0~bionic) bionic; urgency=medium + + * debian/control: + + Standards-Version 4.4.1 + + Add dependency debhelper-compat 12 + * source package for PPA + + -- Eberhard Beilharz Fri, 14 Jan 2022 14:39:22 +0100 + +onboard-keyman (1.4.1+onboard1.4.1-5) unstable; urgency=medium - [ Daniel Glassey ] * Local build for developing keyman integration * monitor ibus-kmfl on dbus * when keyman kb name changes change ldml file if it exists - [ Eberhard Beilharz ] - * source package for PPA - - -- Eberhard Beilharz Thu, 03 Dec 2020 16:49:30 +0100 + -- Daniel Glassey Fri, 17 Aug 2018 15:49:30 +0700 onboard (1.4.1-5) unstable; urgency=medium diff -Nru onboard-keyman-1.4.1/debian/compat onboard-keyman-1.4.2+onboard1.4.1/debian/compat --- onboard-keyman-1.4.1/debian/compat 2020-12-02 16:27:28.000000000 +0000 +++ onboard-keyman-1.4.2+onboard1.4.1/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -11 diff -Nru onboard-keyman-1.4.1/debian/control onboard-keyman-1.4.2+onboard1.4.1/debian/control --- onboard-keyman-1.4.1/debian/control 2020-12-02 16:27:28.000000000 +0000 +++ onboard-keyman-1.4.2+onboard1.4.1/debian/control 2022-01-12 17:32:02.000000000 +0000 @@ -1,7 +1,7 @@ Source: onboard-keyman Section: gnome Priority: optional -Build-Depends: debhelper (>= 11), +Build-Depends: debhelper-compat (= 12), dh-python, libcanberra-dev, libdconf-dev (>= 0.12.0), @@ -16,7 +16,7 @@ python3-distutils-extra (>= 2.10), python3-gi, Maintainer: Eberhard Beilharz -Standards-Version: 4.5.0 +Standards-Version: 4.4.1 Rules-Requires-Root: no Homepage: https://github.com/keymanapp/onboard-keyman Vcs-Browser: https://github.com/keymanapp/onboard-keyman diff -Nru onboard-keyman-1.4.1/debian/copyright onboard-keyman-1.4.2+onboard1.4.1/debian/copyright --- onboard-keyman-1.4.1/debian/copyright 2020-12-01 16:55:04.000000000 +0000 +++ onboard-keyman-1.4.2+onboard1.4.1/debian/copyright 2022-01-14 11:03:38.000000000 +0000 @@ -264,6 +264,10 @@ 2010, 2013, Francesco Fumanti License: GPL-3+ +Files: Onboard/Keyman.py +Copyright: 2018 Daniel Glassey +License: GPL-3+ + Files: data/* Copyright: 2011-2015, marmuta 2012, Gerd Kohlberger @@ -356,6 +360,11 @@ while the original strings remain under the license of the file they were extracted from. +Files: .gitignore + scripts/launchpad.sh +Copyright: 2018-2022, SIL International +License: GPL-3+ + Files: setup.py Copyright: 2011-2016, marmuta 2009-2016, Francesco Fumanti diff -Nru onboard-keyman-1.4.1/debian/rules onboard-keyman-1.4.2+onboard1.4.1/debian/rules --- onboard-keyman-1.4.1/debian/rules 2020-12-02 16:27:28.000000000 +0000 +++ onboard-keyman-1.4.2+onboard1.4.1/debian/rules 2022-01-14 11:03:38.000000000 +0000 @@ -1,9 +1,8 @@ #!/usr/bin/make -f DH_VERBOSE=1 -export PYBUILD_NAME=onboard export PYBUILD_INSTALL_ARGS=--root=$(CURDIR)/debian/tmp -export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-pie +export DEB_BUILD_MAINT_OPTIONS=hardening=+all %: dh $@ --with python3 --buildsystem=pybuild diff -Nru onboard-keyman-1.4.1/.gitignore onboard-keyman-1.4.2+onboard1.4.1/.gitignore --- onboard-keyman-1.4.1/.gitignore 2020-12-02 10:08:24.000000000 +0000 +++ onboard-keyman-1.4.2+onboard1.4.1/.gitignore 2021-07-22 15:49:53.000000000 +0000 @@ -4,11 +4,15 @@ *.debhelper *.log *.substvars -.gitignore +*.so debian/files debian/gnome-shell-extension-onboard/ debian/onboard-common/ debian/onboard-data/ debian/onboard/ +debian/onboard-keyman-common/ +debian/onboard-keyman-data/ +debian/onboard-keyman/ debian/tmp/ po/onboard.pot +__pycache__/ \ No newline at end of file diff -Nru onboard-keyman-1.4.1/Onboard/Keyman.py onboard-keyman-1.4.2+onboard1.4.1/Onboard/Keyman.py --- onboard-keyman-1.4.1/Onboard/Keyman.py 2020-12-02 10:08:24.000000000 +0000 +++ onboard-keyman-1.4.2+onboard1.4.1/Onboard/Keyman.py 2021-05-12 16:50:50.000000000 +0000 @@ -69,7 +69,7 @@ Keyman D-bus control and signal handling. """ __gsignals__ = { - 'keyman-changed': (GObject.SIGNAL_RUN_FIRST, None, ()) + str('keyman-changed'): (GObject.SIGNAL_RUN_FIRST, GObject.TYPE_NONE, ()) } # MOUSE_A11Y_SCHEMA_ID = "org.gnome.desktop.a11y.mouse" @@ -203,7 +203,7 @@ # def unset_labels(self): # self.key_labels = None - def on_keyboard_changed(keyboardid): + def on_keyboard_changed(self, keyboardid): #reload_labels() self.emit("keyman-changed", keyboardid) diff -Nru onboard-keyman-1.4.1/Onboard/OnboardGtk.py onboard-keyman-1.4.2+onboard1.4.1/Onboard/OnboardGtk.py --- onboard-keyman-1.4.1/Onboard/OnboardGtk.py 2020-12-02 10:08:24.000000000 +0000 +++ onboard-keyman-1.4.2+onboard1.4.1/Onboard/OnboardGtk.py 2021-05-12 15:45:58.000000000 +0000 @@ -34,7 +34,7 @@ from Onboard.Version import require_gi_versions require_gi_versions() -from gi.repository import GLib, Gdk, Gtk, GObject +from gi.repository import GLib, Gdk, Gtk try: import dbus @@ -43,7 +43,7 @@ from Onboard.DBusUtils import ServiceBase, dbus_property has_dbus = True except ImportError: - has_dbus = False + has_dbus = False from Onboard.KbdWindow import KbdWindow, KbdPlugWindow from Onboard.Keyboard import Keyboard diff -Nru onboard-keyman-1.4.1/scripts/launchpad.sh onboard-keyman-1.4.2+onboard1.4.1/scripts/launchpad.sh --- onboard-keyman-1.4.1/scripts/launchpad.sh 2020-12-03 15:48:32.000000000 +0000 +++ onboard-keyman-1.4.2+onboard1.4.1/scripts/launchpad.sh 2022-01-11 17:37:18.000000000 +0000 @@ -4,8 +4,8 @@ # parameters: [UPLOAD="yes"] [DIST=""] [PPA="keyman"] [PACKAGEVERSION=""] ./scripts/launchpad.sh # UPLOAD="yes" do the dput for real. Default: no. # DIST="" only upload for this distribution. Multiple distros are possible, -# separated by space. Default: "bionic focal groovy" -# PPA="keyman" PPA under keymanapp to upload to. Default: keyman-daily. +# separated by space. Default: "bionic focal groovy hirsute" +# PPA="keyman" PPA under keymanapp to upload to. Default: keyman-alpha. # PACKAGEVERSION="" string to append to the package version. Default: 0 set -e @@ -19,13 +19,13 @@ if [ "${DIST}" != "" ]; then distributions="${DIST}" else - distributions="bionic focal groovy" + distributions="bionic focal impish jammy" fi if [ "${PPA}" != "" ]; then ppa="ppa:keymanapp/$PPA" else - ppa="ppa:keymanapp/keyman-daily" + ppa="ppa:keymanapp/keyman-alpha" fi if [ "${PACKAGEVERSION}" != "" ]; then @@ -44,11 +44,19 @@ onboard_version=$(dpkg-parsechangelog -l onboard-keyman/debian/changelog --show-field=Version | cut -d '-' -f 1) echo "Base version: $onboard_version, package version: $version" rm -rf onboard-keyman-${onboard_version} -rm -rf onboard-keyman_* -cp -a onboard-keyman onboard-keyman-${onboard_version} -rm -rf onboard-keyman-${onboard_version}/debian -rm -rf onboard-keyman-${onboard_version}/.git -tar -czf onboard-keyman_${onboard_version}.orig.tar.gz onboard-keyman-${onboard_version} + +if [ -f onboard-keyman_${onboard_version}.orig.tar.gz ]; then + # Existing .orig.tar.gz file can be downloaded with `apt source onboard-keyman` + # NOTE: this file has to be in the parent directory of the onboard-keyman root + echo "Using existing 'onboard-keyman_${onboard_version}.orig.tar.gz' file" + tar -xzf onboard-keyman_${onboard_version}.orig.tar.gz +else + rm -rf onboard-keyman_* + cp -a onboard-keyman onboard-keyman-${onboard_version} + rm -rf onboard-keyman-${onboard_version}/debian + rm -rf onboard-keyman-${onboard_version}/.git + tar -czf onboard-keyman_${onboard_version}.orig.tar.gz onboard-keyman-${onboard_version} +fi cp -a onboard-keyman/debian onboard-keyman-${onboard_version}/ diff -Nru onboard-keyman-1.4.1/setup.py onboard-keyman-1.4.2+onboard1.4.1/setup.py --- onboard-keyman-1.4.1/setup.py 2020-12-02 10:08:24.000000000 +0000 +++ onboard-keyman-1.4.2+onboard1.4.1/setup.py 2022-01-12 17:44:22.000000000 +0000 @@ -230,11 +230,13 @@ extra_compile_args = [ "-Wsign-compare", "-Wdeclaration-after-statement", - "-Werror=declaration-after-statement"], + "-Werror=declaration-after-statement", + #"-fPIC" + ], **pkgconfig('gdk-3.0', 'x11', 'xi', 'xtst', 'xkbfile', 'dconf', 'libcanberra', 'hunspell', - 'libudev') + 'libudev', 'python3-embed') ) extension_osk = Extension_osk()