On Mon, 27 Jan 2020 15:18:15 +0900 NOKUBI Takatsugu <k...@daionet.gr.jp> wrote: > We uim maintainers had an another probrem #945344. > The last update registers unusable uim modules.
The last diff lacks some commits, here is a new diff. https://salsa.debian.org/debian/uim/snippets/386 diff --git a/debian/changelog b/debian/changelog index 9b9b64b..74ffc2c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +uim (1:1.8.8-4+deb10u3) buster; urgency=medium + + * Non-maintainer upload. + + [ NOKUBI Takatsugu ] + * d/libuim-data.postint: add uim-mozc (See #939588) + + [ HIGUCHI Daisuke (VDR dai) ] + * d/libuim-data.postint: add uim-chewing + + [ YOSHINO Yoshihito ] + * d/libuim-data.postinst: unregister not-installed modules (Closes: #945344). + The previous upload to fix #939588 caused regression, which has + accidentally registered some not-installed modules. + + -- YOSHINO Yoshihito <yy.y.ja...@gmail.com> Sun, 12 Jan 2020 19:42:26 +0900 + uim (1:1.8.8-4+deb10u2) buster; urgency=medium [ HIGUCHI Daisuke (VDR dai) ] diff --git a/debian/libuim-data.postinst b/debian/libuim-data.postinst index b0480fd..fd3891e 100755 --- a/debian/libuim-data.postinst +++ b/debian/libuim-data.postinst @@ -1,9 +1,19 @@ #!/bin/sh +register_module_was_broken=false + register_module() { PKGNAME=$1 MODNAME=$2 - dpkg-query -W -f='${Status}\n' $PKGNAME 2>/dev/null | grep "not-installed" > /dev/null + QSTRING=$(dpkg-query -W -f='${Status}\n' $PKGNAME 2>/dev/null) + if [ $? = "1" ] + then + if $register_module_was_broken; then + uim-module-manager --unregister $MODNAME --path /var/lib/uim + fi + return 0 + fi + echo $QSTRING | grep "not-installed" > /dev/null if [ $? = "1" ] then uim-module-manager --register $MODNAME --path /var/lib/uim @@ -12,6 +22,17 @@ register_module() { case "$1" in configure) + if dpkg --compare-versions "$2" lt-nl "1:1.8.8-4+deb10u2.1" && \ + dpkg --compare-versions "$2" gt "1:1.8.8-4"; then + # buster + register_module_was_broken=true + fi + if dpkg --compare-versions "$2" lt-nl "1:1.8.8-6.1~" && \ + dpkg --compare-versions "$2" gt "1:1.8.8-5~"; then + # bullseye/sid + register_module_was_broken=true + fi + if which uim-module-manager >/dev/null 2>&1; then register_module uim-anthy anthy-utf8 register_module uim-byeoru byeoru @@ -24,6 +45,8 @@ case "$1" in register_module uim-skk skk register_module uim-tcode tutcode register_module uim-viqr viqr + register_module uim-mozc mozc + register_module uim-chewing chewing fi ;; @@ -37,4 +60,4 @@ case "$1" in ;; esac -exit 0 \ No newline at end of file +exit 0
