[neon/extras/kreport/Neon/unstable] debian: Revert "kf6ify"
Carlos De Maine
null at kde.org
Fri Jan 17 22:41:03 GMT 2025
Git commit 1e3c6605d6d856b6db290836b22349b73ef82bfe by Carlos De Maine.
Committed on 17/01/2025 at 22:41.
Pushed by carlosdem into branch 'Neon/unstable'.
Revert "kf6ify"
This reverts commit f9155a62333ba9d2dc2f474e4d8ecb236fd8384f
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 +8 -2 debian/rules
https://invent.kde.org/neon/extras/kreport/-/commit/1e3c6605d6d856b6db290836b22349b73ef82bfe
diff --git a/debian/control b/debian/control
index 50a3075..3a93a0f 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,
+Build-Depends: cmake (>= 3.0),
debhelper-compat (= 13),
- 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,
+ 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),
python3:any,
- qt6-5compat-dev,
- qt6-base-dev,
- qt6-declarative5-dev,
- qt6-tools-dev,
- qt6-webengine-dev,
-Standards-Version: 4.6.2
+ qtbase5-dev (>= 5.4.0),
+ qtdeclarative5-dev,
+ qttools5-dev,
+ qtwebengine5-dev,
+Standards-Version: 4.5.1
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: kf6-kcoreaddons-dev,
+Depends: libkf5coreaddons-dev,
libkproperty3-dev (>= 3.0.0),
libkreport3-4 (= ${binary:Version}),
- qt6-base-dev (>= 5.3.0),
+ qtbase5-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 56226d7..393b437 100644
--- a/debian/libkreport-data.install
+++ b/debian/libkreport-data.install
@@ -1,3 +1,3 @@
usr/share/kreport3/
-usr/share/kservicetypes6/kreport_elementplugin.desktop
+usr/share/kservicetypes5/kreport_elementplugin.desktop
usr/share/locale/
diff --git a/debian/libkreport3-dev.install b/debian/libkreport3-dev.install
index 23a8070..62c2bc3 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/*/qt6/mkspecs/modules/qt_KReport3.pri
+usr/lib/*/qt5/mkspecs/modules/qt_KReport3.pri
diff --git a/debian/libkreport3-plugin-barcode.install b/debian/libkreport3-plugin-barcode.install
index 1ad4379..8552a13 100644
--- a/debian/libkreport3-plugin-barcode.install
+++ b/debian/libkreport3-plugin-barcode.install
@@ -1 +1 @@
-usr/lib/*/qt6/plugins/kreport3/org.kde.kreport.barcode.so
+usr/lib/*/qt5/plugins/kreport3/org.kde.kreport.barcode.so
diff --git a/debian/libkreport3-plugin-maps.install b/debian/libkreport3-plugin-maps.install
index a35107a..77a6bcb 100644
--- a/debian/libkreport3-plugin-maps.install
+++ b/debian/libkreport3-plugin-maps.install
@@ -1 +1 @@
-#usr/lib/*/qt6/plugins/kreport3/org.kde.kreport.maps.so
+#usr/lib/*/qt5/plugins/kreport3/org.kde.kreport.maps.so
diff --git a/debian/libkreport3-plugin-web.install b/debian/libkreport3-plugin-web.install
index e624726..1800482 100644
--- a/debian/libkreport3-plugin-web.install
+++ b/debian/libkreport3-plugin-web.install
@@ -1 +1 @@
-usr/lib/*/qt6/plugins/kreport3/org.kde.kreport.web.so
+usr/lib/*/qt5/plugins/kreport3/org.kde.kreport.web.so
diff --git a/debian/rules b/debian/rules
index 5bd7734..765438f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,11 @@
#!/usr/bin/make -f
-# -*- makefile -*-
+
+export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
%:
- dh $@ --with kf6 --buildsystem kf6
+ dh $@ --parallel --with kf5
+
+override_dh_auto_configure:
+ dh_auto_configure -Skf5 -- -DBUILD_TESTING=OFF -DPython_ADDITIONAL_VERSIONS=3
+
+.PHONY: override_dh_auto_test
More information about the Neon-commits
mailing list