Merge version 4:18.08.3-6+rpi1 and 4:19.08.3-2 to produce 4:19.08.3-2+rpi1 archive/raspbian/4%19.08.3-2+rpi1 raspbian/4%19.08.3-2+rpi1
authorRaspbian automatic forward porter <root@raspbian.org>
Mon, 9 Dec 2019 19:39:52 +0000 (19:39 +0000)
committerRaspbian automatic forward porter <root@raspbian.org>
Mon, 9 Dec 2019 19:39:52 +0000 (19:39 +0000)
1  2 
debian/changelog
debian/control

index fd076be064865d1820db096261eb61cc1eadf3a7,3f02e94655e153158bc5e3542f9b95d557683e5c..e01ea68cee4f82fd7336513e2de35511df8dcb33
@@@ -1,14 -1,29 +1,41 @@@
- kdepim-runtime (4:18.08.3-6+rpi1) bullseye-staging; urgency=medium
++kdepim-runtime (4:19.08.3-2+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>  Fri, 06 Dec 2019 03:56:46 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 09 Dec 2019 19:39:52 +0000
++
+ kdepim-runtime (4:19.08.3-2) unstable; urgency=medium
+   [ Sandro Knauß ]
+   * update make_qtwebengine_optional.patch:
+     - build facebook and tomboynotes for all archs that have QtWebEngine
+     - disable ews for archs that don't have QtWebEngine
+  -- Sandro Knauß <hefee@debian.org>  Sun, 01 Dec 2019 11:14:31 +0100
+ kdepim-runtime (4:19.08.3-1) unstable; urgency=medium
+   [ Sandro Knauß ]
+   * New upstream release (19.08.3).
+   * Update build-deps and deps with the info from cmake.
+  -- Sandro Knauß <hefee@debian.org>  Sat, 30 Nov 2019 22:55:34 +0100
+ kdepim-runtime (4:19.08.2-1) experimental; urgency=medium
+   [ Sandro Knauß ]
+   * New upstream release (19.08.2).
+   * Update build-deps and deps with the info from cmake.
+   * Remove breaks against kde-l10n packages.
+   * Update patches for new upstream release.
+  -- Sandro Knauß <hefee@debian.org>  Fri, 08 Nov 2019 10:41:26 +0100
  
  kdepim-runtime (4:18.08.3-6) unstable; urgency=medium
  
diff --cc debian/control
index 8063d5280f262e72385a9c5af7d459bfad8d8761,d0314f1b649d15eb932e23eec94fd6fa9a033eb0..c72d9254a4beeb61ea82499460f64b40efce4f81
@@@ -6,53 -6,55 +6,55 @@@ Uploaders: Sune Vuorela <debian@pusling
             Modestas Vainius <modax@debian.org>,
             George Kiagiadakis <kiagiadakis.george@gmail.com>,
             Maximiliano Curia <maxy@debian.org>,
-            Sandro Knauß <hefee@debian.org>,
- Build-Depends: cmake (>= 3.0~),
+            Sandro Knauß <hefee@debian.org>
+ Build-Depends: cmake (>= 3.5~),
                 debhelper-compat (= 12),
-                extra-cmake-modules (>= 5.47.0~),
+                extra-cmake-modules (>= 5.60.0~),
                 libboost-dev,
                 libboost-program-options-dev,
-                libkf5akonadi-dev (>> 4:18.08.3-7),
-                libkf5akonadicalendar-dev (>> 4:18.08.3-1),
-                libkf5akonadicontact-dev (>> 4:18.08.3-1),
-                libkf5akonadimime-dev (>> 4:18.08.3-1),
-                libkf5akonadinotes-dev (>> 4:18.08.3-1),
-                libkf5alarmcalendar-dev (>> 4:18.08.3-2),
-                libkf5calendarcore-dev (>> 4:18.08.3-1),
-                libkf5calendarutils-dev (>> 4:18.08.3-2),
-                libkf5codecs-dev (>= 5.47.0~),
-                libkf5config-dev (>= 5.47.0~),
-                libkf5configwidgets-dev (>= 5.47.0~),
-                libkf5contacts-dev (>> 4:18.08.3-1),
-                libkf5dbusaddons-dev (>= 5.47.0~),
-                libkf5doctools-dev (>= 5.47.0~),
-                libkf5holidays-dev (>= 1:5.47.0~),
-                libkf5iconthemes-dev (>= 5.47.0~),
-                libkf5identitymanagement-dev (>> 18.08.3-2),
-                libkf5imap-dev (>> 18.08.3-1),
-                libkf5itemmodels-dev (>= 5.47.0~),
+                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.47.0~),
-                libkf5mailtransport-dev (>> 18.08.3-2),
-                libkf5mbox-dev (>> 18.08.3-1),
-                libkf5mime-dev (>> 18.08.3-1),
-                libkf5notifications-dev (>= 5.47.0~),
-                libkf5notifyconfig-dev (>= 5.47.0~),
-                libkf5pimcommon-dev (>> 4:18.08.3-2),
-                libkf5textwidgets-dev (>= 5.47.0~),
-                libkf5windowsystem-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~),
                 libkolabxml-dev (>= 1.1~),
-                libkpimgapi-dev (>> 18.08.3-2) [amd64 arm64 i386 mipsel],
-                libkpimkdav-dev (>> 18.08.3-2),
 -               libkpimgapi-dev (>= 19.08.3~) [amd64 arm64 armhf i386 mipsel],
++               libkpimgapi-dev (>= 19.08.3~) [amd64 arm64 i386 mipsel],
+                libkpimkdav-dev (>= 19.08.3~),
+                libqca-qt5-2-dev,
+                libqt5networkauth5-dev (>= 5.11.0~),
                 libqt5texttospeech5-dev,
-                libqt5xmlpatterns5-dev (>= 5.9.0~),
+                libqt5xmlpatterns5-dev (>= 5.11.0~),
                 libsasl2-dev,
                 pkg-config,
                 pkg-kde-tools (>= 0.12),
-                qtbase5-dev (>= 5.9.0~),
-                qtwebengine5-dev (>= 5.9.0~) [amd64 arm64 i386 mipsel],
+                qtbase5-dev (>= 5.11.0~),
 -               qtwebengine5-dev (>= 5.11.0~) [amd64 arm64 armhf i386 mipsel],
++               qtwebengine5-dev (>= 5.11.0~) [amd64 arm64 i386 mipsel],
                 shared-mime-info (>= 1.3~),
-                xsltproc,
+                xsltproc
  Standards-Version: 4.4.1
  Homepage: http://pim.kde.org/
  Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kdepim-runtime
@@@ -62,11 -64,9 +64,9 @@@ 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},
- Replaces: ${kde-l10n:all}
- Breaks: ${kde-l10n:all}
+          ${shlibs:Depends}
  Description: runtime components for Akonadi KDE
   This package contains Akonadi agents written using KDE Development Platform
   libraries.