some project changes

This commit is contained in:
huayadong 2022-04-07 17:25:35 +08:00
parent d1cb8dd97f
commit b01ae7083f
7 changed files with 36 additions and 274 deletions

View File

@ -1,22 +0,0 @@
From 055ab233005f8795ae2346034d5521434d973804 Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
Date: Mon, 1 Nov 2021 14:34:37 +0800
Subject: [PATCH] Add .gitattributes
---
.gitattributes | 3 +++
1 file changed, 3 insertions(+)
create mode 100644 .gitattributes
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..df0353f
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,3 @@
+debian/changelog
+debian/compat
+debian/source/format
--
2.30.0

View File

@ -1,41 +0,0 @@
From e1f4ecef5706e6d00dc5833008a2d19107f0a8ff Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
Date: Thu, 28 Oct 2021 19:43:07 +0800
Subject: [PATCH] fix Log print error correction
---
debian/changelog | 6 ++++++
src/egg-debug.c | 3 ++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 7edfaf9..f263478 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ukui-power-manager (2.1.29~rc2) v101; urgency=medium
+
+ * 添加日志打印輸出
+
+ -- zhangxinyu1 <zhangxinyu1@kylinos.cn> Wed, 21 Apr 2021 17:49:15 +0800
+
ukui-power-manager (2.0.2-1+1028) focal; urgency=medium
* Daily build.
diff --git a/src/egg-debug.c b/src/egg-debug.c
index 2f140f2..6b195a3 100755
--- a/src/egg-debug.c
+++ b/src/egg-debug.c
@@ -243,7 +243,8 @@ egg_debug_enabled (void)
{
const gchar *env;
env = g_getenv (EGG_VERBOSE);
- return (g_strcmp0 (env, "1") == 0);
+ //return (g_strcmp0 (env, "1") == 0);
+ return TRUE;
}
/**
--
2.30.0

View File

@ -1,55 +0,0 @@
From 0d774a458101049c91e5dba31ac9ffa2af361d35 Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
Date: Mon, 1 Nov 2021 14:57:25 +0800
Subject: [PATCH] Add Tibetan translation
---
po/bo_CN.po | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
create mode 100644 po/bo_CN.po
diff --git a/po/bo_CN.po b/po/bo_CN.po
new file mode 100644
index 0000000..d6f1df4
--- /dev/null
+++ b/po/bo_CN.po
@@ -0,0 +1,36 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# liushuyu011 <liushuyu011@gmail.com>, 2016
+# Wylmer Wang, 2013
+# Mingcong Bai <jeffbai@aosc.xyz>, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: UKUI Desktop Environment\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-11-21 19:39+0800\n"
+"PO-Revision-Date: 2017-10-07 11:02+0000\n"
+"Last-Translator: monsta <monsta@inbox.ru>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/mate/UKUI/language/"
+"zh_CN/)\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+ #: ../data/ukui-power-preferences.desktop.in.in.h:1
+msgid "Power Management"
+msgstr "གློག་ཁུངས་དོ་དམ།"
+
+#: ../data/ukui-power-preferences.desktop.in.in.h:2
+msgid "Configure power management"
+msgstr "གློག་ཁུངས་དོ་དམ་སྡེབ་སྒྲིག"
+
+
+#: ../data/ukui-power-statistics.desktop.in.in.h:2
+msgid "Observe power management"
+msgstr "གློག་ཁུངས་དོ་དམ་ལྟ་འཛིན།"
+
--
2.30.0

View File

@ -1,37 +0,0 @@
From 3a7c6ec02e46a0eba744140188fd20521fe01f89 Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
Date: Mon, 8 Nov 2021 17:01:10 +0800
Subject: [PATCH] update copyright
---
debian/copyright | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index 45da27b..2edc76b 100755
--- a/debian/copyright
+++ b/debian/copyright
@@ -88,12 +88,8 @@ Files: data/Makefile.am
src/Makefile.am
src/gpm-marshal.list
src/*.xml
- AUTHORS
ChangeLog
Makefile.am
- NEWS
- README
- autogen.sh
configure.ac
Copyright: 2018, Xiang Li <lixiang@kylinos.cn>
License: GPL-2+
@@ -170,6 +166,7 @@ License: GPL-2+
Files: ukui-power-manager-tray/*
ukui-power-statistics/*
+ ukui-power-policy/*
Copyright: 2020, Tianjin KYLIN Information Technology Co., Ltd.
License: GPL-2+
--
2.30.0

View File

@ -1,103 +0,0 @@
From 85ebb62a0a2b3c66d58baa353d188d867fc84c9d Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
Date: Tue, 9 Nov 2021 15:36:23 +0800
Subject: [PATCH] add man files
---
debian/manpages | 4 ++++
man/ukui-power-manager-tray.1 | 12 ++++++++++++
man/ukui-powermanagement-service.1 | 12 ++++++++++++
man/ukui-powermanagement.1 | 12 ++++++++++++
man/ukui-upower.1 | 12 ++++++++++++
5 files changed, 52 insertions(+)
create mode 100644 debian/manpages
create mode 100644 man/ukui-power-manager-tray.1
create mode 100644 man/ukui-powermanagement-service.1
create mode 100644 man/ukui-powermanagement.1
create mode 100644 man/ukui-upower.1
diff --git a/debian/manpages b/debian/manpages
new file mode 100644
index 0000000..2b511c9
--- /dev/null
+++ b/debian/manpages
@@ -0,0 +1,4 @@
+man/ukui-power-manager-tray.1
+man/ukui-powermanagement-service.1
+man/ukui-powermanagement.1
+man/ukui-upower.1
diff --git a/man/ukui-power-manager-tray.1 b/man/ukui-power-manager-tray.1
new file mode 100644
index 0000000..4922e19
--- /dev/null
+++ b/man/ukui-power-manager-tray.1
@@ -0,0 +1,12 @@
+.TH ukui-power-manager-tray
+.SH NAME
+ukui-power-manager-tray \- The power-manager UI for the UKUI Desktop Environment
+.SH DESCRIPTION
+This module show power-manager widget
+.SH "REPORTING BUGS"
+Report bugs to http://gitlab2.kylin.com/ukui/ukui-power-manager/issues
+.SH "SEE ALSO"
+.SS
+Ukui PowerManager documentation can be found under "Help" by right-clicking on \fBukui-power-manager\fR.
+Further information may also be available at: http://wiki.ukui-desktop.org/docs
+.P
diff --git a/man/ukui-powermanagement-service.1 b/man/ukui-powermanagement-service.1
new file mode 100644
index 0000000..929e56c
--- /dev/null
+++ b/man/ukui-powermanagement-service.1
@@ -0,0 +1,12 @@
+.TH ukui-power-management-server
+.SH NAME
+ukui-power-management-server \- The power-manager Dbus Server for the UKUI Desktop Environment
+.SH DESCRIPTION
+This module show power-manager Dbus Server
+.SH "REPORTING BUGS"
+Report bugs to http://gitlab2.kylin.com/ukui/ukui-power-manager/issues
+.SH "SEE ALSO"
+.SS
+Ukui PowerManager documentation can be found under "Help" by right-clicking on \fBukui-power-manager\fR.
+Further information may also be available at: http://wiki.ukui-desktop.org/docs
+.P
diff --git a/man/ukui-powermanagement.1 b/man/ukui-powermanagement.1
new file mode 100644
index 0000000..788bbb0
--- /dev/null
+++ b/man/ukui-powermanagement.1
@@ -0,0 +1,12 @@
+.TH ukui-powermanagement
+.SH NAME
+ukui-powermanagement \- The power-manager Daemon for the UKUI Desktop Environment
+.SH DESCRIPTION
+This module show power-manager Daemon
+.SH "REPORTING BUGS"
+Report bugs to http://gitlab2.kylin.com/ukui/ukui-power-manager/issues
+.SH "SEE ALSO"
+.SS
+Ukui PowerManager documentation can be found under "Help" by right-clicking on \fBukui-power-manager\fR.
+Further information may also be available at: http://wiki.ukui-desktop.org/docs
+.P
diff --git a/man/ukui-upower.1 b/man/ukui-upower.1
new file mode 100644
index 0000000..d79c279
--- /dev/null
+++ b/man/ukui-upower.1
@@ -0,0 +1,12 @@
+.TH ukui-upower
+.SH NAME
+ukui-upower \- The power-manager Interface for the UKUI Desktop Environment
+.SH DESCRIPTION
+This module show power-manager Interface
+.SH "REPORTING BUGS"
+Report bugs to http://gitlab2.kylin.com/ukui/ukui-power-manager/issues
+.SH "SEE ALSO"
+.SS
+Ukui PowerManager documentation can be found under "Help" by right-clicking on \fBukui-power-manager\fR.
+Further information may also be available at: http://wiki.ukui-desktop.org/docs
+.P
--
2.30.0

Binary file not shown.

View File

@ -7,12 +7,6 @@ License: GPL-2+ LGPL-2+ GFDL-1.1+
URL: http://www.ukui.org
Source0: %{name}-%{version}.tar.gz
patch0: 0001-fix-Log-print-error-correction.patch
patch1: 0001-Add-gitattributes-file.patch
patch2: 0002-Add-Tibetan-translation.patch
patch3: 0003-update-copyright.patch
patch4: 0004-add-man-files.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
@ -48,11 +42,6 @@ This package contains the architecture independent files.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
./autogen.sh --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib64 -enable-introspection --enable-compile-warnings=yes --enable-egl-device --enable-wayland --enable-native-backend
@ -62,15 +51,15 @@ This package contains the architecture independent files.
%install
%{make_install} INSTALL_ROOT=%{buildroot}
mkdir -p %{buildroot}/usr/lib/udev/rules.d
cp -r %{_builddir}/%{name}-%{version}/data/99-upower-wake-up-usb-device.rules %{buildroot}/usr/lib/udev/rules.d/
##mkdir -p %{buildroot}/usr/lib/udev/rules.d
##cp -r %{_builddir}/%{name}-%{version}/data/99-upower-wake-up-usb-device.rules %{buildroot}/usr/lib/udev/rules.d/
%clean
rm -rf $RPM_BUILD_ROOT
%files
%doc debian/copyright debian/changelog
%{_sysconfdir}/xdg/autostart/ukui-power-manager-tray.desktop
#%{_sysconfdir}/xdg/autostart/ukui-power-manager-tray.desktop
%{_sysconfdir}/xdg/autostart/ukui-power-manager.desktop
%{_bindir}/ukui-power-manager
%{_bindir}/ukui-power-preferences
@ -79,7 +68,7 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/applications/ukui-power-statistics.desktop
%{_datadir}/dbus-1/services/org.ukui.PowerManager.service
%{_datadir}/polkit-1/actions/org.ukui.power.policy
%{_prefix}/lib/udev/rules.d/99-upower-wake-up-usb-device.rules
#%{_prefix}/lib/udev/rules.d/99-upower-wake-up-usb-device.rules
%files common
%{_datadir}/doc/ukui-power-manager
@ -173,7 +162,7 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/locale/zh_TW/LC_MESSAGES/ukui-power-manager.mo
%{_datadir}/glib-2.0/schemas/org.ukui.power-manager.gschema.xml
%{_datadir}/man/man1/ukui-power-backlight-helper.1.gz
%{_datadir}/man/man1/ukui-power-manager-tray.1.gz
#%{_datadir}/man/man1/ukui-power-manager-tray.1.gz
%{_datadir}/man/man1/ukui-power-manager.1.gz
%{_datadir}/man/man1/ukui-power-preferences.1.gz
%{_datadir}/man/man1/ukui-power-statistics.1.gz
@ -417,10 +406,41 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/help/zh_CN/ukui-power-manager/figures/gs-prefs.png
%{_datadir}/help/zh_CN/ukui-power-manager/index.docbook
%{_datadir}/help/zh_CN/ukui-power-manager/legal.xml
/usr/bin/ukui-power-statistics
%{_datadir}/icons/hicolor/16x16/apps/ukui-brightness-applet.png
%{_datadir}/icons/hicolor/16x16/apps/ukui-inhibit-applet.png
%{_datadir}/icons/hicolor/16x16/apps/ukui-power-manager.png
%{_datadir}/icons/hicolor/16x16/apps/ukui-power-statistics.png
%{_datadir}/icons/hicolor/22x22/apps/ukui-brightness-applet.png
%{_datadir}/icons/hicolor/22x22/apps/ukui-inhibit-applet.png
%{_datadir}/icons/hicolor/22x22/apps/ukui-power-manager.png
%{_datadir}/icons/hicolor/22x22/apps/ukui-power-statistics.png
%{_datadir}/icons/hicolor/24x24/apps/ukui-brightness-applet.png
%{_datadir}/icons/hicolor/24x24/apps/ukui-inhibit-applet.png
%{_datadir}/icons/hicolor/24x24/apps/ukui-power-manager.png
%{_datadir}/icons/hicolor/24x24/apps/ukui-power-statistics.png
%{_datadir}/icons/hicolor/32x32/apps/ukui-brightness-applet.png
%{_datadir}/icons/hicolor/32x32/apps/ukui-inhibit-applet.png
%{_datadir}/icons/hicolor/32x32/apps/ukui-power-manager.png
%{_datadir}/icons/hicolor/32x32/apps/ukui-power-statistics.png
%{_datadir}/icons/hicolor/48x48/apps/ukui-brightness-applet.png
%{_datadir}/icons/hicolor/48x48/apps/ukui-inhibit-applet.png
%{_datadir}/icons/hicolor/48x48/apps/ukui-power-manager.png
%{_datadir}/icons/hicolor/48x48/apps/ukui-power-statistics.png
%{_datadir}/icons/hicolor/scalable/apps/ukui-brightness-applet.svg
%{_datadir}/icons/hicolor/scalable/apps/ukui-inhibit-applet.svg
%{_datadir}/icons/hicolor/scalable/apps/ukui-power-manager.svg
%{_datadir}/icons/hicolor/scalable/apps/ukui-power-statistics.svg
%changelog
<<<<<<< HEAD
* Wed Apr 06 2022 huayadong <huayadong@kylinos.cn> - 2.0.3-7
- some project changes
=======
* Sat Apr 02 2022 tanyulong <tanyulong@kylinos.cn> - 2.0.3-7
- add yaml file
>>>>>>> d1cb8dd97fb1d7abb9a29e2493304d614ec786a1
* Tue Nov 09 2021 tanyulong <tanyulong@kylinos.cn> - 2.0.3-6
- add man files