diff -Nru psi-plus-1.4.1456/debian/changelog psi-plus-1.4.1456/debian/changelog --- psi-plus-1.4.1456/debian/changelog 2021-01-27 02:51:16.000000000 +0100 +++ psi-plus-1.4.1456/debian/changelog 2025-01-30 14:35:10.000000000 +0100 @@ -1,3 +1,10 @@ +psi-plus (1.4.1456-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Move from qtwebkit to qtwebengine. (Closes: #1093526) + + -- Bastian Germann Thu, 30 Jan 2025 16:45:10 +0100 + psi-plus (1.4.1456-2) experimental; urgency=medium * Update debian/control: diff -Nru psi-plus-1.4.1456/debian/control psi-plus-1.4.1456/debian/control --- psi-plus-1.4.1456/debian/control 2021-01-27 02:51:16.000000000 +0100 +++ psi-plus-1.4.1456/debian/control 2025-01-30 14:35:10.000000000 +0100 @@ -10,12 +10,12 @@ libgstreamer1.0-dev, libhttp-parser-dev, libhunspell-dev, - libidn11-dev, + libidn-dev, libminizip-dev, libotr5-dev | libotr2-dev, libqca-qt5-2-dev, libqt5svg5-dev, - libqt5webkit5-dev, + qtwebengine5-dev [amd64 arm64 armhf i386 mips64el], libqt5x11extras5-dev, libsignal-protocol-c-dev, libsm-dev, @@ -70,7 +70,7 @@ https://psi-plus.com/wiki/en:features Package: psi-plus-webkit -Architecture: any +Architecture: amd64 arm64 armhf i386 mips64el Depends: libqca-qt5-2-plugins, libqt5sql5-sqlite, libsasl2-modules, @@ -83,8 +83,8 @@ psi-plus-sounds, sox Suggests: xdg-utils -Description: Qt-based XMPP client (WebKit version) - This package contains WebKit version of Psi+. In comparing with basic Psi+ +Description: Qt-based XMPP client (WebEngine version) + This package contains WebEngine version of Psi+. In comparing with basic Psi+ version it has few additional features: support of animated emoticons, support of (adium) themes in private chats and group chats, support of previewing of images and videos in private chats and group chats, etc.. @@ -113,7 +113,7 @@ Depends: ${misc:Depends} Multi-Arch: foreign Description: common files for Psi+ - This package contains common files for basic and webkit versions of Psi+. + This package contains common files for basic and webengine versions of Psi+. . Psi is a cross-platform powerful XMPP client designed for experienced users. User interface of program is very flexible in customization. For example, diff -Nru psi-plus-1.4.1456/debian/psi-plus-webkit.install psi-plus-1.4.1456/debian/psi-plus-webkit.install --- psi-plus-1.4.1456/debian/psi-plus-webkit.install 2021-01-27 02:51:16.000000000 +0100 +++ psi-plus-1.4.1456/debian/psi-plus-webkit.install 2025-01-30 14:35:10.000000000 +0100 @@ -1,2 +1,2 @@ -usr/bin/psi-plus-webkit -usr/share/applications/psi-plus-webkit.desktop +usr/bin/psi-plus-webengine +usr/share/applications/psi-plus-webengine.desktop diff -Nru psi-plus-1.4.1456/debian/rules psi-plus-1.4.1456/debian/rules --- psi-plus-1.4.1456/debian/rules 2021-01-27 02:51:16.000000000 +0100 +++ psi-plus-1.4.1456/debian/rules 2025-01-30 14:35:10.000000000 +0100 @@ -3,7 +3,9 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all BUILDDIR1 = $(CURDIR)/debian/builddir1 +ifneq (,$(filter $(DEB_HOST_ARCH),amd64 arm64 armhf i386 mips64el)) BUILDDIR2 = $(CURDIR)/debian/builddir2 +endif DESTDIR = $(CURDIR)/debian/tmp CMAKEOPTS = -DBUNDLED_IRIS=ON \ @@ -27,7 +29,7 @@ -DBUILD_DEV_PLUGINS=ON \ -DBUILD_PSIMEDIA=ON -OPTSSTEP2 = -DCHAT_TYPE=WEBKIT \ +OPTSSTEP2 = -DCHAT_TYPE=WEBENGINE \ -DENABLE_PLUGINS=OFF \ -DBUILD_PSIMEDIA=OFF @@ -39,21 +41,29 @@ override_dh_auto_configure: dh_auto_configure -B$(BUILDDIR1) -- $(CMAKEOPTS) $(OPTSSTEP1) +ifdef BUILDDIR2 dh_auto_configure -B$(BUILDDIR2) -- $(CMAKEOPTS) $(OPTSSTEP2) +endif override_dh_auto_build: dh_auto_build -B$(BUILDDIR1) +ifdef BUILDDIR2 dh_auto_build -B$(BUILDDIR2) +endif override_dh_auto_test: dh_auto_test -B$(BUILDDIR1) +ifdef BUILDDIR2 dh_auto_test -B$(BUILDDIR2) +endif override_dh_auto_install: dh_auto_install -B$(BUILDDIR1) --destdir=$(DESTDIR) - ln -s psi-plus.png $(DESTDIR)/usr/share/pixmaps/psi-plus-webkit.png - cp -a $(BUILDDIR2)/psi/psi-plus-webkit $(DESTDIR)/usr/bin/ - cp -a $(BUILDDIR2)/psi-plus-webkit.desktop $(DESTDIR)/usr/share/applications/ +ifdef BUILDDIR2 + ln -s psi-plus.png $(DESTDIR)/usr/share/pixmaps/psi-plus-webengine.png + cp -a $(BUILDDIR2)/psi/psi-plus-webengine $(DESTDIR)/usr/bin/ + cp -a $(BUILDDIR2)/psi-plus-webengine.desktop $(DESTDIR)/usr/share/applications/ +endif # Move psimedia plugin to separate package: mkdir -p $(CURDIR)/debian/psi-plus-plugin-psimedia/usr/lib/psi-plus/plugins/ mv $(DESTDIR)/usr/lib/psi-plus/plugins/libmediaplugin.so \