[neon/kde/libkscreen/Neon/unstable] debian: port to kf6
Harald Sitter
null at kde.org
Mon Mar 13 12:16:44 GMT 2023
Git commit 19a5842c67000363321953188d71e0546920b436 by Harald Sitter.
Committed on 13/03/2023 at 11:49.
Pushed by sitter into branch 'Neon/unstable'.
port to kf6
M +16 -18 debian/control
M +6 -6 debian/libkf5screen-bin.install
M +9 -9 debian/libkf5screen-dev.install
M +1 -1 debian/libkf5screen-doc.install
M +3 -3 debian/libkf5screen8.install
M +2 -2 debian/libkf5screendpms8.install
M +4 -16 debian/rules
https://invent.kde.org/neon/kde/libkscreen/commit/19a5842c67000363321953188d71e0546920b436
diff --git a/debian/control b/debian/control
index cc8df4f..fbe8d96 100644
--- a/debian/control
+++ b/debian/control
@@ -6,11 +6,9 @@ Uploaders: Maximiliano Curia <maxy at debian.org>
Build-Depends: cmake (>= 3.0~),
debhelper (>= 11~),
doxygen,
- extra-cmake-modules (>= 5.50.0~),
- libkf5config-dev,
- libkf5wayland-dev (>= 4:5.50.0~) [linux-any],
- libqt5waylandclient5-dev,
- libqt5x11extras5-dev (>= 5.11.0~),
+ kf6-extra-cmake-modules,
+ kf6-kconfig-dev,
+ kf6-kwayland-dev [linux-any],
libwayland-bin,
libwayland-dev,
libx11-dev,
@@ -20,13 +18,13 @@ Build-Depends: cmake (>= 3.0~),
libxcb1-dev,
libxrandr-dev,
pkg-config,
- pkg-kde-tools (>= 0.15.15ubuntu1~),
+ pkg-kde-tools-neon,
plasma-wayland-protocols,
- qtbase5-dev (>= 5.11.0~),
- qtbase5-private-dev (>= 5.11.0~),
- qttools5-dev,
- qttools5-dev-tools,
- qtwayland5-dev-tools
+ qt6-base-dev,
+ qt6-tools-dev,
+ qt6-tools-dev-tools,
+ qt6-wayland-dev,
+ qt6-wayland-dev-tools
Standards-Version: 4.1.3
Homepage: https://projects.kde.org/projects/kde/workspace/libkscreen
Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/libkscreen
@@ -54,9 +52,9 @@ Description: library for screen management - helpers
Package: libkf5screen-dev
Section: libdevel
Architecture: any
-Depends: libkf5screen8 (= ${binary:Version}),
- libkf5screendpms8 (= ${binary:Version}),
- qtbase5-dev (>= 5.11.0~),
+Depends: libkf6screen8 (= ${binary:Version}),
+ libkf6screendpms8 (= ${binary:Version}),
+ qt6-base-dev,
${misc:Depends}
Description: library for screen management - development files
The KDE multiple monitor support is trying be as smart as possible
@@ -69,12 +67,12 @@ Package: libkf5screen8
Architecture: any
Multi-Arch: same
Breaks: kscreen (<< 4:5.14),
+ libkf5screen7,
libpowerdevilcore2 (<< 4:5.14),
plasma-workspace (<< 4:5.7),
- powerdevil (<< 4:5.12),
- libkf5screen7,
+ powerdevil (<< 4:5.12)
Conflicts: libkf5screen7
-Depends: libkf5screen-bin, ${misc:Depends}, ${shlibs:Depends}
+Depends: libkf6screen-bin, ${misc:Depends}, ${shlibs:Depends}
Description: library for screen management - shared library
The KDE multiple monitor support is trying be as smart as possible
adapting the behavior of it to each use case making the configuration
@@ -89,7 +87,7 @@ Breaks: kscreen (<< 4:5.14),
libpowerdevilcore2 (<< 4:5.14),
plasma-workspace (<< 4:5.7),
powerdevil (<< 4:5.12)
-Depends: libkf5screen-bin, ${misc:Depends}, ${shlibs:Depends}
+Depends: libkf6screen-bin, ${misc:Depends}, ${shlibs:Depends}
Description: dpms library for screen management - shared library
The KDE multiple monitor support is trying be as smart as possible
adapting the behavior of it to each use case making the configuration
diff --git a/debian/libkf5screen-bin.install b/debian/libkf5screen-bin.install
index 979bdf6..53f1ae1 100644
--- a/debian/libkf5screen-bin.install
+++ b/debian/libkf5screen-bin.install
@@ -1,6 +1,6 @@
-usr/bin/kscreen-doctor
-usr/lib/*/libexec/kf5/kscreen_backend_launcher
-usr/lib/*/qt5/plugins/kf5/kscreen/
-usr/lib/systemd/user/
-usr/share/dbus-1/services/org.kde.kscreen.service
-usr/share/qlogging-categories5/libkscreen.categories
+usr/kf6/bin/kscreen-doctor
+usr/kf6/lib/*/libexec/kf5/kscreen_backend_launcher
+usr/kf6/lib/*/qt6/plugins/kf6/kscreen/
+usr/kf6/lib/systemd/user/
+usr/kf6/share/dbus-1/services/org.kde.kscreen.service
+usr/kf6/share/qlogging-categories5/libkscreen.categories
diff --git a/debian/libkf5screen-dev.install b/debian/libkf5screen-dev.install
index 31582aa..a7fc727 100644
--- a/debian/libkf5screen-dev.install
+++ b/debian/libkf5screen-dev.install
@@ -1,9 +1,9 @@
-usr/include/KF5/KScreen/
-usr/include/KF5/kscreen_version.h
-usr/lib/*/cmake/KF5Screen/
-usr/lib/*/libKF5Screen.so
-usr/lib/*/libKF5ScreenDpms.so
-usr/lib/*/pkgconfig/kscreen2.pc
-usr/lib/*/qt5/mkspecs/modules/qt_KScreen.pri
-usr/share/qt5/doc/KF5Screen.tags
-usr/share/zsh/site-functions/_kscreen-doctor
+usr/kf6/include/KF6/KScreen/
+usr/kf6/include/KF6/kscreen_version.h
+usr/kf6/lib/*/cmake/KF5Screen/
+usr/kf6/lib/*/libKF5Screen.so
+usr/kf6/lib/*/libKF5ScreenDpms.so
+usr/kf6/lib/*/pkgconfig/kscreen2.pc
+usr/kf6/lib/*/qt5/mkspecs/modules/qt_KScreen.pri
+usr/kf6/share/qt5/doc/KF5Screen.tags
+usr/kf6/share/zsh/site-functions/_kscreen-doctor
diff --git a/debian/libkf5screen-doc.install b/debian/libkf5screen-doc.install
index d064c0f..a0d41df 100644
--- a/debian/libkf5screen-doc.install
+++ b/debian/libkf5screen-doc.install
@@ -1 +1 @@
-usr/share/qt5/doc/KF5Screen.qch
+usr/kf6/share/qt5/doc/KF5Screen.qch
diff --git a/debian/libkf5screen8.install b/debian/libkf5screen8.install
index 3b22273..32a1b4d 100644
--- a/debian/libkf5screen8.install
+++ b/debian/libkf5screen8.install
@@ -1,3 +1,3 @@
-usr/lib/*/libKF5Screen.so.5.*
-usr/lib/*/libKF5Screen.so.8
-usr/share/locale/
+usr/kf6/lib/*/libKF5Screen.so.5.*
+usr/kf6/lib/*/libKF5Screen.so.8
+usr/kf6/share/locale/
diff --git a/debian/libkf5screendpms8.install b/debian/libkf5screendpms8.install
index 579dd0c..2321b38 100644
--- a/debian/libkf5screendpms8.install
+++ b/debian/libkf5screendpms8.install
@@ -1,2 +1,2 @@
-usr/lib/*/libKF5ScreenDpms.so.5.*
-usr/lib/*/libKF5ScreenDpms.so.8
\ No newline at end of file
+usr/kf6/lib/*/libKF5ScreenDpms.so.5.*
+usr/kf6/lib/*/libKF5ScreenDpms.so.8
diff --git a/debian/rules b/debian/rules
index 81642aa..47c772a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,21 +1,9 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-
-export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
+# 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
-
-override_dh_auto_configure:
- dh_auto_configure -- -DBUILD_QCH=ON
+ dh $@ --with kf6 --buildsystem kf6
override_dh_shlibdeps:
- dh_shlibdeps $(foreach p,$(shell dh_listpackages -a | egrep ^lib.*[0-9]+$$),-p$p) -- -xlibkf5screen-bin
- dh_shlibdeps --remaining-packages
-
-override_dh_strip:
- dh_strip --dbgsym-migration='libkscreen-dbg (<= 4:5.5.4-2~~)'
-
-override_dh_auto_test:
- # Disable tests at build time
- :
+ dh_shlibdeps -l$(CURDIR)/debian/$(shell dh_listpackages | head -n1)/usr/kf6/lib/$(DEB_HOST_MULTIARCH)/
More information about the Neon-commits
mailing list