[neon/kde/kwin/Neon/unstable] debian: clean up cruft, runtime deps etc
Carlos De Maine
null at kde.org
Fri Nov 3 02:00:08 GMT 2023
Git commit 5c86b40e9e2826f6b4233f620e5ace1575f8129a by Carlos De Maine.
Committed on 03/11/2023 at 02:59.
Pushed by carlosdem into branch 'Neon/unstable'.
clean up cruft, runtime deps etc
M +11 -85 debian/control
M +1 -7 debian/kwin-common.lintian-overrides
M +1 -10 debian/kwin-data.install
D +0 -6 debian/kwin-data.qml-ignore
D +0 -36 debian/kwin-dev.acc.in
M +0 -1 debian/kwin-wayland.lintian-overrides
M +0 -4 debian/kwin-x11.lintian-overrides
M +1 -1 debian/kwin-x11.postinst
D +0 -1 debian/libkwineffects14.install
D +0 -1 debian/libkwinglutils14.install
M +1 -3 debian/meta/cmake-ignore
M +0 -3 debian/rules
https://invent.kde.org/neon/kde/kwin/-/commit/5c86b40e9e2826f6b4233f620e5ace1575f8129a
diff --git a/debian/control b/debian/control
index 9149839..4bd63c3 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Maximiliano Curia <maxy at debian.org>
Build-Depends: breeze-dev,
- cmake (>= 3.1~),
+ cmake,
debhelper-compat (= 13),
hwdata,
kf6-extra-cmake-modules,
@@ -91,7 +91,7 @@ Build-Depends: breeze-dev,
qt6-wayland-dev-tools,
wayland-protocols,
xwayland
-Standards-Version: 4.1.4
+Standards-Version: 4.6.2
Homepage: https://projects.kde.org/projects/kde/workspace/kwin
Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kwin
Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kwin.git
@@ -101,11 +101,10 @@ Architecture: any
Depends: hwdata,
kf6-kglobalaccel,
kwin-data (= ${source:Version}),
- libkwineffects14 (= ${binary:Version}),
qml6-module-qtmultimedia,
${misc:Depends},
${shlibs:Depends}
-Recommends: plasma-desktop (>= 4:5.14),
+Recommends: plasma-desktop,
qt6-virtualkeyboard-plugin
Suggests: kwin-addons
Description: KDE window manager, common files
@@ -123,8 +122,10 @@ Package: kwin-data
Architecture: all
Depends: ${misc:Depends}, ${shlibs:Depends}
Recommends: kf6-kdeclarative,
+ kf6-kirigami2,
kf6-plasma-framework,
python3,
+ qml6-module-org-kde-kquickcontrolsaddons,
qml6-module-qtmultimedia,
qml6-module-qtquick-controls,
qml6-module-qtquick-layouts,
@@ -153,6 +154,7 @@ Depends: kf6-kconfig-dev,
kwin-common (= ${binary:Version}),
libegl1-mesa-dev (>= 1.2~),
libepoxy-dev (>= 1.2),
+ libwayland-dev,
qt6-base-dev,
${misc:Depends},
${shlibs:Depends}
@@ -173,6 +175,7 @@ Package: kwin-wayland
Architecture: any
Depends: kwin-common (= ${binary:Version}),
libcap2-bin [linux-any],
+ libwayland-server0,
xwayland,
${misc:Depends},
${shlibs:Depends}
@@ -194,7 +197,6 @@ Breaks: plasma-workspace-wayland (<< 4:5.14)
Package: kwin-x11
Architecture: any
Depends: kwin-common (= ${binary:Version}),
- libkwinglutils14 (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Breaks: kde-window-manager (<< 4:5), kwin-addons (<< 4:5.14)
@@ -215,67 +217,15 @@ Package: libkwineffects14
Section: libs
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libkwineffects10,
- libkwineffects11,
- libkwineffects12,
- libkwineffects13 (<< 4:5.26.3),
- libkwineffects5 (<< 4:5.2.0),
- libkwineffects6 (<< 4:5.4.1+git20150907),
- libkwineffects7 (<< 4:5.5.80+git20160203),
- libkwineffects8,
- libkwineffects9
-Replaces: libkwineffects10,
- libkwineffects11,
- libkwineffects12,
- libkwineffects13 (<< 4:5.26.3),
- libkwineffects5 (<< 4:5.2.0),
- libkwineffects6 (<< 4:5.4.1+git20150907),
- libkwineffects7 (<< 4:5.5.80+git20160203),
- libkwineffects8,
- libkwineffects9
-Description: KDE window manager effects library
- KWin (pronounced as one syllable "kwin") is the window
- manager for the KDE Plasma Desktop. It gives you complete
- control over your windows, making sure they're not in the way
- but aid you in your task. It paints the window decoration,
- the bar on top of every window with (configurable) buttons
- like close, maximize and minimize. It also handles placing
- of windows and switching between them.
- .
- This package is part of the KDE base workspace module.
+Description: transitional package
+ This is a dummy package which can be removed.
Package: libkwinglutils14
Section: libs
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libkwinglutils10,
- libkwinglutils11,
- libkwinglutils12,
- libkwinglutils13 (<< 4:5.26.3),
- libkwinglutils5 (<< 4:5.2.0),
- libkwinglutils6 (<< 4:5.4.1+git20150907),
- libkwinglutils7 (<< 4.5.5.80+git20160203),
- libkwinglutils8,
- libkwinglutils9
-Replaces: libkwinglutils10,
- libkwinglutils11,
- libkwinglutils12,
- libkwinglutils13 (<< 4:5.26.3),
- libkwinglutils5 (<< 4:5.2.0),
- libkwinglutils6 (<< 4:5.4.1+git20150907),
- libkwinglutils7 (<< 4:5.5.80+git20160203),
- libkwinglutils8,
- libkwinglutils9
-Description: KDE window manager gl utils library
- KWin (pronounced as one syllable "kwin") is the window
- manager for the KDE Plasma Desktop. It gives you complete
- control over your windows, making sure they're not in the way
- but aid you in your task. It paints the window decoration,
- the bar on top of every window with (configurable) buttons
- like close, maximize and minimize. It also handles placing
- of windows and switching between them.
- .
- This package is part of the KDE base workspace module.
+Description: transitional package
+ This is a dummy package which can be removed.
Package: kwin-wayland-backend-fbdev
Architecture: any
@@ -321,27 +271,3 @@ Priority: extra
Section: oldlibs
Description: transitional package
This is a dummy package which can be removed.
-
-Package: libkwinglutils13
-Architecture: any
-Depends: ${misc:Depends}
-Priority: extra
-Section: oldlibs
-Description: transitional package
- This is a dummy package which can be removed.
-
-Package: libkwinxrenderutils13
-Architecture: any
-Depends: ${misc:Depends}
-Priority: extra
-Section: oldlibs
-Description: transitional package
- This is a dummy package which can be removed.
-
-Package: libkwineffects13
-Architecture: any
-Depends: ${misc:Depends}
-Priority: extra
-Section: oldlibs
-Description: transitional package
- This is a dummy package which can be removed.
diff --git a/debian/kwin-common.lintian-overrides b/debian/kwin-common.lintian-overrides
index 02f09a7..4d3fd95 100644
--- a/debian/kwin-common.lintian-overrides
+++ b/debian/kwin-common.lintian-overrides
@@ -1,7 +1 @@
-kwin-common: package-name-doesnt-match-sonames libkdeinit5-kwin-rules-dialog libkwin5
-kwin-common: dev-pkg-without-shlib-symlink usr/lib/*/libkdeinit5_kwin_rules_dialog.so usr/lib/*/libkdeinit5_kwin_rules_dialog.so
-kwin-common: dev-pkg-without-shlib-symlink usr/lib/*/libkwin.so
-kwin-common: shlib-without-versioned-soname usr/lib/*/libkdeinit5_kwin_rules_dialog.so libkdeinit5_kwin_rules_dialog.so
-kwin-common: package-name-doesnt-match-sonames libkcmkwincommon5 libkdeinit5-kwin-rules-dialog libkwin5
-kwin-common: dev-pkg-without-shlib-symlink usr/lib/*/libkcmkwincommon.so.* usr/lib/x86_64-linux-gnu/libkcmkwincommon.so
-kwin-common: package-name-doesnt-match-sonames libkcmkwincommon5 libkwin5
+kwin-common: package-name-doesnt-match-sonames libkcmkwincommon libkwin
diff --git a/debian/kwin-data.install b/debian/kwin-data.install
index cb80ba6..6ecec9c 100644
--- a/debian/kwin-data.install
+++ b/debian/kwin-data.install
@@ -1,13 +1,4 @@
-usr/share/applications/kcm_kwin_effects.desktop
-usr/share/applications/kcm_kwin_scripts.desktop
-usr/share/applications/kcm_kwin_virtualdesktops.desktop
-usr/share/applications/kcm_kwindecoration.desktop
-usr/share/applications/kcm_kwinoptions.desktop
-usr/share/applications/kcm_kwinrules.desktop
-usr/share/applications/kcm_kwintabbox.desktop
-usr/share/applications/kcm_kwinxwayland.desktop
-usr/share/applications/kcm_virtualkeyboard.desktop
-usr/share/applications/kwincompositing.desktop
+usr/share/applications/
usr/share/config.kcfg/
usr/share/kconf_update/
usr/share/doc/*/*/kcontrol/
diff --git a/debian/kwin-data.qml-ignore b/debian/kwin-data.qml-ignore
deleted file mode 100644
index 095e2b5..0000000
--- a/debian/kwin-data.qml-ignore
+++ /dev/null
@@ -1,6 +0,0 @@
-# In kwin.deb
-org.kde.kwin 2.0
-org.kde.kwin.decoration 0.1
-org.kde.kwin.decorations.*
-org.kde.kwin.kwincompositing 1.0
-org.kde.kwin.private.*
diff --git a/debian/kwin-dev.acc.in b/debian/kwin-dev.acc.in
deleted file mode 100644
index 1687af3..0000000
--- a/debian/kwin-dev.acc.in
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<descriptor>
-
-<version>
- 5.2.0.1
-</version>
-
-<headers>
- /usr/include/kwin_export.h
- /usr/include/kwinanimationeffect.h
- /usr/include/kwinconfig.h
- /usr/include/kwineffects.h
- /usr/include/kwineffects_export.h
- /usr/include/kwinglobals.h
- /usr/include/kwinglplatform.h
- /usr/include/kwingltexture.h
- /usr/include/kwinglutils.h
- /usr/include/kwinglutils_export.h
- /usr/include/kwinglutils_funcs.h
- /usr/include/kwinxrenderutils.h
- /usr/include/kwinxrenderutils_export.h
-</headers>
-
-<libs>
- /usr/lib/@@DEB_HOST_MULTIARCH@@/libkwin4_effect_builtins.so
- /usr/lib/@@DEB_HOST_MULTIARCH@@/libkwineffects.so
- /usr/lib/@@DEB_HOST_MULTIARCH@@/libkwinglutils.so
- /usr/lib/@@DEB_HOST_MULTIARCH@@/libkwinxrenderutils.so
-</libs>
-
-<gcc_options>
- -fPIC
- -std=c++11
-</gcc_options>
-
-</descriptor>
diff --git a/debian/kwin-wayland.lintian-overrides b/debian/kwin-wayland.lintian-overrides
index 503b463..e14bd26 100644
--- a/debian/kwin-wayland.lintian-overrides
+++ b/debian/kwin-wayland.lintian-overrides
@@ -1,2 +1 @@
kwin-wayland: binary-without-manpage usr/bin/kwin_wayland
-kwin-wayland: postinst-must-call-ldconfig usr/lib/*/libkdeinit5_kwin_wayland.so
diff --git a/debian/kwin-x11.lintian-overrides b/debian/kwin-x11.lintian-overrides
index b6c6cfd..22da5d8 100644
--- a/debian/kwin-x11.lintian-overrides
+++ b/debian/kwin-x11.lintian-overrides
@@ -1,5 +1 @@
-kwin-x11: package-name-doesnt-match-sonames libkdeinit5-kwin-x11
kwin-x11: binary-without-manpage usr/bin/kwin_x11
-kwin-x11: shlib-without-versioned-soname usr/lib/*/libkdeinit5_kwin_x11.so libkdeinit5_kwin_x11.so
-kwin-x11: postinst-must-call-ldconfig usr/lib/*/libkdeinit5_kwin_x11.so
-kwin-x11: package-must-activate-ldconfig-trigger usr/lib/*/libkdeinit5_kwin_x11.so
diff --git a/debian/kwin-x11.postinst b/debian/kwin-x11.postinst
index ab238a1..123e72d 100644
--- a/debian/kwin-x11.postinst
+++ b/debian/kwin-x11.postinst
@@ -19,7 +19,7 @@ set -e
case "$1" in
configure)
- update-alternatives --remove x-window-manager /usr/kf6/bin/kwin
+ update-alternatives --remove x-window-manager /usr/bin/kwin
update-alternatives --install /usr/bin/x-window-manager x-window-manager /usr/bin/kwin_x11 50
;;
diff --git a/debian/libkwineffects14.install b/debian/libkwineffects14.install
deleted file mode 100644
index 8b13789..0000000
--- a/debian/libkwineffects14.install
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/debian/libkwinglutils14.install b/debian/libkwinglutils14.install
deleted file mode 100644
index 8b13789..0000000
--- a/debian/libkwinglutils14.install
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/debian/meta/cmake-ignore b/debian/meta/cmake-ignore
index 1cc5e5d..247f680 100644
--- a/debian/meta/cmake-ignore
+++ b/debian/meta/cmake-ignore
@@ -1,6 +1,5 @@
# qml module runtime dep
-Qt5Multimedia
-libhybris
+qt6-multimedia
Xwayland
QtQuick-QMLModule
QtQuick.Controls-QMLModule
@@ -11,5 +10,4 @@ QtMultimedia-QMLModule
org.kde.kquickcontrolsaddons-QMLModule
org.kde.plasma.core-QMLModule
org.kde.plasma.components-QMLModule
-KF5Kirigami2
hwdata
diff --git a/debian/rules b/debian/rules
index 47c772a..3d69b0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,3 @@
%:
dh $@ --with kf6 --buildsystem kf6
-
-override_dh_shlibdeps:
- dh_shlibdeps -l$(CURDIR)/debian/$(shell dh_listpackages | head -n1)/usr/kf6/lib/$(DEB_HOST_MULTIARCH)/
More information about the Neon-commits
mailing list