Merge version 4:19.08.3-2+rpi1 and 4:20.04.1-1 to produce 4:20.04.1-1+rpi1 archive/raspbian/4%20.04.1-1+rpi1 raspbian/4%20.04.1-1+rpi1
authorRaspbian automatic forward porter <root@raspbian.org>
Thu, 11 Jun 2020 13:16:20 +0000 (14:16 +0100)
committerRaspbian automatic forward porter <root@raspbian.org>
Thu, 11 Jun 2020 13:16:20 +0000 (14:16 +0100)
1  2 
debian/changelog
debian/control

index e01ea68cee4f82fd7336513e2de35511df8dcb33,c6b9a1ce235e866e2cb92bfd38b1fa762ef7d3c1..b8d92e20150281081fbe718b1b7e901922c88c62
@@@ -1,14 -1,33 +1,45 @@@
- kdepim-runtime (4:19.08.3-2+rpi1) bullseye-staging; urgency=medium
++kdepim-runtime (4:20.04.1-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>  Mon, 09 Dec 2019 19:39:52 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 11 Jun 2020 13:16:19 +0000
++
+ kdepim-runtime (4:20.04.1-1) unstable; urgency=medium
+   [ Sandro Knauß ]
+   * New upstream release (20.04.1).
+   * Update build-deps and deps with the info from cmake.
+  -- Sandro Knauß <hefee@debian.org>  Wed, 27 May 2020 00:00:37 +0200
+ kdepim-runtime (4:20.04.0-1) experimental; urgency=medium
+   [ Sandro Knauß ]
+   * Update watch file to the new release-service location.
+   * Bump compat level to 13.
+   * Bump Standards-Version to 4.5.0 (No changes needed).
+   * Get rid of debug-symbol-migration package.
+   * Add Rules-Requires-Root field to control.
+   * New upstream release (20.04.0).
+   * Update build-deps and deps with the info from cmake.
+   * Update patch hunks.
+   * Update patch make_qtwebengine_optional.patch.
+   * Wrap long lines in changelog entries: 4:16.04.1-1.
+   * Set field Upstream-Contact in debian/copyright.
+   * Remove obsolete fields Contact, Name from debian/upstream/metadata
+     (already present in machine-readable debian/copyright).
+   * Enable hardening all.
+   * Cleanup copyright file.
+   * Remove unused license definitions for BSD_like_CMU-4-clause.
+   * Remove COPYING.LIB listed in copyright file.
+  -- Sandro Knauß <hefee@debian.org>  Wed, 13 May 2020 12:23:26 +0200
  
  kdepim-runtime (4:19.08.3-2) unstable; urgency=medium
  
diff --cc debian/control
index c72d9254a4beeb61ea82499460f64b40efce4f81,4c4fe3962eb34c5659698d70e644d8f0d87e3900..5e2e73fc093a0eb547aaa3305f01a7b068d97eaf
@@@ -8,54 -8,51 +8,51 @@@ Uploaders: Sune Vuorela <debian@pusling
             Maximiliano Curia <maxy@debian.org>,
             Sandro Knauß <hefee@debian.org>
  Build-Depends: cmake (>= 3.5~),
-                debhelper-compat (= 12),
-                extra-cmake-modules (>= 5.60.0~),
+                debhelper-compat (= 13),
+                extra-cmake-modules (>= 5.68.0~),
                 libboost-dev,
                 libboost-program-options-dev,
-                libkf5akonadi-dev (>= 4:19.08.3~),
-                libkf5akonadicalendar-dev (>= 4:19.08.3~),
-                libkf5akonadicontact-dev (>= 4:19.08.3~),
-                libkf5akonadimime-dev (>= 4:19.08.3~),
-                libkf5akonadinotes-dev (>= 4:19.08.3~),
-                libkf5alarmcalendar-dev (>= 4:19.08.3~),
-                libkf5calendarcore-dev (>= 4:19.08.3~),
-                libkf5calendarutils-dev (>= 4:19.08.3~),
-                libkf5codecs-dev (>= 5.60.0~),
-                libkf5config-dev (>= 5.60.0~),
-                libkf5configwidgets-dev (>= 5.60.0~),
-                libkf5contacts-dev (>= 4:19.08.3~),
-                libkf5dbusaddons-dev (>= 5.60.0~),
-                libkf5doctools-dev (>= 5.60.0~),
-                libkf5holidays-dev (>= 1:5.60.0~),
-                libkf5iconthemes-dev (>= 5.60.0~),
-                libkf5identitymanagement-dev (>= 19.08.3~),
-                libkf5imap-dev (>= 19.08.3~),
-                libkf5itemmodels-dev (>= 5.60.0~),
-                libkf5kdelibs4support-dev (>= 5.47.0~),
-                libkf5kio-dev (>= 5.60.0~),
-                libkf5mailtransport-dev (>= 19.08.3~),
-                libkf5mbox-dev (>= 19.08.3~),
-                libkf5mime-dev (>= 19.08.3~),
-                libkf5notifications-dev (>= 5.60.0~),
-                libkf5notifyconfig-dev (>= 5.60.0~),
-                libkf5pimcommon-dev (>= 4:19.08.3~),
-                libkf5textwidgets-dev (>= 5.60.0~),
-                libkf5windowsystem-dev (>= 5.60.0~),
+                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~),
                 libkolabxml-dev (>= 1.1~),
-                libkpimgapi-dev (>= 19.08.3~) [amd64 arm64 i386 mipsel],
-                libkpimkdav-dev (>= 19.08.3~),
 -               libkpimgapi-dev (>= 20.04.1~) [amd64 arm64 armhf i386 mipsel],
++               libkpimgapi-dev (>= 20.04.1~) [amd64 arm64 i386 mipsel],
                 libqca-qt5-2-dev,
-                libqt5networkauth5-dev (>= 5.11.0~),
+                libqt5networkauth5-dev (>= 5.12.0~),
                 libqt5texttospeech5-dev,
-                libqt5xmlpatterns5-dev (>= 5.11.0~),
+                libqt5xmlpatterns5-dev (>= 5.12.0~),
                 libsasl2-dev,
                 pkg-config,
                 pkg-kde-tools (>= 0.12),
-                qtbase5-dev (>= 5.11.0~),
-                qtwebengine5-dev (>= 5.11.0~) [amd64 arm64 i386 mipsel],
+                qtbase5-dev (>= 5.12.0~),
 -               qtwebengine5-dev (>= 5.12.0~) [amd64 arm64 armhf i386 mipsel],
++               qtwebengine5-dev (>= 5.12.0~) [amd64 arm64 i386 mipsel],
                 shared-mime-info (>= 1.3~),
                 xsltproc
- Standards-Version: 4.4.1
+ Standards-Version: 4.5.0
  Homepage: http://pim.kde.org/
  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