[neon/kde/kwin/Neon/unstable] debian: lintings

[Carlos De Maine]

Git commit fbd64ac6ec7c11319bd308f1268c4cd3281c5ac7 by Carlos De Maine.
Committed on 12/12/2023 at 04:34.
Pushed by carlosdem into branch 'Neon/unstable'.

lintings

M  +3    -0    debian/control
M  +3    -2    debian/kwin-common.lintian-overrides
M  +1    -2    debian/kwin-common.qml-ignore

https://invent.kde.org/neon/kde/kwin/-/commit/fbd64ac6ec7c11319bd308f1268c4cd3281c5ac7

diff --git a/debian/control b/debian/control
index 02be1eb..7866414 100644
--- a/debian/control
+++ b/debian/control
@@ -132,6 +132,7 @@ Description: KDE window manager, common files
 Package: kwin-dev
 Section: libdevel
 Architecture: any
+X-Neon-MergedPackage: true
 Depends: kf6-kconfig-dev,
          kf6-kcoreaddons-dev,
          kf6-kwindowsystem-dev,
@@ -155,6 +156,7 @@ Description: KDE window manager - devel files
 
 Package: kwin-wayland
 Architecture: any
+X-Neon-MergedPackage: true
 Depends: kwayland6,
          kwin-common (= ${binary:Version}),
          libcap2-bin [linux-any],
@@ -178,6 +180,7 @@ Description: KDE window manager, wayland version, PREVIEW release
 
 Package: kwin-x11
 Architecture: any
+X-Neon-MergedPackage: true
 Depends: kwin-common (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
diff --git a/debian/kwin-common.lintian-overrides b/debian/kwin-common.lintian-overrides
index e28aa3c..656b9ee 100644
--- a/debian/kwin-common.lintian-overrides
+++ b/debian/kwin-common.lintian-overrides
@@ -1,3 +1,4 @@
+kwin-common: desktop-command-not-in-package usr/share/applications/kcm_kwin_effects.desktop systemsettings
 kwin-common: desktop-command-not-in-package usr/share/applications/kcm_kwin_scripts.desktop systemsettings
 kwin-common: desktop-command-not-in-package usr/share/applications/kcm_kwin_virtualdesktops.desktop systemsettings
 kwin-common: desktop-command-not-in-package usr/share/applications/kcm_kwindecoration.desktop systemsettings
@@ -9,5 +10,5 @@ kwin-common: desktop-command-not-in-package usr/share/applications/kcm_virtualke
 kwin-common: desktop-command-not-in-package usr/share/applications/kwincompositing.desktop systemsettings
 
 kwin-common: package-name-doesnt-match-sonames libkcmkwincommon6 libkwin6
-kwin-common: desktop-command-not-in-package usr/share/applications/kcm_kwin_effects.desktop systemsettings
-kwin-common: lacks-unversioned-link-to-shared-library usr/lib/*/libkcmkwincommon.so.5.90.0 usr/lib/*/libkcmkwincommon.so
+
+kwin-common: lacks-unversioned-link-to-shared-library usr/lib/*/libkcmkwincommon.so.* usr/lib/*/libkcmkwincommon.so
\ No newline at end of file
diff --git a/debian/kwin-common.qml-ignore b/debian/kwin-common.qml-ignore
index 7beb0d6..f9b87cb 100644
--- a/debian/kwin-common.qml-ignore
+++ b/debian/kwin-common.qml-ignore
@@ -1,2 +1 @@
-- org.kde.kwin[as]
-- org.kde.kwin[3.0]
\ No newline at end of file
+org.kde.kwin*
\ No newline at end of file