[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1033571: unblock: keyman/16.0.139-4



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: debian-input-method@lists.debian.org, eb1@sil.org

Please unblock package keyman.

[ Reason ]

While keyman has autopkgtests and so would qualify for automatic migration, the tests are skipped on s390x.
The reason is that Keyman doesn't yet support big endian architecture and so can't run on s390x (even though it's
possible to build it on that platform it won't work). See upstream bug https://github.com/keymanapp/keyman/issues/5111.

Included are only small changes: one is a small fix in the postinst script, the other is an update of a timestamp in a
locale. It also excludes s390x from building since that makes more sense than building an unusable library.

Another reason why I'd like to get this version approved is that it brings the version in Debian on par with the upstream
version which simplifies user help requests.

[ Impact ]

The user won't notice any difference, but it would be helpful for the support team if the users would use the same version
that is used on the other platforms.

[ Tests ]

Manually installed the binaries and verified that things work as expected.

[ Risks ]

Changes are minimal. I can't think of any negative side effects.

[ Checklist ]

  [x] all changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in testing

unblock keyman/16.0.139-4

diff -Nru keyman-16.0.138/core/VERSION.md keyman-16.0.139/core/VERSION.md
--- keyman-16.0.138/core/VERSION.md	2023-02-01 04:55:31.000000000 +0100
+++ keyman-16.0.139/core/VERSION.md	2023-03-16 08:24:24.000000000 +0100
@@ -1 +1 @@
-16.0.138
\ No newline at end of file
+16.0.139
\ No newline at end of file
diff -Nru keyman-16.0.138/crowdin.yml keyman-16.0.139/crowdin.yml
--- keyman-16.0.138/crowdin.yml	2023-01-31 19:04:42.000000000 +0100
+++ keyman-16.0.139/crowdin.yml	2023-03-16 08:22:51.000000000 +0100
@@ -59,6 +59,7 @@
       locale:
         de: de
         fr: fr
+        kn: kn
 
   - source: /windows/src/desktop/setup/locale/en/strings.xml
     dest: /windows/setup/strings.xml
@@ -68,6 +69,7 @@
       locale:
         de: de
         fr: fr
+        kn: kn
 
   # iOS files
 
diff -Nru keyman-16.0.138/debian/changelog keyman-16.0.139/debian/changelog
--- keyman-16.0.138/debian/changelog	2023-02-11 18:39:13.000000000 +0100
+++ keyman-16.0.139/debian/changelog	2023-03-24 16:05:07.000000000 +0100
@@ -1,3 +1,29 @@
+keyman (16.0.139-4) unstable; urgency=medium
+
+  * debian/tests: Revert previous change and ignore s390x from autopkgtests
+
+ -- Eberhard Beilharz <eb1@sil.org>  Fri, 24 Mar 2023 16:05:07 +0100
+
+keyman (16.0.139-3) unstable; urgency=medium
+
+  * debian/tests: Run autopkgtests on s390x but immediately return
+
+ -- Eberhard Beilharz <eb1@sil.org>  Wed, 22 Mar 2023 19:25:02 +0100
+
+keyman (16.0.139-2) unstable; urgency=medium
+
+  * Don't build on s390x because Keyman doesn't work on big-endian architectures
+    (upstream bug https://github.com/keymanapp/keyman/issues/5111)
+
+ -- Eberhard Beilharz <eb1@sil.org>  Mon, 20 Mar 2023 19:54:44 +0100
+
+keyman (16.0.139-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Re-release to Debian
+
+ -- Eberhard Beilharz <eb1@sil.org>  Thu, 16 Mar 2023 08:59:04 +0100
+
 keyman (16.0.138-4) unstable; urgency=medium
 
   * Team upload
diff -Nru keyman-16.0.138/debian/control keyman-16.0.139/debian/control
--- keyman-16.0.138/debian/control	2023-02-09 12:17:16.000000000 +0100
+++ keyman-16.0.139/debian/control	2023-03-20 20:02:09.000000000 +0100
@@ -105,7 +105,7 @@
  information about Keyman keyboard packages.
 
 Package: libkmnkbp-dev
-Architecture: any
+Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el riscv64
 Section: libdevel
 Depends:
  libkmnkbp0-0 (= ${binary:Version}),
@@ -129,7 +129,7 @@
  This package contains development headers and libraries.
 
 Package: libkmnkbp0-0
-Architecture: any
+Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el riscv64
 Section: libs
 Pre-Depends:
  ${misc:Pre-Depends},
@@ -155,7 +155,7 @@
  and applies rules from compiled Keyman keyboard files.
 
 Package: ibus-keyman
-Architecture: any
+Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el riscv64
 Depends:
  ibus (>= 1.3.7),
  sudo,
diff -Nru keyman-16.0.138/debian/ibus-keyman.postinst keyman-16.0.139/debian/ibus-keyman.postinst
--- keyman-16.0.138/debian/ibus-keyman.postinst	2023-02-09 12:17:16.000000000 +0100
+++ keyman-16.0.139/debian/ibus-keyman.postinst	2023-03-16 08:57:27.000000000 +0100
@@ -1,10 +1,13 @@
 #!/bin/sh
 
-set -e
+# Don't call `set -e`. Even if some commands should fail, it's still
+# worth running the rest of the commands.
 
 case "$1" in
 
   configure)
+    # (Re-)Start IBus
+
     # if don't have sudo and ps then don't attempt to restart ibus
     if which sudo > /dev/null && which ps > /dev/null; then
 
@@ -37,20 +40,20 @@
       fi
 
       # Verify that it's running now
-      if [ ! -z $SUDO_USER ] && id $SUDO_USER > /dev/null 2>/dev/null; then
-        ! ibusdaemon=$(ps --user $SUDO_USER -o s= -o cmd | grep --regexp="^[^ZT] ibus-daemon .*--xim.*")
-        if [ "x$ibusdaemon" = "x" ]; then
+      if [ -n "$SUDO_USER" ] && id "$SUDO_USER" > /dev/null 2>/dev/null; then
+        ibusdaemon=$(ps --user "$SUDO_USER" -o s= -o cmd | grep --regexp="^[^ZT] \(/usr/bin/\)\?ibus-daemon .*--xim.*")
+        if [ "$ibusdaemon" = "" ]; then
           # otherwise try to start it for the user installing the package
-          if [ "x$is_gnome_shell" = "x1" ]; then
-            for session in $(loginctl show-user ${SUDO_USER} -p Sessions --value); do
-              case $(loginctl show-session ${session} -p Type --value) in
-                wayland) sudo -H -u "${SUDO_USER}" -i WAYLAND_DISPLAY=wayland-0 -- ibus-daemon -d -r --xim --panel disable;;
-                x11) sudo -H -u "${SUDO_USER}" -- ibus-daemon -d -r --xim --panel disable;;
+          if [ "$is_gnome_shell" = "1" ]; then
+            for session in $(loginctl show-user "${SUDO_USER}" -p Sessions --value); do
+              case $(loginctl show-session "${session}" -p Type --value) in
+                wayland) sudo -H -u "${SUDO_USER}" -i WAYLAND_DISPLAY=wayland-0 -- /usr/bin/ibus-daemon -d -r --xim --panel disable;;
+                x11) sudo -H -u "${SUDO_USER}" -- /usr/bin/ibus-daemon -d -r --xim --panel disable;;
                 *) ;;
               esac
             done
           else
