From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sun, 1 Sep 2019 17:12:56 +0000 (+0100)
Subject: Merge version 5:102+rpi1 and 5:104 to produce 5:104+rpi1
X-Git-Tag: raspbian/5%104+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fd5714e9837b8438ce5da7033b818c19bcb9dca5;p=meta-kde.git

Merge version 5:102+rpi1 and 5:104 to produce 5:104+rpi1
---

2de476d4fa25903b3cbe8523568dc2861eb8d635
diff --cc debian/changelog
index 4d13518,c6f5cc4..3915d72
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,20 +1,32 @@@
- meta-kde (5:102+rpi1) buster-staging; urgency=medium
++meta-kde (5:104+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 5:93+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 17 Dec 2017 04:35:56 +0000]
 +  * Remove armhf from arch list for kalgebra dependency, sadly we don't
 +    currently have the full kalgebra in Raspbian due to webengine.
 +
 +  [changes brought forward from 5:98+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Wed, 24 Jan 2018 07:36:26 +0000]
 +  * Align dependencies for armhf to those for armel as we don't currently have
 +    qtwebengine in Raspbian.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 20 Jun 2018 20:59:45 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 01 Sep 2019 17:12:55 +0000
++
+ meta-kde (5:104) unstable; urgency=medium
+ 
+   * Team upload.
+   * Temporarily move kopete from kde-standard and kdenetwork depends to
+     suggests until kf5 version is in unstable
+ 
+  -- Scott Kitterman <scott@kitterman.com>  Mon, 26 Aug 2019 13:06:45 -0400
+ 
+ meta-kde (5:103) unstable; urgency=medium
+ 
+   * Team upload.
+   * Drop kde-sc-dev-latest. It is no longer needed (no rdeps according to dak)
+     and is currently stopping automoc's removal (Closes: #935736).
+   * Bump Standards-Version to 4.4.0, no changes required.
+   * Bump debhelper compatibility to 12.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>  Sun, 25 Aug 2019 16:10:42 -0300
  
  meta-kde (5:102) unstable; urgency=medium
  
diff --cc debian/control
index b12f590,699cc27..2fe31f5
--- a/debian/control
+++ b/debian/control
@@@ -44,9 -44,8 +44,8 @@@ Depends: akregator (>= ${kdepim:Version
           kde-plasma-desktop (>= ${source:Version}),
           kde-spectacle (>= ${kde:VersionNoEpoch}),
           khelpcenter (>= ${kde:Version}),
 -         kmail (>= ${kdepim:Version}) [amd64 arm64 armhf i386 mipsel],
 +         kmail (>= ${kdepim:Version}) [amd64 arm64 i386 mipsel],
           knotes (>= ${kdepim:Version}),
-          kopete (>= ${kde:Version}),
           korganizer (>= ${kdepim:Version}),
           kwalletmanager (>= ${kde:Version}),
           okular (>= ${kde:Version}),