145 lines
4.7 KiB
Diff
145 lines
4.7 KiB
Diff
From b92d1a6e435f30e71970c487088f0baea094dfd0 Mon Sep 17 00:00:00 2001
|
|
From: handsome-feng <jianfengli@ubuntukylin.com>
|
|
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 <aron@debian.org>,
|
|
handsome_feng <jianfengli@ubuntukylin.com>,
|
|
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 <mccann@jhu.edu>
|
|
2013-2017, Xiang Li <lixiang@kylinos.cn>
|
|
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 <mccann@jhu.edu>
|
|
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 <stefano@karapetsas.com>
|
|
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 @@
|
|
</message>
|
|
<message>
|
|
<location filename="titlewidget.cpp" line="56"/>
|
|
- <source>Power Statistics-device infomation</source>
|
|
+ <source>Power Statistics-device information</source>
|
|
<translation type="unfinished"></translation>
|
|
</message>
|
|
</context>
|
|
|
|
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 @@
|
|
</message>
|
|
<message>
|
|
<location filename="titlewidget.cpp" line="56"/>
|
|
- <source>Power Statistics-device infomation</source>
|
|
+ <source>Power Statistics-device information</source>
|
|
<translation>电源统计-设备信息</translation>
|
|
</message>
|
|
</context>
|
|
--
|
|
2.33.0
|
|
|