[neon/kde/kde-dev-scripts/Neon/release] debian: kf6ify

[Jonathan Riddell]

Git commit b20847af7bff52d0f3fe3635ff6f644aae1de8df by Jonathan Riddell.
Committed on 22/08/2024 at 16:06.
Pushed by jriddell into branch 'Neon/release'.

kf6ify

M  +7    -5    debian/patches/append_kde.diff
M  +12   -16   debian/rules

https://invent.kde.org/neon/kde/kde-dev-scripts/-/commit/b20847af7bff52d0f3fe3635ff6f644aae1de8df

diff --git a/debian/patches/append_kde.diff b/debian/patches/append_kde.diff
index 32cad2b..f10b9e6 100644
--- a/debian/patches/append_kde.diff
+++ b/debian/patches/append_kde.diff
@@ -5,9 +5,11 @@ Description: Append "-kde" to svn-clean like KDE3.
 Bug-Debian: http://bugs.debian.org/461095
 Last-Update: 2018-07-04
 
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -72,7 +72,6 @@ install(PROGRAMS
+Index: kde-dev-scripts-24.08.0/CMakeLists.txt
+===================================================================
+--- kde-dev-scripts-24.08.0.orig/CMakeLists.txt
++++ kde-dev-scripts-24.08.0/CMakeLists.txt
+@@ -83,7 +83,6 @@ install(PROGRAMS
    cvs-clean
    cvsblame
    colorsvn
@@ -15,8 +17,8 @@ Last-Update: 2018-07-04
    svnlastchange
    svnversions
    extractrc
-@@ -95,6 +94,8 @@ install(PROGRAMS
-   grantlee_strings_extractor.py
+@@ -109,6 +108,8 @@ install(PROGRAMS
+   port_new_gitlab_ci_template.sh
    DESTINATION ${KDE_INSTALL_BINDIR})
  
 +install(PROGRAMS svn-clean DESTINATION ${KDE_INSTALL_BINDIR} RENAME svn-clean-kde)
diff --git a/debian/rules b/debian/rules
index 9ca4e95..c9dc653 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,26 +1,22 @@
 #!/usr/bin/make -f
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
-dh = --with python3
-l10npkgs_firstversion_ok := 4:17.08.3-4~
+%:
+	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_auto_install:
-	$(overridden_command)
-
-override_dh_auto_install-indep:
-	# remove man pages of non-existing scripts
-	rm debian/kdesdk-scripts/usr/share/man/man1/fixincludes.1
-	rm debian/kdesdk-scripts/usr/share/man/man1/reportview.1
-	rm debian/kdesdk-scripts/usr/share/man/man1/transxx.1
+#override_dh_auto_install-indep:
+#	# remove man pages of non-existing scripts
+#	rm debian/kdesdk-scripts/usr/share/man/man1/fixincludes.1
+#	rm debian/kdesdk-scripts/usr/share/man/man1/reportview.1
+#	rm debian/kdesdk-scripts/usr/share/man/man1/transxx.1
 
 override_dh_installman:
-	$(overridden_command) --language=C
+	dh_installman --language=C
 
 override_dh_compress:
-	$(overridden_command) -Xexamples
+	dh_compress -Xexamples
 
 override_dh_python3:
 	# force python2 shebangs to be python3
-	$(overridden_command) --shebang=/usr/bin/python3
+	dh_python3 --shebang=/usr/bin/python3