[neon/kde/kwallet-pam/Neon/unstable] debian: port to kf6

[Carlos De Maine]

Git commit 543b3266043b578cc5e20b23350f17710c437f29 by Carlos De Maine.
Committed on 19/04/2023 at 03:53.
Pushed by carlosdem into branch 'Neon/unstable'.

port to kf6

M  +0    -6    debian/changelog
M  +8    -30   debian/control
M  +3    -3    debian/libpam-kwallet-common.install
M  +1    -1    debian/libpam-kwallet5.install
M  +16   -15   debian/rules

https://invent.kde.org/neon/kde/kwallet-pam/commit/543b3266043b578cc5e20b23350f17710c437f29

diff --git a/debian/changelog b/debian/changelog
index 31a70c6..272fd1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,3 @@
-kwallet-pam (4:5.27.4-0neon) jammy; urgency=medium
-
-  * New release
-
- -- Neon CI <neon at kde.org>  Tue, 04 Apr 2023 12:28:11 +0000
-
 kwallet-pam (4:5.27.3-0neon) jammy; urgency=medium
 
   * New release
diff --git a/debian/control b/debian/control
index f05c2d7..1e33014 100644
--- a/debian/control
+++ b/debian/control
@@ -3,14 +3,14 @@ Section: kde
 Priority: optional
 Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Maximiliano Curia <maxy at debian.org>
-Build-Depends: cmake (>= 2.8.12~),
-               debhelper (>= 11~),
-               extra-cmake-modules (>= 1.2.0~),
-               libgcrypt20-dev (>= 1.5.0~),
-               libkf5wallet-dev,
+Build-Depends: cmake,
+               debhelper-compat (= 13),
+               kf6-extra-cmake-modules,
+               kf6-kwallet-dev,
+               libgcrypt20-dev,
                libpam0g-dev,
-               pkg-kde-tools,
-               qtbase5-dev
+               pkg-kde-tools-neon,
+               qt6-base-dev
 Standards-Version: 4.1.3
 Homepage: https://projects.kde.org/projects/kde/workspace/kwallet-pam
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kwallet-pam
@@ -19,32 +19,10 @@ Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kwallet-pam.git
 Package: libpam-kwallet-common
 Architecture: all
 Depends: socat, ${misc:Depends}
-Breaks: pam-kwallet-init (<< 4:5.16.0)
-Replaces: pam-kwallet-init (<< 4:5.16.0)
 Description: KWallet integration with PAM (common files)
  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
  password instead of numerous different passwords and credentials.
  .
- This package provides a the common files needed by the KDE 4 and Kf5 version
+ This package provides a the common files needed by the Kf6 version
  of the PAM integration.
-
-Package: libpam-kwallet4
-Architecture: any
-Priority: optional
-Section: oldlibs
-Description: transitional dummy package
- This is a transitional dummy package. It can safely be removed.
-
-Package: libpam-kwallet5
-Architecture: any
-Depends: libpam-kwallet-common (= ${source:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Description: KWallet (Kf5) integration with PAM
- 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
- password instead of numerous different passwords and credentials.
- .
- This package provides a simple PAM integration for KWallet, so you can log in
- to open a KWallet.
diff --git a/debian/libpam-kwallet-common.install b/debian/libpam-kwallet-common.install
index 2bb1a89..71f09e5 100644
--- a/debian/libpam-kwallet-common.install
+++ b/debian/libpam-kwallet-common.install
@@ -1,3 +1,3 @@
-etc/xdg/autostart/pam_kwallet_init.desktop
-usr/lib/systemd/user/plasma-kwallet-pam.service
-usr/share/libpam-kwallet-common/
+usr/kf6/etc/xdg/autostart/pam_kwallet_init.desktop
+usr/kf6/lib/systemd/user/plasma-kwallet-pam.service
+usr/kf6/share/libpam-kwallet-common/
diff --git a/debian/libpam-kwallet5.install b/debian/libpam-kwallet5.install
index 2f03fab..6a97e9f 100644
--- a/debian/libpam-kwallet5.install
+++ b/debian/libpam-kwallet5.install
@@ -1 +1 @@
-lib/*/security/pam_kwallet5.so
+/usr/kf6/lib/*/security/pam_kwallet5.so
diff --git a/debian/rules b/debian/rules
index eb3c1c6..4d34a42 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,22 +1,23 @@
 #!/usr/bin/make -f
-
-export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
-
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
 %:
-	dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5 --without build_stamp
+	dh $@ --with kf6 --buildsystem kf6
+
+override_dh_shlibdeps:
+	dh_shlibdeps -l$(CURDIR)/debian/$(shell dh_listpackages | head -n1)/usr/kf6/lib/$(DEB_HOST_MULTIARCH)/
 
-override_dh_auto_clean:
-	dh_auto_clean
+#override_dh_auto_clean:
+#	dh_auto_clean
 
-override_dh_auto_configure:
-	dh_auto_configure -- \
-	    -DCMAKE_INSTALL_LIBDIR="/lib/${DEB_HOST_MULTIARCH}" \
-	    -DLIBEXEC_INSTALL_DIR="/usr/share/libpam-kwallet-common"
+#override_dh_auto_configure:
+#	dh_auto_configure -- \
+#	    -DCMAKE_INSTALL_LIBDIR="/lib/${DEB_HOST_MULTIARCH}" \
+#	    -DLIBEXEC_INSTALL_DIR="/usr/share/libpam-kwallet-common"
 
-override_dh_auto_build:
-	dh_auto_build
+#override_dh_auto_build:
+#	dh_auto_build
 
-override_dh_auto_install:
-	dh_auto_install
+override_dh_install:
+	@echo "skip dh_install"