[neon/kde/kscreenlocker/Neon/unstable] debian: defaff and lint

[Carlos De Maine]

Git commit c57ec2da82a3d4cb64502d1d493969b70ae59594 by Carlos De Maine.
Committed on 02/12/2023 at 07:49.
Pushed by carlosdem into branch 'Neon/unstable'.

defaff and lint

M  +29   -12   debian/control
D  +0    -1    debian/kde-config-screenlocker.lintian-overrides
R  +7    -1    debian/kscreenlocker.install [from: debian/kde-config-screenlocker.install - 053% similarity]
A  +3    -0    debian/kscreenlocker.lintian-overrides
R  +0    -0    debian/kscreenlocker.postinst [from: debian/libkscreenlocker6.postinst - 100% similarity]
D  +0    -8    debian/libkscreenlocker6.install
D  +0    -1    debian/libkscreenlocker6.lintian-overrides

https://invent.kde.org/neon/kde/kscreenlocker/-/commit/c57ec2da82a3d4cb64502d1d493969b70ae59594

diff --git a/debian/control b/debian/control
index 9d802d7..457ecb6 100644
--- a/debian/control
+++ b/debian/control
@@ -42,8 +42,10 @@ Homepage: https://projects.kde.org/kscreenlocker
 Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kscreenlocker.git
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kscreenlocker
 
-Package: kde-config-screenlocker
+Package: kscreenlocker
 Architecture: any
+X-Neon-MergedPackage: true
+Multi-Arch: same
 Depends: libkscreenlocker6 (= ${binary:Version}),
          kf6-kcmutils,
          kf6-kirigami2,
@@ -51,34 +53,49 @@ Depends: libkscreenlocker6 (= ${binary:Version}),
          qml6-module-qtquick-controls,
          qml6-module-qtquick-layouts,
          qml6-module-qtquick,
+         psmisc,
          systemsettings,
          ${misc:Depends},
          ${shlibs:Depends}
-Description: KCM Module for kscreenlocker
- KDE systemsettings module to configure kscreenlocker
+Provides: kde-config-screenlocker,
+          libkscreenlocker6,
+          libkscreenlocker5         
+Replaces: kde-config-screenlocker,
+          libkscreenlocker6,
+          libkscreenlocker5
+Description: Library and runtime files for kscreenlocker
+ Library and components for secure lock screen architecture.
+ .
+ This package contains the required files for kscreenlocker.
 
 Package: kscreenlocker-dev
-Section: libdevel
 Architecture: any
+X-Neon-MergedPackage: true
 Multi-Arch: same
-Depends: libkscreenlocker6 (= ${binary:Version}), qt6-base-dev, ${misc:Depends}
+Depends: libkscreenlocker6 (= ${binary:Version}),
+         qt6-base-dev, 
+         ${misc:Depends}
 Description: Development files for kscreenlocker
  Library and components for secure lock screen architecture.
  .
  This package contains development files for kscreenlocker.
 
+Package: kde-config-screenlocker
+Architecture: all
+Depends: kscreenlocker, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
+
 Package: libkscreenlocker6
-Architecture: any
-Depends: psmisc, ${misc:Depends}, ${shlibs:Depends}
-Recommends: kde-config-screenlocker
+Architecture: all
+Depends:, kscreenlocker, ${misc:Depends}
 Replaces: libkscreenlocker5
-Multi-Arch: same
-Description: Secure lock screen architecture
- Library and components for secure lock screen architecture.
+Description: Dummy transitional
+ Transitional dummy package.
 
 Package: libkscreenlocker5
 Architecture: all
-Depends: libkscreenlocker5, ${misc:Depends}
+Depends: libkscreenlocker6, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
  
\ No newline at end of file
diff --git a/debian/kde-config-screenlocker.lintian-overrides b/debian/kde-config-screenlocker.lintian-overrides
deleted file mode 100644
index e9d7c07..0000000
--- a/debian/kde-config-screenlocker.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-kde-config-screenlocker: desktop-command-not-in-package usr/share/applications/kcm_screenlocker.desktop systemsettings
diff --git a/debian/kde-config-screenlocker.install b/debian/kscreenlocker.install
similarity index 53%
rename from debian/kde-config-screenlocker.install
rename to debian/kscreenlocker.install
index 1018ce8..aade007 100644
--- a/debian/kde-config-screenlocker.install
+++ b/debian/kscreenlocker.install
@@ -1,6 +1,12 @@
+../pam.d/* usr/lib/pam.d/
+
+usr/lib/*/libKScreenLocker.so.6
+usr/lib/*/libKScreenLocker.so.5.*
+usr/lib/*/libexec/
 usr/lib/*/qt6/plugins/plasma/kcms/systemsettings/kcm_screenlocker.so
 usr/share/applications/kcm_screenlocker.desktop
 usr/share/kconf_update/*
 usr/share/knotifications6/*
 usr/share/ksmserver/*
-usr/share/locale/*/*/kcm_screenlocker.mo
+usr/share/locale/*/*/
+usr/share/qlogging-categories6/
diff --git a/debian/kscreenlocker.lintian-overrides b/debian/kscreenlocker.lintian-overrides
new file mode 100644
index 0000000..e919837
--- /dev/null
+++ b/debian/kscreenlocker.lintian-overrides
@@ -0,0 +1,3 @@
+kscreenlocker: desktop-command-not-in-package usr/share/applications/kcm_screenlocker.desktop systemsettings
+
+kscreenlocker: killall-is-dangerous [postinst:12]
\ No newline at end of file
diff --git a/debian/libkscreenlocker6.postinst b/debian/kscreenlocker.postinst
similarity index 100%
rename from debian/libkscreenlocker6.postinst
rename to debian/kscreenlocker.postinst
diff --git a/debian/libkscreenlocker6.install b/debian/libkscreenlocker6.install
deleted file mode 100644
index 34d5826..0000000
--- a/debian/libkscreenlocker6.install
+++ /dev/null
@@ -1,8 +0,0 @@
-usr/lib/*/libKScreenLocker.so.6
-usr/lib/*/libKScreenLocker.so.5.*
-usr/lib/*/libexec/
-usr/share/qlogging-categories6/kscreenlocker.categories
-usr/share/locale/*/*/kscreenlocker.mo
-usr/share/locale/*/*/kscreenlocker_greet.mo
-
-../pam.d/* usr/lib/pam.d/
diff --git a/debian/libkscreenlocker6.lintian-overrides b/debian/libkscreenlocker6.lintian-overrides
deleted file mode 100644
index 72983df..0000000
--- a/debian/libkscreenlocker6.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libkscreenlocker6: killall-is-dangerous postinst:12