[neon/kde/kwallet/Neon/stable] debian: Revert "bring back kwallet5 in Neon/release for now"

Jonathan Esk-Riddell null at kde.org
Mon Jan 22 16:06:44 GMT 2024


Git commit e4025c128c1bec36fc3e9030686f80306a71c28b by Jonathan Esk-Riddell.
Committed on 22/01/2024 at 17:06.
Pushed by jriddell into branch 'Neon/stable'.

Revert "bring back kwallet5 in Neon/release for now"

This reverts commit defa37fd7fccff1620961019e5b4aa50fafa9d5e.

M  +0    -7    debian/libkf5wallet-bin.install
M  +0    -1    debian/libkf5wallet-dev.install
M  +0    -2    debian/libkwalletbackend5-5.install
M  +1    -0    debian/not-installed
M  +1    -1    debian/rules

https://invent.kde.org/neon/kde/kwallet/-/commit/e4025c128c1bec36fc3e9030686f80306a71c28b

diff --git a/debian/libkf5wallet-bin.install b/debian/libkf5wallet-bin.install
index e0b6a13..e69de29 100644
--- a/debian/libkf5wallet-bin.install
+++ b/debian/libkf5wallet-bin.install
@@ -1,7 +0,0 @@
-usr/bin/kwallet-query
-usr/bin/kwalletd5
-usr/share/applications/org.kde.kwalletd5.desktop
-usr/share/dbus-1/services/org.kde.kwalletd5.service
-usr/share/knotifications5/kwalletd5.notifyrc
-usr/share/kservices5/kwalletd5.desktop
-usr/share/man/man1/kwallet-query.1
diff --git a/debian/libkf5wallet-dev.install b/debian/libkf5wallet-dev.install
index 25ffcd2..d661a25 100644
--- a/debian/libkf5wallet-dev.install
+++ b/debian/libkf5wallet-dev.install
@@ -1,7 +1,6 @@
 usr/include/KF5/KWallet/
 usr/lib/*/cmake/KF5Wallet/
 usr/lib/*/libKF5Wallet.so
-usr/lib/*/libkwalletbackend5.so
 usr/lib/*/qt5/mkspecs/modules/qt_KWallet.pri
 usr/share/dbus-1/interfaces/kf5_org.kde.KWallet.xml
 usr/share/qt5/doc/KF5Wallet.tags
diff --git a/debian/libkwalletbackend5-5.install b/debian/libkwalletbackend5-5.install
index 6c746e1..e69de29 100644
--- a/debian/libkwalletbackend5-5.install
+++ b/debian/libkwalletbackend5-5.install
@@ -1,2 +0,0 @@
-usr/lib/*/libkwalletbackend5.so.5
-usr/lib/*/libkwalletbackend5.so.5.*
diff --git a/debian/not-installed b/debian/not-installed
index 740fcbe..76678ac 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,2 +1,3 @@
 # Manpages get compressed and renamed, and the test fails.
 usr/share/man/man1/kwallet-query.1
+usr/bin/kwallet-query
diff --git a/debian/rules b/debian/rules
index afd5010..64d7416 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
 	dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5 --without build_stamp
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DBUILD_QCH=ON
+	dh_auto_configure -- -DBUILD_QCH=ON -DBUILD_KWALLETD=OFF -DBUILD_KWALLET_QUERY=OFF
 
 override_dh_strip:
 	dh_strip --dbgsym-migration='libkf5wallet5-dbg (<= 5.19.0-1~~)'


More information about the Neon-commits mailing list