[neon/kde/akonadi-search/Neon/unstable] /: lints

[Carlos De Maine]

Git commit 6f1c706a7afc5e4077dd7d40b4a0da82abdcdfb0 by Carlos De Maine.
Committed on 27/11/2023 at 12:20.
Pushed by carlosdem into branch 'Neon/unstable'.

lints

D  +0    -1    .gitattributes
D  +0    -1    debian/.gitattributes
D  +0    -1    debian/.gitignore
M  +3    -3    debian/changelog
M  +56   -10   debian/control
M  +0    -1    debian/copyright
M  +0    -4    debian/kpim6-akonadi-search.lintian-overrides
M  +1    -1    debian/rules

https://invent.kde.org/neon/kde/akonadi-search/-/commit/6f1c706a7afc5e4077dd7d40b4a0da82abdcdfb0

diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index 5d42584..0000000
--- a/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-debian/changelog merge=dpkg-mergechangelogs
diff --git a/debian/.gitattributes b/debian/.gitattributes
deleted file mode 100644
index 6a03163..0000000
--- a/debian/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-changelog merge=dpkg-mergechangelogs
diff --git a/debian/.gitignore b/debian/.gitignore
deleted file mode 100644
index 027271b..0000000
--- a/debian/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-files
diff --git a/debian/changelog b/debian/changelog
index 61e6f74..98a514e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -164,7 +164,7 @@ akonadi-search (4:21.08.0-0neon) focal; urgency=medium
 
   * New release
 
- -- Neon CI <neon at kde.org>  Tue, 10 Aug 2021.12.26:44 +0000
+ -- Neon CI <neon at kde.org>  Tue, 10 Aug 2021 12:26:44 +0000
 
 akonadi-search (4:21.04.3-0neon) focal; urgency=medium
 
@@ -206,7 +206,7 @@ akonadi-search (4:20.12.1-0neon) focal; urgency=medium
 
   * New release
 
- -- Neon CI <neon at kde.org>  Thu, 07 Jan 2021.12.21:59 +0000
+ -- Neon CI <neon at kde.org>  Thu, 07 Jan 2021 12:21:59 +0000
 
 akonadi-search (4:20.12.0-0neon) focal; urgency=medium
 
@@ -583,7 +583,7 @@ akonadi-search (4:15.08.0-0ubuntu1) wily; urgency=medium
 
   * new upstream release
 
- -- Ubuntu <ubuntu at ip-10-170-33-178.ec2.internal>  Wed, 26 Aug 2015 16:10:09 +0100
+ --  Jonathan Riddell <jriddell at ubuntu.com>  Wed, 26 Aug 2015 16:10:09 +0100
 
 akonadi-search (4:15.07.90-0ubuntu1) wily; urgency=medium
 
diff --git a/debian/control b/debian/control
index e90ae16..7cab0fb 100644
--- a/debian/control
+++ b/debian/control
@@ -39,7 +39,6 @@ Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/akonadi-search.git
 Package: kpim6-akonadi-search
 Architecture: any
 X-Neon-MergedPackage: true
-Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Akonadi search library - data files
  Library used to search in the Akonadi PIM data server.
@@ -49,7 +48,6 @@ Description: Akonadi search library - data files
 Package: kpim6-akonadi-search-dev
 Architecture: any
 X-Neon-MergedPackage: true
-Multi-Arch: same
 Depends: kf6-kcalendarcore-dev,
          kf6-kcontacts-dev,
          kpim6-akonadi-dev,
@@ -65,48 +63,96 @@ Description: Akonadi search library - development files
 
 Package: libkf6akonadisearch-bin
 Architecture: all
-Depends: kpim6-akonadi-search
+Depends: kpim6-akonadi-search, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: libkf6akonadisearch-data
 Architecture: all
-Depends: kpim6-akonadi-search
+Depends: kpim6-akonadi-search, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: libkf6akonadisearch-dev
 Architecture: all
-Depends: kpim6-akonadi-search-dev
+Depends: kpim6-akonadi-search-dev, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: libkf6akonadisearch-plugins
 Architecture: all
-Depends: kpim6-akonadi-search
+Depends: kpim6-akonadi-search, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: libkf6akonadisearchcore6
 Architecture: all
-Depends: kpim6-akonadi-search
+Depends: kpim6-akonadi-search, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: libkf6akonadisearchdebug6
 Architecture: all
-Depends: kpim6-akonadi-search
+Depends: kpim6-akonadi-search, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: libkf6akonadisearchpim6
 Architecture: all
-Depends: kpim6-akonadi-search
+Depends: kpim6-akonadi-search, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
 
 Package: libkf6akonadisearchxapian6
 Architecture: all
-Depends: kpim6-akonadi-search
+Depends: kpim6-akonadi-search, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libkf5akonadisearch-bin
+Architecture: all
+Depends: kpim6-akonadi-search, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libkf5akonadisearch-data
+Architecture: all
+Depends: kpim6-akonadi-search, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libkf5akonadisearch-dev
+Architecture: all
+Depends: kpim6-akonadi-search-dev, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libkf5akonadisearch-plugins
+Architecture: all
+Depends: kpim6-akonadi-search, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libkf5akonadisearchcore5
+Architecture: all
+Depends: kpim6-akonadi-search, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libkf5akonadisearchdebug5
+Architecture: all
+Depends: kpim6-akonadi-search, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libkf5akonadisearchpim5
+Architecture: all
+Depends: kpim6-akonadi-search, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libkf5akonadisearchxapian5
+Architecture: all
+Depends: kpim6-akonadi-search, ${misc:Depends}
 Description: Dummy transitional
  Transitional dummy package.
diff --git a/debian/copyright b/debian/copyright
index 1e6b0d0..56ed358 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,7 +13,6 @@ Files: runner/pimcontactsrunner.cpp
        runner/pimcontactsrunner.h
        runner/pimcontactsrunnerconfig.cpp
        runner/pimcontactsrunnerconfig.h
-       runner/plasma-krunner-pimcontacts.desktop
        xapian/autotests/queryparsertest.cpp
        xapian/autotests/queryparsertest.h
        xapian/autotests/termgeneratortest.cpp
diff --git a/debian/kpim6-akonadi-search.lintian-overrides b/debian/kpim6-akonadi-search.lintian-overrides
index f223f1c..e69de29 100644
--- a/debian/kpim6-akonadi-search.lintian-overrides
+++ b/debian/kpim6-akonadi-search.lintian-overrides
@@ -1,4 +0,0 @@
-kpim6-akonadi-search: package-name-doesnt-match-sonames libKPim6AkonadiSearchXapian6
-kpim6-akonadi-search: package-name-doesnt-match-sonames libKPim5AkonadiSearchPIM5
-libkf5akonadisearchdebug5: package-name-doesnt-match-sonames libKPim5AkonadiSearchDebug5
-libkf5akonadisearchcore5: package-name-doesnt-match-sonames libKPim5AkonadiSearchCore5
diff --git a/debian/rules b/debian/rules
index 141287f..7ff1376 100755
--- 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