Rik Mills has proposed merging ~acheron/kubuntu-packaging/+git/kde-baseapps:kubuntu_yakkety_archive into ~kubuntu-packagers/kubuntu-packaging/+git/kde-baseapps:kubuntu_yakkety_archive.
Requested reviews: Kubuntu Packagers (kubuntu-packagers) For more details, see: https://code.launchpad.net/~acheron/kubuntu-packaging/+git/kde-baseapps/+merge/298461 New tidy-html5 copied into yakkety from debian a short while back is causing kde-baseapps to fail to build, as buffio.h is now tidybuffio.h Debian maintainer is planning a compatibility fix in the near future fot the Tidy package, but this patch will fix building if baseapps in the meantime. -- Your team Kubuntu Packagers is requested to review the proposed merge of ~acheron/kubuntu-packaging/+git/kde-baseapps:kubuntu_yakkety_archive into ~kubuntu-packagers/kubuntu-packaging/+git/kde-baseapps:kubuntu_yakkety_archive.
diff --git a/debian/changelog b/debian/changelog index d9310f4..eaf23a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,9 @@ kde-baseapps (4:16.04.2-0ubuntu1) UNRELEASED; urgency=medium [ Clive Johnston ] * New upstream release (16.04.2) + [ Rik Mills ] + * Add patch tidy-html5_new_include_name.diff - fixes libtidy-dev includes + -- Clive Johnston <[email protected]> Fri, 24 Jun 2016 22:30:17 +0100 kde-baseapps (4:15.12.3-0ubuntu1) xenial; urgency=medium diff --git a/debian/patches/series b/debian/patches/series index ccc035c..7ff678e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ kubuntu_folderwidget_drawing.diff # kubuntu_install_flash.diff kubuntu_disable-failing-test.diff kubuntu_ignore-tests.diff +tidy-html5_new_include_name.diff diff --git a/debian/patches/tidy-html5_new_include_name.diff b/debian/patches/tidy-html5_new_include_name.diff new file mode 100644 index 0000000..db2ab45 --- /dev/null +++ b/debian/patches/tidy-html5_new_include_name.diff @@ -0,0 +1,16 @@ +Description: Corrects changed include name introduced by new upstream version of Tidy +Author: Rik Mills <[email protected]> +Origin: me +Forwarded: no +Last-Update: 2016-06-27 +--- a/konq-plugins/validators/tidy_validator.cpp ++++ b/konq-plugins/validators/tidy_validator.cpp +@@ -25,7 +25,7 @@ + + #include <kdebug.h> + +-#include <buffio.h> ++#include <tidybuffio.h> + #include <tidy.h> + + #include <config-konq-validator.h>
-- kubuntu-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel
