From: Raspbian automatic forward porter Date: Thu, 29 Oct 2020 17:36:55 +0000 (+0000) Subject: Merge version 4:20.04.1-2+rpi1 and 4:20.08.2-3 to produce 4:20.08.2-3+rpi1 X-Git-Tag: archive/raspbian/4%20.08.2-3+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=99c869350afa5594e7bad70813178fbef4ecb27e;p=kdepim-runtime.git Merge version 4:20.04.1-2+rpi1 and 4:20.08.2-3 to produce 4:20.08.2-3+rpi1 --- 99c869350afa5594e7bad70813178fbef4ecb27e diff --cc debian/changelog index 856d6647,9c818869..472e49b9 --- a/debian/changelog +++ b/debian/changelog @@@ -1,14 -1,30 +1,42 @@@ - kdepim-runtime (4:20.04.1-2+rpi1) bullseye-staging; urgency=medium ++kdepim-runtime (4:20.08.2-3+rpi1) bullseye-staging; urgency=medium + + [changes brought forward from 4:18.08.3-4+rpi1 by Peter Michael Green 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 at Thu, 04 Apr 2019 13:53:23 +0000] + * Remove armhf from architecture list for depends on + libsasl2-modules-kdexoauth2 + - -- Raspbian forward porter Tue, 01 Sep 2020 10:46:14 +0000 ++ -- Raspbian forward porter Thu, 29 Oct 2020 17:36:54 +0000 ++ + kdepim-runtime (4:20.08.2-3) unstable; urgency=medium + + * Team upload. + * Break/replace also libkf5libkdepim-plugins < 20.08. (Closes: #972664) + + -- Pino Toscano Fri, 23 Oct 2020 14:39:37 +0200 + + kdepim-runtime (4:20.08.2-2) unstable; urgency=medium + + * Team upload to unstable. + + -- Sandro Knauß Tue, 20 Oct 2020 00:09:02 +0200 + + kdepim-runtime (4:20.08.2-1) experimental; urgency=medium + + [ Sandro Knauß ] + * New upstream release (20.08.2). + * Update build-deps and deps with the info from cmake. + * Update Homepage link to point to new invent.kde.org + * Update field Source in debian/copyright to invent.kde.org move. + * Update repository related entries to metadata file. + * Remove backported patch. + * Update patch hunks. + * Update copyright file for 20.08. + * Breaks/Replaces against libkf5libkdepim-data. + + -- Sandro Knauß Fri, 16 Oct 2020 00:53:10 +0200 kdepim-runtime (4:20.04.1-2) unstable; urgency=medium diff --cc debian/control index fcc700c6,6d27a4fb..a720aff2 --- a/debian/control +++ b/debian/control @@@ -13,48 -13,51 +13,51 @@@ Build-Depends: cmake (>= 3.5~) gettext, libboost-dev, libboost-program-options-dev, - libkf5akonadi-dev (>= 4:20.04.1~), - libkf5akonadicalendar-dev (>= 4:20.04.1~), - libkf5akonadicontact-dev (>= 4:20.04.1~), - libkf5akonadimime-dev (>= 4:20.04.1~), - libkf5akonadinotes-dev (>= 4:20.04.1~), - libkf5alarmcalendar-dev (>= 4:20.04.1~), - libkf5calendarcore-dev (>= 5:5.68.0~), - libkf5calendarutils-dev (>= 4:20.04.1~), - libkf5codecs-dev (>= 5.68.0~), - libkf5config-dev (>= 5.68.0~), - libkf5configwidgets-dev (>= 5.68.0~), - libkf5contacts-dev (>= 5:5.68.0~), - libkf5dav-dev (>= 20.04.1~), - libkf5doctools-dev (>= 5.68.0~), - libkf5holidays-dev (>= 1:5.68.0~), - libkf5identitymanagement-dev (>= 20.04.1~), - libkf5imap-dev (>= 20.04.1~), - libkf5itemmodels-dev (>= 5.68.0~), - libkf5kio-dev (>= 5.68.0~), - libkf5mailtransport-dev (>= 20.04.1~), - libkf5mbox-dev (>= 20.04.1~), - libkf5mime-dev (>= 20.04.1~), - libkf5notifications-dev (>= 5.68.0~), - libkf5notifyconfig-dev (>= 5.68.0~), - libkf5pimcommon-dev (>= 4:20.04.1~), - libkf5textwidgets-dev (>= 5.68.0~), - libkf5windowsystem-dev (>= 5.68.0~), + libkf5akonadi-dev (>= 4:20.08.2~), + libkf5akonadicalendar-dev (>= 4:20.08.2~), + libkf5akonadicontact-dev (>= 4:20.08.2~), + libkf5akonadimime-dev (>= 4:20.08.2~), + libkf5akonadinotes-dev (>= 4:20.08.2~), + libkf5alarmcalendar-dev (>= 4:20.08.2~), + libkf5calendarcore-dev (>= 5:5.71.0~), + libkf5calendarutils-dev (>= 4:20.08.2~), + libkf5codecs-dev (>= 5.71.0~), + libkf5config-dev (>= 5.71.0~), + libkf5configwidgets-dev (>= 5.71.0~), + libkf5contacts-dev (>= 5:5.71.0~), + libkf5dav-dev (>= 1:5.15.2~), + libkf5doctools-dev (>= 5.71.0~), + libkf5holidays-dev (>= 1:5.71.0~), + libkf5identitymanagement-dev (>= 20.08.2~), + libkf5imap-dev (>= 20.08.2~), + libkf5itemmodels-dev (>= 5.71.0~), + libkf5kcmutils-dev (>= 5.71.0~), + libkf5kio-dev (>= 5.71.0~), + libkf5ldap-dev (>= 20.08.2~), + libkf5libkdepim-dev (>= 4:20.08.2~), + libkf5mailtransport-dev (>= 20.08.2~), + libkf5mbox-dev (>= 20.08.2~), + libkf5mime-dev (>= 20.08.2~), + libkf5notifications-dev (>= 5.71.0~), + libkf5notifyconfig-dev (>= 5.71.0~), + libkf5pimcommon-dev (>= 4:20.08.2~), + libkf5textwidgets-dev (>= 5.71.0~), + libkf5windowsystem-dev (>= 5.71.0~), libkolabxml-dev (>= 1.1~), - libkpimgapi-dev (>= 20.04.1~) [amd64 arm64 i386 mipsel], - libqca-qt5-2-dev, - libqt5networkauth5-dev (>= 5.12.0~), - libkpimgapi-dev (>= 20.08.2~) [amd64 arm64 armhf i386 mipsel], ++ libkpimgapi-dev (>= 20.08.2~) [amd64 arm64 i386 mipsel], + libqca-qt5-2-dev (>= 2.3.0~), + libqt5networkauth5-dev (>= 5.13.0~), libqt5texttospeech5-dev, - libqt5xmlpatterns5-dev (>= 5.12.0~), + libqt5xmlpatterns5-dev (>= 5.13.0~), libsasl2-dev, pkg-config, pkg-kde-tools (>= 0.12), - qtbase5-dev (>= 5.12.0~), - qtwebengine5-dev (>= 5.12.0~) [amd64 arm64 i386 mipsel], + 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 + xsltproc, Standards-Version: 4.5.0 - Homepage: http://pim.kde.org/ + 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 Rules-Requires-Root: no @@@ -63,9 -66,13 +66,13 @@@ Package: kdepim-runtim Architecture: any Depends: akonadi-server (>= 1.8), kio-ldap, - libsasl2-modules-kdexoauth2 [amd64 arm64 armhf i386 mipsel], + libsasl2-modules-kdexoauth2 [amd64 arm64 i386 mipsel], ${misc:Depends}, - ${shlibs:Depends} + ${shlibs:Depends}, + Breaks: libkf5libkdepim-data (<< 4:20.08~), + libkf5libkdepim-plugins (<< 4:20.08~), + Replaces: libkf5libkdepim-data (<< 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.