From 9170e6efb549aace3a64ab3083b344b5454a48c5 Mon Sep 17 00:00:00 2001 From: huayadong Date: Wed, 29 Jun 2022 15:26:14 +0800 Subject: [PATCH 1/2] Update change control copyright and fix the spelling --- ...ntrol-copyright-and-fix-the-spelling.patch | 144 ++++++++++++++++++ ukui-power-manager.spec | 7 +- 2 files changed, 150 insertions(+), 1 deletion(-) create mode 100644 0001-Update-change-control-copyright-and-fix-the-spelling.patch diff --git a/0001-Update-change-control-copyright-and-fix-the-spelling.patch b/0001-Update-change-control-copyright-and-fix-the-spelling.patch new file mode 100644 index 0000000..55000cd --- /dev/null +++ b/0001-Update-change-control-copyright-and-fix-the-spelling.patch @@ -0,0 +1,144 @@ +From b92d1a6e435f30e71970c487088f0baea094dfd0 Mon Sep 17 00:00:00 2001 +From: handsome-feng +Date: Tue, 4 Feb 2020 21:11:01 +0800 +Subject: [PATCH] Update change, control, copyright and fix the spelling error + in ts files + +--- + debian/changelog | 2 +- + debian/control | 9 +++++---- + debian/copyright | 22 +++------------------- + debian/source/format | 2 +- + ukui-power-statistics/en.ts | 2 +- + ukui-power-statistics/zh_CN.ts | 2 +- + 6 files changed, 12 insertions(+), 27 deletions(-) + +diff --git a/debian/changelog b/debian/changelog +index e32c39f..8cbb6b8 100644 +--- a/debian/changelog ++++ b/debian/changelog +@@ -1,4 +1,4 @@ +-ukui-power-manager (2.0.0) unstable; urgency=medium ++ukui-power-manager (2.0.0-1) unstable; urgency=medium + + * New upstream release. + - Display line_power and battery in qt way. +diff --git a/debian/control b/debian/control +index ffe49c4..66d8c43 100644 +--- a/debian/control ++++ b/debian/control +@@ -6,6 +6,7 @@ Uploaders: Aron Xu , + handsome_feng , + Build-Depends: debhelper-compat (= 12), + dpkg-dev (>= 1.16.1.1), ++ qtbase5-dev, + intltool, + libcanberra-gtk3-dev, + libdbus-glib-1-dev, +@@ -24,11 +25,11 @@ Build-Depends: debhelper-compat (= 12), + pkg-config, + xmlto, + yelp-tools, +- qt5-default, + libqt5charts5-dev, +- libqt5x11extras5-dev, +- libgsettings-qt-dev, +-Standards-Version: 4.1.5 ++ libqt5x11extras5-dev, ++ libgsettings-qt-dev, ++Standards-Version: 4.5.0 ++Rules-Requires-Root: no + Homepage: http://www.ukui.org/ + Vcs-Git: https://github.com/ukui/ukui-power-manager.git + Vcs-Browser: https://github.com/ukui/ukui-power-manager +diff --git a/debian/copyright b/debian/copyright +index 5b3f703..5f173b8 100644 +--- a/debian/copyright ++++ b/debian/copyright +@@ -20,15 +20,7 @@ Copyright: 2004-2005, William Jon McCann + 2013-2017, Xiang Li + License: GPL-2+ + +-Files: applets/brightness/egg-debug.c +- applets/brightness/egg-debug.h +- applets/brightness/gpm-common.c +- applets/brightness/gpm-common.h +- applets/inhibit/egg-debug.c +- applets/inhibit/egg-debug.h +- applets/inhibit/gpm-common.c +- applets/inhibit/gpm-common.h +- src/egg-array-float.c ++Files: src/egg-array-float.c + src/egg-array-float.h + src/egg-color.c + src/egg-color.h +@@ -89,14 +81,7 @@ Copyright: 2006, William Jon McCann + 2009, Novell, Inc + License: LGPL-2+ + +-Files: applets/Makefile.am +- applets/brightness/Makefile.am +- applets/brightness/*.xml +- applets/brightness/*.in +- applets/inhibit/Makefile.am +- applets/inhibit/*.xml +- applets/inhibit/*.in +- data/icons/22x22/actions/Makefile.am ++Files: data/icons/22x22/actions/Makefile.am + data/icons/22x22/actions/*.png + data/icons/22x22/apps/Makefile.am + data/icons/22x22/apps/*.png +@@ -152,7 +137,6 @@ Files: applets/Makefile.am + src/gpm-marshal.list + src/*.xml + AUTHORS +- COPYING + ChangeLog + Makefile.am + NEWS +@@ -238,7 +222,7 @@ Copyright: 2011-2014, Stefano Karapetsas + License: GPL-2+ + + Files: ukui-power-manager-tray/* +- ukui-power-statistics-qt/* ++ ukui-power-statistics/* + Copyright: 2020, Tianjin KYLIN Information Technology Co., Ltd. + License: GPL-2+ + +diff --git a/debian/source/format b/debian/source/format +index 89ae9db..163aaf8 100644 +--- a/debian/source/format ++++ b/debian/source/format +@@ -1 +1 @@ +-3.0 (native) ++3.0 (quilt) +diff --git a/ukui-power-statistics/en.ts b/ukui-power-statistics/en.ts +index 774bc31..fedae45 100644 +--- a/ukui-power-statistics/en.ts ++++ b/ukui-power-statistics/en.ts +@@ -18,7 +18,7 @@ + + + +- Power Statistics-device infomation ++ Power Statistics-device information + + + + +diff --git a/ukui-power-statistics/zh_CN.ts b/ukui-power-statistics/zh_CN.ts +index 06ce637..de36bac 100644 +--- a/ukui-power-statistics/zh_CN.ts ++++ b/ukui-power-statistics/zh_CN.ts +@@ -22,7 +22,7 @@ + + + +- Power Statistics-device infomation ++ Power Statistics-device information + 电源统计-设备信息 + + +-- +2.33.0 + diff --git a/ukui-power-manager.spec b/ukui-power-manager.spec index 0b8551a..bea81c3 100644 --- a/ukui-power-manager.spec +++ b/ukui-power-manager.spec @@ -1,11 +1,12 @@ %define debug_package %{nil} Name: ukui-power-manager Version: 2.0.3 -Release: 8 +Release: 9 Summary: power management tool for the UKUI desktop License: GPL-2.0-or-later and LGPL-2.0-or-later URL: http://www.ukui.org Source0: %{name}-%{version}.tar.gz +Patch0: 0001-Update-change-control-copyright-and-fix-the-spelling.patch BuildRequires: qt5-qtbase-devel,intltool,libcanberra-devel,dbus-glib-devel,libgcrypt-devel,glib2-devel,gtk3-devel,libnotify-devel,libtool, libtool-ltdl,upower-devel,libwnck3-devel,libX11-devel,libXext-devel,perl-XML-Parser,libXrandr-devel,pkg-config,xmlto,yelp-tools,qt5-qtcharts-devel,qt5-qtx11extras-devel,gsettings-qt-devel, gnome-keyring, libgnome-keyring-devel BuildRequires:mate-common >= 1.18 @@ -42,6 +43,7 @@ This package contains the architecture independent files. %prep %setup -q +%patch0 -p1 ./autogen.sh --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib64 -enable-introspection --enable-compile-warnings=yes --enable-egl-device --enable-wayland --enable-native-backend @@ -434,6 +436,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jun 29 2022 huayadong - 2.0.3-8 +- Update change control copyright and fix the spelling + * Fri May 20 2022 tanyulong - 2.0.3-8 - Improve the project according to the requirements of compliance improvement -- Gitee From 288592fca5f8611f834e2ba15e2efc45266456f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=8E=E4=BA=9A=E4=B8=9C?= Date: Wed, 29 Jun 2022 07:42:38 +0000 Subject: [PATCH 2/2] update ukui-power-manager.spec. --- ukui-power-manager.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ukui-power-manager.spec b/ukui-power-manager.spec index bea81c3..076e9da 100644 --- a/ukui-power-manager.spec +++ b/ukui-power-manager.spec @@ -436,7 +436,7 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Wed Jun 29 2022 huayadong - 2.0.3-8 +* Wed Jun 29 2022 huayadong - 2.0.3-9 - Update change control copyright and fix the spelling * Fri May 20 2022 tanyulong - 2.0.3-8 -- Gitee