Control: tags -1 + patch

I think falkon-plugin-wallet can/should be dropped. The main falkon binary
package now includes KDEFrameworksIntegration.so, which seems to be the
plugin for KDE/KWallet integration.

debian/rules also tries to install GnomeKeyringPasswords.so, which
requires gnome-keyring-1.pc to build. But this is no longer available
in the archive.

The attached patch drops the unused falkon-plugin-wallet package,
and also old transitional packages that are no longer required.

Regards,
  Reiner
diff --git a/debian/control b/debian/control
index 99e1b87..ab7f904 100644
--- a/debian/control
+++ b/debian/control
@@ -41,7 +41,6 @@ Depends: libqt5sql5-sqlite,
 Conflicts: qupzilla (<< 3.0.0~)
 Replaces: qupzilla (<< 3.0.0~)
 Provides: www-browser
-Recommends: falkon-plugin-wallet
 Suggests: qtwebengine5-dev-tools
 Description: lightweight web browser based on Qt WebEngine
  Falkon is a new and very fast Qt Webengine browser. It aims to be a
@@ -52,30 +51,3 @@ Description: lightweight web browser based on Qt WebEngine
  that, you can manage RSS feeds with an included RSS reader, block ads
  with a builtin AdBlock plugin, block Flash content with Click2Flash
  and edit the local CA Certificates database with an SSL Manager.
-
-Package: falkon-plugin-wallet
-Architecture: amd64 arm64 armhf i386 mipsel
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: qupzilla-plugin-wallet (<< 3.0.0~)
-Replaces: qupzilla-plugin-wallet (<< 3.0.0~)
-Description: adds password management to Falkon
- Falkon is a new and very fast Qt Webengine browser. It aims to be a
- lightweight web browser available through all major platforms.
- .
- This plugin allows one to let KWallet manage the saved passwords.
-
-Package: qupzilla
-Depends: falkon, ${misc:Depends}
-Architecture: amd64 arm64 armhf i386 mipsel
-Section: oldlibs
-Priority: optional
-Description: transitional package for qupzilla
- This is a transitional package. It can safely be removed.
-
-Package: qupzilla-plugin-kwallet
-Depends: falkon-plugin-wallet, ${misc:Depends}
-Architecture: amd64 arm64 armhf i386 mipsel
-Section: oldlibs
-Priority: optional
-Description: transitional package for qupzilla-plugin-kwallet
- This is a transitional package. It can safely be removed.
diff --git a/debian/rules b/debian/rules
index ce4b008..5b04c5d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,15 +29,3 @@ override_dh_auto_clean:
 	# remove eventually previously created symlinks
 	rm -f src/lib/data/html/jquery.js src/lib/data/html/jquery-ui.js
 	dh_auto_clean
-
-override_dh_install:
-	dh_install
-	# move some plugins to the separate package falkon-plugin-wallet
-	for f in KWalletPasswords.so GnomeKeyringPasswords.so; do \
-	  found=$$(find debian/falkon -name $$f); \
-	  if [ -n "$${found}" ]; then \
-	    dest=$$(echo $${found} | sed 's%debian/falkon%debian/falkon-plugin-wallet%'); \
-	    mkdir -p $$(dirname $${dest}); \
-	    mv $${found} $$(dirname $${dest}); \
-	  fi; \
-	done

Attachment: signature.asc
Description: PGP signature

Reply via email to