[neon/extras/kreport/Neon/unstable] debian: kf6ify

Carlos De Maine null at kde.org
Fri Jan 17 22:18:38 GMT 2025


Git commit f9155a62333ba9d2dc2f474e4d8ecb236fd8384f by Carlos De Maine.
Committed on 17/01/2025 at 22:18.
Pushed by carlosdem into branch 'Neon/unstable'.

kf6ify

M  +18   -18   debian/control
M  +1    -1    debian/libkreport-data.install
M  +1    -1    debian/libkreport3-dev.install
M  +1    -1    debian/libkreport3-plugin-barcode.install
M  +1    -1    debian/libkreport3-plugin-maps.install
M  +1    -1    debian/libkreport3-plugin-web.install
M  +2    -8    debian/rules

https://invent.kde.org/neon/extras/kreport/-/commit/f9155a62333ba9d2dc2f474e4d8ecb236fd8384f

diff --git a/debian/control b/debian/control
index 3a93a0f..50a3075 100644
--- a/debian/control
+++ b/debian/control
@@ -3,24 +3,24 @@ Section: libs
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Pino Toscano <pino at debian.org>
-Build-Depends: cmake (>= 3.0),
+Build-Depends: cmake,
                debhelper-compat (= 13),
-               extra-cmake-modules (>= 1.8.0),
-               libkf5config-dev (>= 5.16.0),
-               libkf5coreaddons-dev (>= 5.16.0),
-               libkf5guiaddons-dev (>= 5.16.0),
-               libkf5i18n-dev (>= 5.16.0),
-               libkf5widgetsaddons-dev (>= 5.16.0),
-               libkproperty3-dev (>= 3.2.0~),
-               libmarble-dev (>= 4:16.08.0~),
-               libqt5webkit5-dev,
-               pkg-kde-tools (>= 0.15.16),
+               kf6-extra-cmake-modules,
+               kf6-kconfig-dev,
+               kf6-kcoreaddons-dev,
+               kf6-kguiaddons-dev,
+               kf6-ki18n-dev,
+               kf6-kwidgetsaddons-dev,
+               libkproperty3-dev,
+               libmarble-dev,
+               pkg-kde-tools-neon,
                python3:any,
-               qtbase5-dev (>= 5.4.0),
-               qtdeclarative5-dev,
-               qttools5-dev,
-               qtwebengine5-dev,
-Standards-Version: 4.5.1
+               qt6-5compat-dev,
+               qt6-base-dev,
+               qt6-declarative5-dev,
+               qt6-tools-dev,
+               qt6-webengine-dev,
+Standards-Version: 4.6.2
 Rules-Requires-Root: no
 Homepage: https://community.kde.org/KReport
 Vcs-Git: https://salsa.debian.org/qt-kde-team/extras/kreport.git
@@ -80,10 +80,10 @@ Package: libkreport3-dev
 Architecture: any
 Multi-Arch: same
 Section: libdevel
-Depends: libkf5coreaddons-dev,
+Depends: kf6-kcoreaddons-dev,
          libkproperty3-dev (>= 3.0.0),
          libkreport3-4 (= ${binary:Version}),
-         qtbase5-dev (>= 5.3.0),
+         qt6-base-dev (>= 5.3.0),
          ${misc:Depends}
 Description: development files for KReport
  The KReport framework implements reporting functionality for creation
diff --git a/debian/libkreport-data.install b/debian/libkreport-data.install
index 393b437..56226d7 100644
--- a/debian/libkreport-data.install
+++ b/debian/libkreport-data.install
@@ -1,3 +1,3 @@
 usr/share/kreport3/
-usr/share/kservicetypes5/kreport_elementplugin.desktop
+usr/share/kservicetypes6/kreport_elementplugin.desktop
 usr/share/locale/
diff --git a/debian/libkreport3-dev.install b/debian/libkreport3-dev.install
index 62c2bc3..23a8070 100644
--- a/debian/libkreport3-dev.install
+++ b/debian/libkreport3-dev.install
@@ -1,4 +1,4 @@
 usr/include/KReport3/
 usr/lib/*/cmake/KReport3/
 usr/lib/*/libKReport3.so
-usr/lib/*/qt5/mkspecs/modules/qt_KReport3.pri
+usr/lib/*/qt6/mkspecs/modules/qt_KReport3.pri
diff --git a/debian/libkreport3-plugin-barcode.install b/debian/libkreport3-plugin-barcode.install
index 8552a13..1ad4379 100644
--- a/debian/libkreport3-plugin-barcode.install
+++ b/debian/libkreport3-plugin-barcode.install
@@ -1 +1 @@
-usr/lib/*/qt5/plugins/kreport3/org.kde.kreport.barcode.so
+usr/lib/*/qt6/plugins/kreport3/org.kde.kreport.barcode.so
diff --git a/debian/libkreport3-plugin-maps.install b/debian/libkreport3-plugin-maps.install
index 77a6bcb..a35107a 100644
--- a/debian/libkreport3-plugin-maps.install
+++ b/debian/libkreport3-plugin-maps.install
@@ -1 +1 @@
-#usr/lib/*/qt5/plugins/kreport3/org.kde.kreport.maps.so
+#usr/lib/*/qt6/plugins/kreport3/org.kde.kreport.maps.so
diff --git a/debian/libkreport3-plugin-web.install b/debian/libkreport3-plugin-web.install
index 1800482..e624726 100644
--- a/debian/libkreport3-plugin-web.install
+++ b/debian/libkreport3-plugin-web.install
@@ -1 +1 @@
-usr/lib/*/qt5/plugins/kreport3/org.kde.kreport.web.so
+usr/lib/*/qt6/plugins/kreport3/org.kde.kreport.web.so
diff --git a/debian/rules b/debian/rules
index 765438f..5bd7734 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,5 @@
 #!/usr/bin/make -f
-
-export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
+# -*- makefile -*-
 
 %:
-	dh $@ --parallel --with kf5
-
-override_dh_auto_configure:
-	dh_auto_configure -Skf5 -- -DBUILD_TESTING=OFF -DPython_ADDITIONAL_VERSIONS=3
-
-.PHONY: override_dh_auto_test
+	dh $@ --with kf6 --buildsystem kf6


More information about the Neon-commits mailing list