[neon/kde/akonadi/Neon/unstable] debian: linting

[Carlos De Maine]

Git commit c7f03cdb795293ec2db6e94383b12d15cec6f7f4 by Carlos De Maine.
Committed on 27/11/2023 at 11:22.
Pushed by carlosdem into branch 'Neon/unstable'.

linting

D  +0    -1    debian/.gitattributes
D  +0    -1    debian/.gitignore
M  +7    -7    debian/control
M  +0    -11   debian/copyright
M  +1    -1    debian/patches/series

https://invent.kde.org/neon/kde/akonadi/-/commit/c7f03cdb795293ec2db6e94383b12d15cec6f7f4

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/control b/debian/control
index 7e70f20..135c2e1 100644
--- a/debian/control
+++ b/debian/control
@@ -51,8 +51,8 @@ Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/akonadi.git
 
 Package: kpim6-akonadi
 Architecture: any
+Section: kde
 X-Neon-MergedPackage: true
-Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Provides: akonadi-backend-sqlite, 
           akonadi-server,
@@ -88,9 +88,9 @@ Description: Akonadi core library
  This package is part of the KDE Development Platform PIM libraries module.
 
 Package: kpim6-akonadi-dev
-Section: libdevel
-X-Neon-MergedPackage: true
 Architecture: any
+Section: kde
+X-Neon-MergedPackage: true
 Depends: kf6-kcompletion-dev,
          kf6-kitemmodels-dev,
          kf6-kxmlgui-dev,
@@ -199,8 +199,8 @@ Description: Dummy transitional
 
 Package: libkf6akonadiwidgets6
 Architecture: all
-Depends: kpim6-akonadi
-Description: Dummy transitional, ${misc:Depends}
+Depends: kpim6-, ${misc:Depends}
+Description: Dummy transitional
  Transitional dummy package.
 
 Package: libkf6akonadixml6
@@ -253,8 +253,8 @@ Description: Dummy transitional
 
 Package: libkf5akonadiwidgets5
 Architecture: all
-Depends: kpim6-akonadi
-Description: Dummy transitional, ${misc:Depends}
+Depends: kpim6-akonadi, ${misc:Depends}
+Description: Dummy transitional
  Transitional dummy package.
 
 Package: libkf5akonadixml5
diff --git a/debian/copyright b/debian/copyright
index 5e0d098..9e02f87 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -148,17 +148,6 @@ Copyright: 2006, David Faure <faure at kde.org>
            2009, Volker Krause <vkrause at kde.org>
 License: LGPL-2
 
-Files: src/qsqlite/src/qsql_sqlite.h
-       src/qsqlite/src/smain.cpp
-Copyright: 2009, Nokia Corporation and/or its subsidiary(-ies)
-License: GPL-3_or_LGPL-2.1-QTexception-1.0
-
-Files: src/qsqlite/src/qsql_sqlite.cpp
-Copyright: 2013, Digia Plc and/or its subsidiary(-ies)
-           2009-2010, Nokia Corporation and/or its subsidiary(-ies)
-           2013, Olivier Goffart <ogoffart at woboq.com>
-License: GPL-3_or_LGPL-2.1-QTexception-1.1
-
 License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
diff --git a/debian/patches/series b/debian/patches/series
index 8a337cb..725cf0a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
 postgresql-data-checksums.patch
 disable_secure_file_priv_check.diff
-load_local_apparmor_rules.diff
\ No newline at end of file
+load_local_apparmor_rules.diff