[neon/kde/akonadi/Neon/stable] debian: merge Neon/unstable into Neon/stable

[Carlos De Maine]

Git commit b5a1b199689acb883d19743f7f2e5c597671b3bc by Carlos De Maine.
Committed on 21/07/2023 at 22:01.
Pushed by carlosdem into branch 'Neon/stable'.

merge Neon/unstable into Neon/stable

M  +0    -1    debian/akonadi-backend-sqlite.install
M  +1    -7    debian/control
M  +1    -4    debian/rules

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

diff --git a/debian/akonadi-backend-sqlite.install b/debian/akonadi-backend-sqlite.install
index ae92a4a..e69de29 100644
--- a/debian/akonadi-backend-sqlite.install
+++ b/debian/akonadi-backend-sqlite.install
@@ -1 +0,0 @@
-usr/lib/*/qt5/plugins/sqldrivers/libqsqlite3.so
diff --git a/debian/control b/debian/control
index 3c6b61b..6268fba 100644
--- a/debian/control
+++ b/debian/control
@@ -96,13 +96,7 @@ Description: SQLite storage backend for Akonadi
  storage service. It provides a common framework for applications to store and
  access mail, calendars, addressbooks, and other PIM data.
  .
- This package installs everything what's needed for Akonadi to work with SQLite
- as underlying data storage engine. Since SQLite is an embedded database
- engine, a separate SQL server daemon is not necessary.
- .
- In addition, the package contains an improved QSql driver for SQLite named
- "QSQLite3". It can be used by any application that needs to access SQLite
- databases via standard Qt QSql framework.
+ This is a dummy transitional package and can be removed.
 
 Package: akonadi-server
 Section: net
diff --git a/debian/rules b/debian/rules
index 927ba53..648ac0a 100644
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,6 @@ backend_packages = $(filter akonadi-backend-%,$(shell dh_listpackages))
 
 override_dh_auto_configure:
 	$(overridden_command) -- -DMYSQLD_EXECUTABLE:STRING=/usr/sbin/mysqld-akonadi \
-	    -DINSTALL_QSQLITE_IN_QT_PREFIX=ON \
 	    -DBUILD_TESTING=OFF -DBUILD_TOOLS=ON \
 	    -D_testrunner=/usr/bin/akonaditest
 
@@ -20,9 +19,7 @@ override_dh_installinit:
 	dh_apparmor -pakonadi-backend-mysql --profile-name=mysqld_akonadi
 
 override_dh_installdocs:
-	# Install README.Debian to backend packages
-	$(overridden_command) -A -pakonadi-server $(foreach p,$(backend_packages),-p$(p)) debian/README.Debian
-	$(overridden_command) --remaining-packages
+	:
 
 override_dh_makeshlibs:
 	$(overridden_command) -V -- -c0