From 82fdf83f15f36424fd1007cd9bf2bf08a10d47e4 Mon Sep 17 00:00:00 2001 From: tanyulong Date: Mon, 8 Nov 2021 16:03:01 +0800 Subject: [PATCH] modify conflict --- debian/changelog | 11 +++-------- debian/source/format | 2 +- src/plugins/ukui-clock/setAlarmRepeatDialog.cpp | 1 + src/plugins/ukui-clock/setupPage.cpp | 1 + 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5e0a915..229ff30 100755 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,6 @@ -ukui-sidebar (1.1.2-0001) v101; urgency=medium - - * New upstream bugfix release: - - Add vnc support - - Update Code specification - - Add relay libxtst-dev - - Delete the feedback widget - -- liushanwen Thu, 05 Nov 2020 13:51:15 +0800 + * New upstream release. + +-- liushanwen Thu, 05 Nov 2020 13:51:15 +0800 ukui-sidebar (3.0.0-1+1103) focal; urgency=medium diff --git a/debian/source/format b/debian/source/format index 89ae9db..163aaf8 100755 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (native) +3.0 (quilt) diff --git a/src/plugins/ukui-clock/setAlarmRepeatDialog.cpp b/src/plugins/ukui-clock/setAlarmRepeatDialog.cpp index cf7be2c..0f3b7de 100755 --- a/src/plugins/ukui-clock/setAlarmRepeatDialog.cpp +++ b/src/plugins/ukui-clock/setAlarmRepeatDialog.cpp @@ -23,6 +23,7 @@ #include #include #include +#include extern void qt_blurImage(QImage &blurImage, qreal radius, bool quality, int transposed); diff --git a/src/plugins/ukui-clock/setupPage.cpp b/src/plugins/ukui-clock/setupPage.cpp index ff8cca3..a6e1091 100755 --- a/src/plugins/ukui-clock/setupPage.cpp +++ b/src/plugins/ukui-clock/setupPage.cpp @@ -22,6 +22,7 @@ #include "setAlarmRepeatDialog.h" #include #include +#include #include "customStyle.h" extern void qt_blurImage(QImage &blurImage, qreal radius, bool quality, int transposed); -- 2.30.0