[neon/kde/akonadi/Neon/unstable] debian/patches: Merge branch 'Neon/stable' into Neon/unstable

[Jonathan Riddell]

Git commit 43cf14c4af69027070f041660e05329b706d18ed by Jonathan Riddell.
Committed on 07/10/2020 at 13:33.
Pushed by jriddell into branch 'Neon/unstable'.

Merge branch 'Neon/stable' into Neon/unstable

M  +1    -1    debian/patches/postgresql-data-checksums.patch

https://invent.kde.org/neon/kde/akonadi/commit/43cf14c4af69027070f041660e05329b706d18ed

diff --cc debian/patches/postgresql-data-checksums.patch
index a67f51a,f0b465d..252caab
--- a/debian/patches/postgresql-data-checksums.patch
+++ b/debian/patches/postgresql-data-checksums.patch
@@@ -6,11 -6,11 +6,11 @@@ Subject: postgresql-data-checksum
   src/server/storage/dbconfigpostgresql.cpp | 1 +
   1 file changed, 1 insertion(+)
  
- Index: akonadi/src/server/storage/dbconfigpostgresql.cpp
+ Index: akonadi-20.08.2/src/server/storage/dbconfigpostgresql.cpp
  ===================================================================
 ---- akonadi-20.08.2.orig/src/server/storage/dbconfigpostgresql.cpp
 -+++ akonadi-20.08.2/src/server/storage/dbconfigpostgresql.cpp
 -@@ -281,6 +281,7 @@ bool DbConfigPostgresql::runInitDb(const
 +--- akonadi.orig/src/server/storage/dbconfigpostgresql.cpp
 ++++ akonadi/src/server/storage/dbconfigpostgresql.cpp
 +@@ -306,6 +306,7 @@ bool DbConfigPostgresql::runInitDb(const
   
       // call 'initdb --pgdata=/home/user/.local/share/akonadi/data_db'
       return execute(mInitDbPath, { QStringLiteral("--pgdata=%1").arg(newDbPath),