[neon/kde/kwalletmanager/Neon/unstable] debian: Revert "Port to Qt 6"

Carlos De Maine null at kde.org
Thu Jul 27 22:53:36 BST 2023


Git commit 6f0228dc0468e53cbd1f5181f6f218e9efbb6eb8 by Carlos De Maine.
Committed on 27/07/2023 at 23:53.
Pushed by carlosdem into branch 'Neon/unstable'.

Revert "Port to Qt 6"

This reverts commit 31b40ddadf34744e6679bc75c1e278e36c5c483c.

A  +1    -0    debian/compat
M  +27   -25   debian/control
M  +6    -5    debian/rules
M  +4    -4    debian/upstream/metadata

https://invent.kde.org/neon/kde/kwalletmanager/-/commit/6f0228dc0468e53cbd1f5181f6f218e9efbb6eb8

diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..b4de394
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+11
diff --git a/debian/control b/debian/control
index e112087..4de9d49 100644
--- a/debian/control
+++ b/debian/control
@@ -8,30 +8,30 @@ Uploaders: Sune Vuorela <sune at debian.org>,
            Eshat Cakar <info at eshat.de>,
            Maximiliano Curia <maxy at debian.org>,
 Build-Depends: cmake (>= 3.0~),
-               debhelper-compat (= 13),
-               kf6-extra-cmake-modules,
-               kf6-karchive-dev,
-               kf6-kauth-dev,
-               kf6-kconfig-dev,
-               kf6-kconfigwidgets-dev,
-               kf6-kcoreaddons-dev,
-               kf6-kcrash-dev,
-               kf6-kdbusaddons-dev,
-               kf6-kdoctools-dev,
-               kf6-ki18n-dev,
-               kf6-kiconthemes-dev,
-               kf6-kjobwidgets-dev,
-               kf6-kcmutils-dev,
-               kf6-kio-dev,
-               kf6-knotifications-dev,
-               kf6-kservice-dev,
-               kf6-ktextwidgets-dev,
-               kf6-kwallet-dev,
-               kf6-kwindowsystem-dev,
-               kf6-kxmlgui-dev,
-               pkg-kde-tools-neon,
-               qt6-base-dev,
-Standards-Version: 4.6.1
+               debhelper (>= 11),
+               extra-cmake-modules (>= 5.24.0~),
+               libkf5archive-dev (>= 5.24.0~),
+               libkf5auth-dev (>= 5.24.0~),
+               libkf5config-dev (>= 5.24.0~),
+               libkf5configwidgets-dev (>= 5.24.0~),
+               libkf5coreaddons-dev (>= 5.24.0~),
+               libkf5crash-dev (>= 5.24.0~),
+               libkf5dbusaddons-dev (>= 5.24.0~),
+               libkf5doctools-dev (>= 5.24.0~),
+               libkf5i18n-dev (>= 5.24.0~),
+               libkf5iconthemes-dev (>= 5.24.0~),
+               libkf5jobwidgets-dev (>= 5.24.0~),
+               libkf5kcmutils-dev (>= 5.24.0~),
+               libkf5kio-dev (>= 5.24.0~),
+               libkf5notifications-dev (>= 5.24.0~),
+               libkf5service-dev (>= 5.24.0~),
+               libkf5textwidgets-dev (>= 5.24.0~),
+               libkf5wallet-dev (>= 5.24.0~),
+               libkf5windowsystem-dev (>= 5.24.0~),
+               libkf5xmlgui-dev (>= 5.24.0~),
+               pkg-kde-tools (>= 0.12),
+               qtbase5-dev (>= 5.7.0~),
+Standards-Version: 4.1.4
 Homepage: http://www.kde.org
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kwalletmanager
 Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kwalletmanager.git
@@ -40,7 +40,9 @@ Package: kwalletmanager
 Architecture: any
 Section: utils
 Depends: ${misc:Depends}, ${shlibs:Depends},
-         kf6-kwallet,
+         libkf5wallet-bin (>= 5.24.0~),
+Breaks: ${kde-l10n:all}
+Replaces: ${kde-l10n:all}
 Description: secure password wallet manager
  The KDE Wallet system provides a secure way to store passwords and other
  secret information, allowing the user to remember only a single KDE Wallet
diff --git a/debian/rules b/debian/rules
index c918243..5eee405 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,9 @@
 #!/usr/bin/make -f
 
-# SPDX-License-Identifier: LGPL-2.0-or-later
-# 
-# SPDX-FileCopyrightText: 2023 Jonathan Riddell jr at jriddell.org
+l10npkgs_firstversion_ok := 4:16.04.3-7~
 
-%:
-  dh $@ --with kf6 --buildsystem kf6
+include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk
+
+override_dh_strip:
+	$(overridden_command) --dbgsym-migration='kwalletmanager-dbg (<= 4:15.12.1-1~~)'
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
index e6475b5..def8225 100644
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
@@ -1,7 +1,7 @@
 Name: kwalletmanager
-Changelog: https://invent.kde.org/utilities/kwalletmanager/-/commits/master
+Changelog: https://cgit.kde.org/kwalletmanager.git/log
 Contact: kde-devel at kde.org
-Donation: https://kde.org/community/donations/
-Repository: https://invent.kde.org/utilities/kwalletmanager.git
-Repository-Browse: https://invent.kde.org/utilities/kwalletmanager
+Donation: https://www.kde.org/community/donations/index.php
+Repository: https://anongit.kde.org/kwalletmanager.git
+Repository-Browse: https://cgit.kde.org/kwalletmanager.git
 Security-Contact: security at kde.org


More information about the Neon-commits mailing list