merge upstream 4.0.0.0

2023-04-12 18:42:04 +08:00 · 2023-04-12 18:42:04 +08:00 · e354d5e678
parent 20bb186817
commit e354d5e678
10 changed files with 231 additions and 0 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -0,0 +1,92 @@
+kylin-nm (4.0.0.0-ok1) yangtze; urgency=medium
+
+  * merge upstream
+
+ -- zhaoshixu <zhaoshixu@kylinos.cn>  Wed, 12 Apr 2023 17:09:37 +0800
+
+kylin-nm (3.14.0.0+0512-3k15) yangtze; urgency=medium
+
+  * QSystemTrayIcon register
+
+ -- zhaoshixu <zhaoshixu@kylinos.cn>  Fri, 06 Jan 2023 16:22:59 +0800
+
+kylin-nm (3.14.0.0+0512-3k14) yangtze; urgency=medium
+
+  * add include QPainterPath
+
+ -- zhaoshixu <zhaoshixu@kylinos.cn>  Thu, 05 Jan 2023 16:27:10 +0800
+
+kylin-nm (3.14.0.0+0512-3k13) yangtze; urgency=medium
+
+  * 增加三种企业网加密方式LEAP PWD FAST
+
+ -- zhaoshixu <zhaoshixu@kylinos.cn>  Mon, 26 Dec 2022 16:11:31 +0800
+
+kylin-nm (3.14.0.0+0512-3k12) yangtze; urgency=medium
+
+  * vpn页面增加
+  * dns优化
+  * tabBar圆角 
+
+ -- zhaoshixu <zhaoshixu@kylinos.cn>  Fri, 16 Dec 2022 12:04:41 +0800
+
+kylin-nm (3.14.0.0+0512-3k11) yangtz; urgency=medium
+
+  * 合并3.22需求
+
+ -- zhaoshixu <zhaoshixu@kylinos.cn>  Mon, 21 Nov 2022 15:31:28 +0800
+
+kylin-nm (3.14.0.0+0512-2k11) yangtz; urgency=medium
+
+  * 修改因有线连接未指定网卡造成VPN托盘崩溃的问题
+
+ -- zhaoshixu <zhaoshixu@kylinos.cn>  Fri, 21 Oct 2022 16:35:19 +0800
+
+kylin-nm (3.14.0.0+0512-2k10) yangtz; urgency=medium
+
+  * 托盘vpn需求
+
+ -- zhaoshixu <zhaoshixu@kylinos.cn>  Thu, 20 Oct 2022 20:21:39 +0800
+
+kylin-nm (3.14.0.0+0512-1k10) yangtz; urgency=medium
+
+  * 同步3.22需求
+
+ -- zhaoshixu <zhaoshixu@kylinos.cn>  Wed, 19 Oct 2022 10:01:07 +0800
+
+kylin-nm (3.14.0.0+0512-0k10) yangtz; urgency=medium
+
+  * close-cd #131075 【网络】普通用户在详情界面修改网络IP信息时会弹出授权框，如果不进行授权详情界面也会显示修改成功，但是实际未修改
+
+ -- zhaoshixu <zhaoshixu@kylinos.cn>  Thu, 18 Aug 2022 17:09:12 +0800
+
+kylin-nm (3.14.0.0+0512-0k9) yangtz; urgency=medium
+
+  * close-cd #131247 登录界面连接wifi后，登录桌面任务栏网络工具显示未连接，wifi依旧关闭状态
+
+ -- zhaoshixu <zhaoshixu@kylinos.cn>  Wed, 03 Aug 2022 16:12:40 +0800
+
+kylin-nm (3.14.0.0+0512-0k8) yangtz; urgency=medium
+
+  * close-cd #127890 开启无线局域网后关闭，重新打开控制面板，无线局域网处显示网卡名称
+  * close-cd #128339 连接WIFI过程中点击忘记此WIFI，之后密码仍保留在输入框内
+ -- zhaoshixu <zhaoshixu@kylinos.cn>  Mon, 18 Jul 2022 10:54:25 +0800
+
+kylin-nm (3.14.0.0+0512-0k7~0707) yangtz; urgency=medium
+
+  * Fix mobilehotspot segmentation fault and init wlanSwitchEnable status.
+  * close-cd #91326 【控制面板】-首页图标、左侧导航线性图标可以跟随主题切换
+
+ -- zhaoshixu <zhaoshixu@kylinos.cn>  Wed, 22 Jun 2022 09:44:33 +0800
+
+kylin-nm (3.14.0.0+0512-0k5) yangtz; urgency=medium
+
+  * set window frameless.
+
+ -- zhaoshixu <zhaoshixu@kylinos.cn>  Mon, 20 Jun 2022 16:01:48 +0800
+
+kylin-nm (3.14.0.0+0512-0k4) yangtze; urgency=medium
+
+  * Initial for openKylin.
+
+ -- zhaoshixu <zhaoshixu@kylinos.cn>  Fri, 17 Jun 2022 11:46:09 +0800
--- a/debian/compat
+++ b/debian/compat
@ -0,0 +1 @@
+9
--- a/debian/control
+++ b/debian/control
@ -0,0 +1,49 @@
+Source: kylin-nm
+Section: utils
+Priority: optional
+Maintainer: Kylin Team <team+kylin@tracker.debian.org>
+Uploaders: handsome_feng <jianfengli@ubuntukylin.com>
+Build-Depends: debhelper (>=9),
+               libcap-dev,
+               libgsettings-qt-dev,
+               libgtk-3-dev,
+               libkf5networkmanagerqt-dev (>= 5.36.0),
+               libkf5windowsystem-dev,
+               libkysdk-qtwidgets-dev(>= 1.2.0),
+               libkysdk-sysinfo-dev,
+               libkysdk-waylandhelper-dev(>= 1.2.0kylin2),
+               libnm-dev,
+               libnma-dev,
+               libqt5svg5-dev,
+               libqt5x11extras5-dev,
+               libsecret-1-dev,
+               libukcc-dev (>= 3.1.1+1217),
+               libukui-common-dev,
+               libukui-log4qt-dev,
+               libx11-dev,
+               qt5-qmake,
+               qtbase5-dev,
+               qtbase5-dev-tools,
+               qtchooser,
+               qtscript5-dev,
+               qttools5-dev-tools
+Standards-Version: 4.5.0
+Rules-Requires-Root: no
+Homepage: https://github.com/ukui/kylin-nm
+Vcs-Git: https://github.com/ukui/kylin-nm.git
+Vcs-Browser: https://github.com/ukui/kylin-nm
+
+Package: kylin-nm
+Architecture: any
+Depends: libkysdk-qtwidgets(>= 1.2.0),
+         libkysdk-waylandhelper(>= 1.2.0kylin2),
+         network-manager (>=1.2.6),
+         ukui-control-center (>= 3.1.1+1217),
+         dpkg-dev,
+         libkysdk-sysinfo,
+         ${shlibs:Depends},
+         ${misc:Depends}
+Description: Gui Applet tool for display and edit network simply
+ Kylin NM is a Applet tool for managing network settings simply.
+ It has beautiful UI and very comfortable to use.
+ It's better work together with UKUI.
--- a/debian/copyright
+++ b/debian/copyright
@ -0,0 +1,25 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: kylin-nm
+Upstream-Contact: Kylin Team <ukui@kylinos.cn>
+Source: https://github.com/ukui/kylin-nm
+
+Files: *
+Copyright: 2019, Tianjin KYLIN Information Technology Co., Ltd.
+License: GPL-3+
+
+License: GPL-3+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Genaral Public License for more details.
+ .
+ You should have received a copy og the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
--- a/debian/kylin-nm.manpages
+++ b/debian/kylin-nm.manpages
@ -0,0 +1 @@
+man/kylin-nm.1
--- a/debian/kylin-nm.postinst
+++ b/debian/kylin-nm.postinst
@ -0,0 +1,14 @@
+#!/bin/sh
+ 
+set -e
+ 
+PROGRAM=$(dpkg-divert --truename /usr/bin/kylin-nm)
+
+if setcap cap_net_raw+ep $PROGRAM; then
+    chmod u-s $PROGRAM
+fi
+
+echo "kylin nm set cap success"
+
+exit 0
+
--- a/debian/kylin-nm.preinst
+++ b/debian/kylin-nm.preinst
@ -0,0 +1,12 @@
+#!/bin/bash
+  
+set -e
+
+path="/usr/lib/`/usr/bin/dpkg-architecture -qDEB_TARGET_MULTIARCH`/ukui-control-center/libnetconnect.so"
+dpkg-divert --package kylin-nm  --rename --divert "$path"".old" --add $path
+
+path2="/usr/lib/`/usr/bin/dpkg-architecture -qDEB_TARGET_MULTIARCH`/ukui-control-center/libproxy.so"
+dpkg-divert --package kylin-nm  --rename --divert "$path2"".old" --add $path2
+
+path3="/usr/lib/`/usr/bin/dpkg-architecture -qDEB_TARGET_MULTIARCH`/ukui-control-center/libvpn.so"
+dpkg-divert --package kylin-nm  --rename --divert "$path3"".old" --add $path3
--- a/debian/rules
+++ b/debian/rules
@ -0,0 +1,34 @@
+#!/usr/bin/make -f
+
+export QT_SELECT=5
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+QMAKE_OPTS = DEFINES+=NO_DEBUG_ON_CONSOLE
+MAKE_OPTS  = PREFIX=/usr QMAKE=qmake LRELEASE=lrelease QMAKE_OPTS="$(QMAKE_OPTS)"
+
+override_dh_auto_configure:
+	QT_SELECT=qt5 dh_auto_configure \
+                -- "QMAKE_CXXFLAGS=$(CFLAGS)" \
+                kylin-nm.pro
+
+%:
+	dh $@
+
+override_dh_install:
+	dh_install
+
+override_dh_missing:
+	dh_missing --fail-missing
+
+override_dh_auto_clean:
+	[ ! -d .moc ] || $(RM) -r .moc
+	[ ! -d .obj ] || $(RM) -r .obj
+	[ ! -d .ui ] || $(RM) -r .ui
+	[ ! -f Makefile ] || dh_auto_clean
+
+override_dh_auto_build:
+	dh_auto_build -- $(MAKE_OPTS)
+
+override_dh_shlibdeps:
+	dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
+
--- a/debian/source/format
+++ b/debian/source/format
@ -0,0 +1 @@
+3.0 (quilt)
--- a/debian/watch
+++ b/debian/watch
@ -0,0 +1,2 @@
+version=4
+https://github.com/ukui/kylin-nm/releases .*/kylin-nm_(\d\S+)\.orig\.tar\.gz