From e354d5e678a0e88876782b35488accae2e40d8a3 Mon Sep 17 00:00:00 2001 From: jzxc95 <907297917@qq.com> Date: Wed, 12 Apr 2023 18:42:04 +0800 Subject: [PATCH] merge upstream 4.0.0.0 --- debian/changelog | 92 ++++++++++++++++++++++++++++++++++++++++ debian/compat | 1 + debian/control | 49 +++++++++++++++++++++ debian/copyright | 25 +++++++++++ debian/kylin-nm.manpages | 1 + debian/kylin-nm.postinst | 14 ++++++ debian/kylin-nm.preinst | 12 ++++++ debian/rules | 34 +++++++++++++++ debian/source/format | 1 + debian/watch | 2 + 10 files changed, 231 insertions(+) create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/kylin-nm.manpages create mode 100755 debian/kylin-nm.postinst create mode 100644 debian/kylin-nm.preinst create mode 100755 debian/rules create mode 100644 debian/source/format create mode 100644 debian/watch diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 00000000..3bc7bc61 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,92 @@ +kylin-nm (4.0.0.0-ok1) yangtze; urgency=medium + + * merge upstream + + -- zhaoshixu Wed, 12 Apr 2023 17:09:37 +0800 + +kylin-nm (3.14.0.0+0512-3k15) yangtze; urgency=medium + + * QSystemTrayIcon register + + -- zhaoshixu Fri, 06 Jan 2023 16:22:59 +0800 + +kylin-nm (3.14.0.0+0512-3k14) yangtze; urgency=medium + + * add include QPainterPath + + -- zhaoshixu Thu, 05 Jan 2023 16:27:10 +0800 + +kylin-nm (3.14.0.0+0512-3k13) yangtze; urgency=medium + + * 增加三种企业网加密方式LEAP PWD FAST + + -- zhaoshixu Mon, 26 Dec 2022 16:11:31 +0800 + +kylin-nm (3.14.0.0+0512-3k12) yangtze; urgency=medium + + * vpn页面增加 + * dns优化 + * tabBar圆角 + + -- zhaoshixu Fri, 16 Dec 2022 12:04:41 +0800 + +kylin-nm (3.14.0.0+0512-3k11) yangtz; urgency=medium + + * 合并3.22需求 + + -- zhaoshixu Mon, 21 Nov 2022 15:31:28 +0800 + +kylin-nm (3.14.0.0+0512-2k11) yangtz; urgency=medium + + * 修改因有线连接未指定网卡造成VPN托盘崩溃的问题 + + -- zhaoshixu Fri, 21 Oct 2022 16:35:19 +0800 + +kylin-nm (3.14.0.0+0512-2k10) yangtz; urgency=medium + + * 托盘vpn需求 + + -- zhaoshixu Thu, 20 Oct 2022 20:21:39 +0800 + +kylin-nm (3.14.0.0+0512-1k10) yangtz; urgency=medium + + * 同步3.22需求 + + -- zhaoshixu Wed, 19 Oct 2022 10:01:07 +0800 + +kylin-nm (3.14.0.0+0512-0k10) yangtz; urgency=medium + + * close-cd #131075 【网络】普通用户在详情界面修改网络IP信息时会弹出授权框，如果不进行授权详情界面也会显示修改成功，但是实际未修改 + + -- zhaoshixu 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 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 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 Wed, 22 Jun 2022 09:44:33 +0800 + +kylin-nm (3.14.0.0+0512-0k5) yangtz; urgency=medium + + * set window frameless. + + -- zhaoshixu Mon, 20 Jun 2022 16:01:48 +0800 + +kylin-nm (3.14.0.0+0512-0k4) yangtze; urgency=medium + + * Initial for openKylin. + + -- zhaoshixu Fri, 17 Jun 2022 11:46:09 +0800 diff --git a/debian/compat b/debian/compat new file mode 100644 index 00000000..ec635144 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 00000000..4f8b3798 --- /dev/null +++ b/debian/control @@ -0,0 +1,49 @@ +Source: kylin-nm +Section: utils +Priority: optional +Maintainer: Kylin Team +Uploaders: handsome_feng +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. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 00000000..ab540d0e --- /dev/null +++ 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 +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 + . + On Debian systems, the complete text of the GNU General + Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". diff --git a/debian/kylin-nm.manpages b/debian/kylin-nm.manpages new file mode 100644 index 00000000..9691523b --- /dev/null +++ b/debian/kylin-nm.manpages @@ -0,0 +1 @@ +man/kylin-nm.1 \ No newline at end of file diff --git a/debian/kylin-nm.postinst b/debian/kylin-nm.postinst new file mode 100755 index 00000000..e99563ba --- /dev/null +++ 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 + diff --git a/debian/kylin-nm.preinst b/debian/kylin-nm.preinst new file mode 100644 index 00000000..1390f944 --- /dev/null +++ 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 diff --git a/debian/rules b/debian/rules new file mode 100755 index 00000000..2da18dca --- /dev/null +++ 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 + diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch new file mode 100644 index 00000000..8253cbbc --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=4 +https://github.com/ukui/kylin-nm/releases .*/kylin-nm_(\d\S+)\.orig\.tar\.gz