diff -pruN 1.2.0-1/debian/changelog 1.2.0-1ubuntu1/debian/changelog --- 1.2.0-1/debian/changelog 2022-04-28 12:33:01.000000000 +0000 +++ 1.2.0-1ubuntu1/debian/changelog 2022-05-19 15:48:36.000000000 +0000 @@ -1,3 +1,9 @@ +pinentry (1.2.0-1ubuntu1) kinetic; urgency=medium + + * Don't build the Qt5-based pinentry on i386. + + -- Steve Langasek Thu, 19 May 2022 15:48:36 +0000 + pinentry (1.2.0-1) unstable; urgency=medium * New upstream release to unstable diff -pruN 1.2.0-1/debian/control 1.2.0-1ubuntu1/debian/control --- 1.2.0-1/debian/control 2022-04-28 12:19:21.000000000 +0000 +++ 1.2.0-1ubuntu1/debian/control 2022-05-19 15:48:36.000000000 +0000 @@ -1,7 +1,8 @@ Source: pinentry Section: utils Priority: optional -Maintainer: Debian GnuPG Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GnuPG Maintainers Uploaders: Daniel Kahn Gillmor , Build-Depends: @@ -14,7 +15,7 @@ Build-Depends: libgtk2.0-dev (>= 2.4.0), libncurses5-dev, libncursesw5-dev, - libqt5waylandclient5-dev, + libqt5waylandclient5-dev [!i386], libsecret-1-dev, m4, pkg-config, diff -pruN 1.2.0-1/debian/rules 1.2.0-1ubuntu1/debian/rules --- 1.2.0-1/debian/rules 2022-01-11 08:33:16.000000000 +0000 +++ 1.2.0-1ubuntu1/debian/rules 2022-05-19 15:47:57.000000000 +0000 @@ -5,6 +5,11 @@ export QT_SELECT SHARED_CONFIGS = --disable-rpath --without-libcap --disable-pinentry-emacs --disable-inside-emacs --enable-fallback-curses --disable-pinentry-tqt --disable-pinentry-efl export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +ifneq ($(DEB_HOST_ARCH), i386) + ENABLE_QT = --enable-pinentry-qt +endif + %: dh $@ @@ -13,7 +18,7 @@ override_dh_auto_configure: $(SHARED_CONFIGS) --disable-libsecret \ --enable-pinentry-tty \ --enable-pinentry-curses \ - --enable-pinentry-qt \ + $(ENABLE_QT) \ --enable-pinentry-fltk \ --disable-pinentry-gtk2 \ --disable-pinentry-gnome3