[neon/kde/kldap/Neon/unstable] debian: lint

[Carlos De Maine]

Git commit a192bb03c182d9d1d20dacf2f39b410308ea0859 by Carlos De Maine.
Committed on 30/11/2023 at 05:37.
Pushed by carlosdem into branch 'Neon/unstable'.

lint

M  +2    -2    debian/changelog
M  +47   -12   debian/control
D  +0    -4    debian/kio6-ldap.install
D  +0    -2    debian/kio6-ldap.maintscript
M  +3    -1    debian/kpim6-kldap.install
M  +1    -2    debian/kpim6-kldap.lintian-overrides
M  +1    -1    debian/rules

https://invent.kde.org/neon/kde/kldap/-/commit/a192bb03c182d9d1d20dacf2f39b410308ea0859

diff --git a/debian/changelog b/debian/changelog
index 443c09f..4fcb0e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -134,7 +134,7 @@ kldap (21.12.0-0neon) focal; urgency=medium
 
   * New release
 
- -- Neon CI <neon at kde.org>  Wed, 03 Nov 2021.12.25:17 +0000
+ -- Neon CI <neon at kde.org>  Wed, 03 Nov 2021 12:25:17 +0000
 
 kldap (21.08.2-0neon) focal; urgency=medium
 
@@ -194,7 +194,7 @@ kldap (20.12.1-0neon) focal; urgency=medium
 
   * New release
 
- -- Neon CI <neon at kde.org>  Thu, 07 Jan 2021.12.27:41 +0000
+ -- Neon CI <neon at kde.org>  Thu, 07 Jan 2021 12:27:41 +0000
 
 kldap (20.12.0-0neon) focal; urgency=medium
 
diff --git a/debian/control b/debian/control
index 38d0546..eedbed4 100644
--- a/debian/control
+++ b/debian/control
@@ -29,6 +29,11 @@ Architecture: any
 X-Neon-MergedPackage: true
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Provides: libkpim6ldap6,
+          libkf6ldap6,
+          libkf5ldap5,
+          kio-ldap,
+          kio6-ldap
 Description: library for accessing LDAP
  This is a library for accessing LDAP with a convenient Qt style C++ API.
  LDAP (Lightweight Directory Access Protocol) is an application protocol
@@ -45,6 +50,9 @@ Depends: kpim6-kldap (= ${binary:Version}),
          libsasl2-dev,
          qt6-base-dev,
          ${misc:Depends}
+Provides: libkpim6ldap-dev,
+          libkf6ldap-dev,
+          libkf5ldap-dev
 Description: library for accessing LDAP - development files
  This is a library for accessing LDAP with a convenient Qt style C++ API.
  LDAP (Lightweight Directory Access Protocol) is an application protocol
@@ -53,24 +61,51 @@ Description: library for accessing LDAP - development files
  This package contains the development files.
 
 Package: kio6-ldap
-Architecture: any
-Multi-Arch: no
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: library for accessing LDAP - development files
- This is a library for accessing LDAP with a convenient Qt style C++ API.
- LDAP (Lightweight Directory Access Protocol) is an application protocol
- for querying and modifying directory services running over TCP/IP.
- .
- This package contains the KIO slave.
+Architecture: all
+Depends: kpim6-kldap, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
 
-Package: libkf6ldap-dev
+Package: kio-ldap
+Architecture: all
+Depends: kpim6-kldap, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libkpim6ldap6
+Architecture: all
+Depends: kpim6-kldap, ${misc:Depends}
+Provides: libkf6ldap6, libkf5ldap5
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libkpim6ldap-dev
 Architecture: all
-Depends: kpim6-kldap-dev
+Depends: kpim6-kldap-dev, ${misc:Depends}
+Provides: libkf6ldap-dev, libkf5ldap-dev
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: libkf6ldap6
 Architecture: all
-Depends: kpim6-kldap
+Depends: libkpim6ldap6, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libkf6ldap-dev
+Architecture: all
+Depends: libkpim6ldap-dev, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libkf5ldap5
+Architecture: all
+Depends: libkpim6ldap6, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libkf5ldap-dev
+Architecture: all
+Depends: libkpim6ldap-dev, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
diff --git a/debian/kio6-ldap.install b/debian/kio6-ldap.install
deleted file mode 100644
index ce65df7..0000000
--- a/debian/kio6-ldap.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/*/qt6/plugins/kf6/kio/ldap.so
-usr/share/locale/*/LC_MESSAGES/kio_ldap.mo
-usr/share/qlogging-categories6/kldap.categories
-usr/share/qlogging-categories6/kldap.renamecategories
diff --git a/debian/kio6-ldap.maintscript b/debian/kio6-ldap.maintscript
deleted file mode 100644
index 4157bdc..0000000
--- a/debian/kio6-ldap.maintscript
+++ /dev/null
@@ -1,2 +0,0 @@
-rm_conffile /etc/xdg/kldap.categories
-rm_conffile /etc/xdg/kldap.renamecategories
diff --git a/debian/kpim6-kldap.install b/debian/kpim6-kldap.install
index a0bbfc2..ef32c1f 100644
--- a/debian/kpim6-kldap.install
+++ b/debian/kpim6-kldap.install
@@ -2,5 +2,7 @@ usr/lib/*/libKPim6LdapCore.so.6
 usr/lib/*/libKPim6LdapCore.so.*.*
 usr/lib/*/libKPim6LdapWidgets.so.6
 usr/lib/*/libKPim6LdapWidgets.so.*.*
+usr/lib/*/qt6/plugins/kf6/kio/ldap.so
 usr/share/doc
-usr/share/locale/*/LC_MESSAGES/libkldap5.mo
+usr/share/locale/*/LC_MESSAGES/
+usr/share/qlogging-categories6/
diff --git a/debian/kpim6-kldap.lintian-overrides b/debian/kpim6-kldap.lintian-overrides
index a9a7ada..4fa1680 100644
--- a/debian/kpim6-kldap.lintian-overrides
+++ b/debian/kpim6-kldap.lintian-overrides
@@ -1,2 +1 @@
-kpim6-kldap: package-name-doesnt-match-sonames libKPim6Ldap6
-
+kpim6-kldap: package-name-doesnt-match-sonames libKPim6LdapCore6 libKPim6LdapWidgets6
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 141287f..7ff1376 100644
--- a/debian/rules
+++ b/debian/rules
@@ -8,4 +8,4 @@
 override_dh_auto_configure:
 	dh_auto_configure -- \
 		-DCOMPILE_WITH_UNITY_CMAKE_SUPPORT=ON \
-		-DBUILD_QCH=ON
\ No newline at end of file
+		-DBUILD_QCH=ON