From: Raspbian automatic forward porter Date: Sun, 15 Dec 2024 23:50:19 +0000 (+0000) Subject: Merge version 6.6.0-1+rpi2 and 6.8.0-1 to produce 6.8.0-1+rpi1 X-Git-Tag: raspbian/6.8.0-1+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=386bea41fa7461271f35045825120afd0deba82c;p=kf6-kio.git Merge version 6.6.0-1+rpi2 and 6.8.0-1 to produce 6.8.0-1+rpi1 --- b611fa54c1f8f5245f4d536d69656daabe29f889 diff --cc debian/changelog index dc73878,3e52d4b..c489752 --- a/debian/changelog +++ b/debian/changelog @@@ -1,15 -1,22 +1,32 @@@ - kf6-kio (6.6.0-1+rpi2) trixie-staging; urgency=medium ++kf6-kio (6.8.0-1+rpi1) trixie-staging; urgency=medium + ++ [changes brought forward from 6.5.0-2+rpi1 by Peter Michael Green at Tue, 17 Sep 2024 02:47:46 +0000] ++ * Update symbols filr for raspbian. ++ ++ [changes brought forward from 6.6.0-1+rpi2 by Peter Michael Green at Fri, 15 Nov 2024 07:30:48 +0000] + * Try to disable docuementation build. It seems to be crashing. + - -- Peter Michael Green Fri, 15 Nov 2024 07:30:48 +0000 ++ -- Raspbian forward porter Sun, 15 Dec 2024 23:50:18 +0000 + - kf6-kio (6.6.0-1+rpi1) trixie-staging; urgency=medium + kf6-kio (6.8.0-1) unstable; urgency=medium - [changes brought forward from 6.5.0-2+rpi1 by Peter Michael Green at Tue, 17 Sep 2024 02:47:46 +0000] - * Update symbols filr for raspbian. + [ Aurélien COUDERC ] + * New upstream release (6.8.0). + * Update build-deps and deps with the info from cmake. + * Refresh patches. + * Backport upstream MR 1766: StandardThumbnailJob is internal, header + not installed. + * Update symbols from build for 6.8.0. + * Release to unstable. + + -- Aurélien COUDERC Thu, 05 Dec 2024 10:17:23 +0100 + + kf6-kio (6.7.0-1) experimental; urgency=medium + + * Team upload. + * New upstream release. - -- Raspbian forward porter Wed, 09 Oct 2024 04:02:16 +0000 + -- Simon Quigley Sun, 03 Nov 2024 19:29:25 -0600 kf6-kio (6.6.0-1) unstable; urgency=medium diff --cc debian/patches/series index 1628d65,196feb9..032525c --- a/debian/patches/series +++ b/debian/patches/series @@@ -1,4 -1,4 +1,5 @@@ report_error_removing_dirs hurd_disable_unimplemented.diff Use-CXX_FLAGS-for-moc_predefs.h.patch + upstream_1766_standardthumbnailjob-is-internal-header-not-installed.patch +disable-doc.patch