From: Peter Michael Green <plugwash@raspbian.org>
Date: Wed, 23 Dec 2020 05:56:37 +0000 (+0000)
Subject: Manual merge of version 4:20.08.2-4+rpi1 and 4:20.08.3-1 to produce 4:20.08.3-1+rpi1
X-Git-Tag: archive/raspbian/4%20.08.3-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=26fe0417c37dab18cbfb0477f00179129d7f5fac;p=kdepim-runtime.git

Manual merge of version 4:20.08.2-4+rpi1 and 4:20.08.3-1 to produce 4:20.08.3-1+rpi1
---

26fe0417c37dab18cbfb0477f00179129d7f5fac
diff --cc debian/changelog
index 5eb31181,9cdc1680..505a0be5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,15 +1,27 @@@
- kdepim-runtime (4:20.08.2-4+rpi1) bullseye-staging; urgency=medium
++kdepim-runtime (4:20.08.3-1+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 4:18.08.3-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 03 Apr 2019 22:53:45 +0000]
 +  * Remove armhf from architecture list for build-depends on libkpimgapi-dev 
 +    and qtwebengine5-dev
 +
 +  [changes brought forward from 4:18.08.3-4+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Thu, 04 Apr 2019 13:53:23 +0000]
 +  * Remove armhf from architecture list for depends on
 +    libsasl2-modules-kdexoauth2
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 05 Nov 2020 19:28:55 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Wed, 23 Dec 2020 05:55:52 +0000
++
+ kdepim-runtime (4:20.08.3-1) unstable; urgency=medium
+ 
+   [ Sandro Knauß ]
+   * Bump Standards-Version to 4.5.1 (No changes needed).
+   * New upstream release (20.08.3).
+   * Update build-deps and deps with the info from cmake.
+   * Add kmailtransport-akonadi to Depends, as Exchange EWS resource
+     needs it to be able to send emails (Closes: #973567)
+   * Remove not existing version dependency from akonadi-server.
+   * Minimize the upstream GPG signing key.
+ 
+  -- Sandro Knauß <hefee@debian.org>  Wed, 16 Dec 2020 01:50:15 +0100
  
  kdepim-runtime (4:20.08.2-4) unstable; urgency=medium
  
diff --cc debian/control
index 2e3d4b95,c773fe30..fcfd187b
--- a/debian/control
+++ b/debian/control
@@@ -44,7 -44,7 +44,7 @@@ Build-Depends: cmake (>= 3.5~)
                 libkf5textwidgets-dev (>= 5.71.0~),
                 libkf5windowsystem-dev (>= 5.71.0~),
                 libkolabxml-dev (>= 1.1~),
-                libkpimgapi-dev (>= 20.08.2~) [amd64 arm64 i386 mipsel],
 -               libkpimgapi-dev (>= 20.08.3~) [amd64 arm64 armhf i386 mipsel],
++               libkpimgapi-dev (>= 20.08.3~) [amd64 arm64 i386 mipsel],
                 libqca-qt5-2-dev (>= 2.3.0~),
                 libqt5networkauth5-dev (>= 5.13.0~),
                 libqt5texttospeech5-dev,
@@@ -53,10 -53,10 +53,10 @@@
                 pkg-config,
                 pkg-kde-tools (>= 0.12),
                 qtbase5-dev (>= 5.13.0~),
 -               qtwebengine5-dev (>= 5.13.0~) [amd64 arm64 armhf i386 mipsel],
 +               qtwebengine5-dev (>= 5.13.0~) [amd64 arm64 i386 mipsel],
                 shared-mime-info (>= 1.3~),
-                xsltproc,
- Standards-Version: 4.5.0
+                xsltproc
+ Standards-Version: 4.5.1
  Homepage: https://invent.kde.org/pim/kdepim-runtime
  Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kdepim-runtime
  Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kdepim-runtime.git
@@@ -64,16 -64,17 +64,17 @@@ Rules-Requires-Root: n
  
  Package: kdepim-runtime
  Architecture: any
- Depends: akonadi-server (>= 1.8),
+ Depends: akonadi-server,
           kio-ldap,
-          libsasl2-modules-kdexoauth2 [amd64 arm64 i386 mipsel],
           libsasl2-modules,
 -         libsasl2-modules-kdexoauth2 [amd64 arm64 armhf i386 mipsel],
++         libsasl2-modules-kdexoauth2 [amd64 arm64 i386 mipsel],
+          kmailtransport-akonadi,
           ${misc:Depends},
-          ${shlibs:Depends},
+          ${shlibs:Depends}
  Breaks: libkf5libkdepim-data (<< 4:20.08~),
-         libkf5libkdepim-plugins (<< 4:20.08~),
+         libkf5libkdepim-plugins (<< 4:20.08~)
  Replaces: libkf5libkdepim-data (<< 4:20.08~),
-           libkf5libkdepim-plugins (<< 4:20.08~),
+           libkf5libkdepim-plugins (<< 4:20.08~)
  Description: runtime components for Akonadi KDE
   This package contains Akonadi agents written using KDE Development Platform
   libraries.