-            sudo -H -u "${SUDO_USER}" -- ibus-daemon -d -r --xim
+            sudo -H -u "${SUDO_USER}" -- /usr/bin/ibus-daemon -d -r --xim
           fi
         fi
       fi
diff -Nru keyman-16.0.138/HISTORY.md keyman-16.0.139/HISTORY.md
--- keyman-16.0.138/HISTORY.md	2023-02-01 03:59:23.000000000 +0100
+++ keyman-16.0.139/HISTORY.md	2023-03-16 08:22:51.000000000 +0100
@@ -1,5 +1,9 @@
 # Keyman Version History
 
+## 16.0.138 stable 2023-02-01
+
+* chore: add new developer build trigger (#8139)
+
 ## 16.0.137 stable 2023-02-01
 
 * chore(common): Release 16.0
diff -Nru keyman-16.0.138/linux/ibus-keyman/configure keyman-16.0.139/linux/ibus-keyman/configure
--- keyman-16.0.138/linux/ibus-keyman/configure	2023-02-01 04:55:30.000000000 +0100
+++ keyman-16.0.139/linux/ibus-keyman/configure	2023-03-16 08:24:22.000000000 +0100
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ibus-keyman 16.0.138.
+# Generated by GNU Autoconf 2.69 for ibus-keyman 16.0.139.
 #
 # Report bugs to <https://github.com/keymanapp/keyman/issues/new>.
 #
@@ -590,8 +590,8 @@
 # Identity of this package.
 PACKAGE_NAME='ibus-keyman'
 PACKAGE_TARNAME='ibus-keyman'
-PACKAGE_VERSION='16.0.138'
-PACKAGE_STRING='ibus-keyman 16.0.138'
+PACKAGE_VERSION='16.0.139'
+PACKAGE_STRING='ibus-keyman 16.0.139'
 PACKAGE_BUGREPORT='https://github.com/keymanapp/keyman/issues/new'
 PACKAGE_URL=''
 
@@ -1388,7 +1388,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ibus-keyman 16.0.138 to adapt to many kinds of systems.
+\`configure' configures ibus-keyman 16.0.139 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1459,7 +1459,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ibus-keyman 16.0.138:";;
+     short | recursive ) echo "Configuration of ibus-keyman 16.0.139:";;
    esac
   cat <<\_ACEOF
 
@@ -1601,7 +1601,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ibus-keyman configure 16.0.138
+ibus-keyman configure 16.0.139
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2137,7 +2137,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ibus-keyman $as_me 16.0.138, which was
+It was created by ibus-keyman $as_me 16.0.139, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3002,7 +3002,7 @@
 
 # Define the identity of the package.
  PACKAGE='ibus-keyman'
- VERSION='16.0.138'
+ VERSION='16.0.139'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -20277,7 +20277,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ibus-keyman $as_me 16.0.138, which was
+This file was extended by ibus-keyman $as_me 16.0.139, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20343,7 +20343,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-ibus-keyman config.status 16.0.138
+ibus-keyman config.status 16.0.139
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff -Nru keyman-16.0.138/linux/keyman-config/keyman_config/version.py keyman-16.0.139/linux/keyman-config/keyman_config/version.py
--- keyman-16.0.138/linux/keyman-config/keyman_config/version.py	2023-02-01 04:55:32.000000000 +0100
+++ keyman-16.0.139/linux/keyman-config/keyman_config/version.py	2023-03-16 08:24:25.000000000 +0100
@@ -4,8 +4,8 @@
 # 1) we don't load dependencies by storing it in __init__.py
 # 2) we can import it in setup.py for the same reason
 # 3) we can import it into your module module
-__version__ = "16.0.138"
-__versionwithtag__ = "16.0.138"
+__version__ = "16.0.139"
+__versionwithtag__ = "16.0.139"
 __majorversion__ = "16"
 __releaseversion__ = "16.0"
 __tier__ = "stable"
diff -Nru keyman-16.0.138/linux/keyman-config/locale/ff_ZA.po keyman-16.0.139/linux/keyman-config/locale/ff_ZA.po
--- keyman-16.0.138/linux/keyman-config/locale/ff_ZA.po	2023-01-31 19:04:44.000000000 +0100
+++ keyman-16.0.139/linux/keyman-config/locale/ff_ZA.po	2023-03-16 08:22:53.000000000 +0100
@@ -3,7 +3,7 @@
 "Project-Id-Version: keyman\n"
 "Report-Msgid-Bugs-To: <support@keyman.com>\n"
 "POT-Creation-Date: 2020-08-19 19:17+0200\n"
-"PO-Revision-Date: 2022-10-25 04:29\n"
+"PO-Revision-Date: 2023-02-17 01:51\n"
 "Last-Translator: \n"
 "Language-Team: Fula\n"
 "Language: ff_ZA\n"
diff -Nru keyman-16.0.138/linux/keyman-config/locale/kn_IN.po keyman-16.0.139/linux/keyman-config/locale/kn_IN.po
--- keyman-16.0.138/linux/keyman-config/locale/kn_IN.po	2023-01-31 19:04:44.000000000 +0100
+++ keyman-16.0.139/linux/keyman-config/locale/kn_IN.po	2023-03-16 08:22:53.000000000 +0100
@@ -3,7 +3,7 @@
 "Project-Id-Version: keyman\n"
 "Report-Msgid-Bugs-To: <support@keyman.com>\n"
 "POT-Creation-Date: 2020-08-19 19:17+0200\n"
-"PO-Revision-Date: 2023-01-03 04:05\n"
+"PO-Revision-Date: 2023-02-07 14:38\n"
 "Last-Translator: \n"
 "Language-Team: Kannada\n"
 "Language: kn_IN\n"
diff -Nru keyman-16.0.138/resources/build/trigger-builds.inc.sh keyman-16.0.139/resources/build/trigger-builds.inc.sh
--- keyman-16.0.138/resources/build/trigger-builds.inc.sh	2023-02-01 03:59:23.000000000 +0100
+++ keyman-16.0.139/resources/build/trigger-builds.inc.sh	2023-03-16 08:22:53.000000000 +0100
@@ -97,6 +97,7 @@
   if echo "$OUTPUT" | grep -q "\"triggered\":true"; then
     echo -n "     job triggered: "
   else
+    echo "##teamcity[buildProblem description='Triggering Jenkins build failed']"
     echo -n "     triggering failed: "
   fi
 
diff -Nru keyman-16.0.138/VERSION.md keyman-16.0.139/VERSION.md
--- keyman-16.0.138/VERSION.md	2023-02-01 04:54:14.000000000 +0100
+++ keyman-16.0.139/VERSION.md	2023-03-16 08:22:51.000000000 +0100
@@ -1 +1 @@
-16.0.138
\ No newline at end of file
+16.0.139
\ No newline at end of file

Attachment: OpenPGP_0xE9140597606020D3.asc
Description: OpenPGP public key

Attachment: OpenPGP_signature
Description: OpenPGP digital signature


Reply to: