Add libkylin-nm-base and kylin-nm-plugin in kylin-nm for debian. Fix lintian error

This commit is contained in:
xibowen 2024-01-24 14:59:56 +08:00
parent 88b08c8df1
commit 1926f562e3
14 changed files with 168 additions and 172 deletions

188
debian/changelog vendored
View File

@ -1,146 +1,128 @@
kylin-nm (4.0.0.0-ok8.2) yangtze; urgency=medium
kylin-nm (4.0.0.0-1) unstable; urgency=medium
* issue #I7GT8M #I7GST6 #I7YPFI #I73HNK #I72PU4
* New upstream release.
-- zhaoshixu <zhaoshixu@kylinos.cn> Tue, 26 Sep 2023 14:58:15 +0800
-- xibowen <xibowen@kylinos.cn> Tue, 26 Sep 2023 14:58:15 +0800
kylin-nm (4.0.0.0-ok8.1) yangtze; urgency=medium
kylin-nm (3.0.3-1) unstable; urgency=medium
* rebuild with no changes.
* New upstream release.
-- handsome_feng <jianfengli@ubuntukylin.com> Fri, 09 Jun 2023 16:55:52 +0800
-- handsome_feng <jianfengli@ubuntukylin.com> Wed, 23 Feb 2022 13:52:31 +0800
kylin-nm (4.0.0.0-ok8) yangtze; urgency=medium
kylin-nm (3.0.2-1) unstable; urgency=medium
* issue #I71UQZ #I71VZ1 #I7200J #I72OMH #I73HNK
* New upstream release.
-- zhaoshixu <zhaoshixu@kylinos.cn> Tue, 30 May 2023 13:52:06 +0800
-- handsome_feng <jianfengli@ubuntukylin.com> Mon, 16 Aug 2021 19:00:43 +0800
kylin-nm (4.0.0.0-ok7) yangtze; urgency=medium
kylin-nm (3.0.1-1) unstable; urgency=medium
* issue #I73I44 #I71WH5
* New upstream bugfix release.
-- zhaoshixu <zhaoshixu@kylinos.cn> Wed, 24 May 2023 15:36:21 +0800
-- handsome_feng <jianfengli@ubuntukylin.com> Sun, 27 Sep 2020 14:43:45 +0800
kylin-nm (4.0.0.0-ok6) yangtze; urgency=medium
kylin-nm (3.0.0-1) unstable; urgency=medium
* issue #I7357J
* New upstream release.
-- zhaoshixu <zhaoshixu@kylinos.cn> Wed, 17 May 2023 09:56:46 +0800
-- handsome_feng <jianfengli@ubuntukylin.com> Wed, 26 Aug 2020 20:25:16 +0800
kylin-nm (4.0.0.0-ok5) yangtze; urgency=medium
kylin-nm (1.2.3-1) unstable; urgency=medium
* Modify plugin name from Vpn to VPN.
* New upstream bugfix release:
- Fix the error when communicate with ukui-control-center.
- Can't click save button when there is empty entry when configure
network.
- Fix the incorrect position of some buttons.
- Fix the crash when switch the wifi.
- Fix the wrong position between upload icon and download icon.
- Fix the occasional crash when get ipv4 and ipv6.
- Fix the wrong position of right-click menu.
- Fix that can't get normal message from ukui-panel.
- Fix that no notification after modify the configuration.
- Fix the error when state of connection and speed of network
display at the same time.
* debian/control:
- Add libgsettings-qt-dev, libkf5windowsystem-dev to build-depends.
-- handsome_feng <jianfengli@ubuntukylin.com> Sat, 13 May 2023 16:52:05 +0800
-- handsome_feng <jianfengli@ubuntukylin.com> Mon, 06 Apr 2020 23:11:15 +0800
kylin-nm (4.0.0.0-ok4) yangtz; urgency=medium
kylin-nm (1.2.2.1-1) unstable; urgency=medium
* remove kysec
* Remove the .qmake.stash witch cause the build failed.
-- zhaoshixu <zhaoshixu@kylinos.cn> Wed, 12 Apr 2023 19:28:57 +0800
-- handsome_feng <jianfengli@ubuntukylin.com> Sat, 14 Mar 2020 18:48:03 +0800
kylin-nm (4.0.0.0-ok3) yangtze; urgency=medium
kylin-nm (1.2.2-1) unstable; urgency=medium
* #include <QPainterPath>
* New upstream release.
- Fix that the connect button display at wrong place.
- Fix that sometimes failed to switch network type.
- Fix the problem in multiscreen.
- Adjust the style sheet.
- Show configure window when click network info widget.
- Add the function to create new network.
* debian/control:
- Drop libnotify-bin from build-depends.
-- zhaoshixu <zhaoshixu@kylinos.cn> Wed, 12 Apr 2023 19:05:00 +0800
-- handsome_feng <jianfengli@ubuntukylin.com> Sat, 14 Mar 2020 15:15:38 +0800
kylin-nm (4.0.0.0-ok2) yangtze; urgency=medium
kylin-nm (1.2.1-1) unstable; urgency=medium
* remove wired switch
[ lixiang ]
* update kylin-nm.pro and rules.
-- zhaoshixu <zhaoshixu@kylinos.cn> Wed, 12 Apr 2023 18:44:10 +0800
-- handsome_feng <jianfengli@ubuntukylin.com> Wed, 26 Feb 2020 00:21:11 +0800
kylin-nm (4.0.0.0-ok1) yangtze; urgency=medium
kylin-nm (1.2.0-1) unstable; urgency=medium
* merge upstream
* New upstream release.
* debian/control:
- Bump standards-version to 4.5.0.
-- zhaoshixu <zhaoshixu@kylinos.cn> Wed, 12 Apr 2023 17:09:37 +0800
[ lixiang ]
* update kylin-nm.pro and rules.
kylin-nm (3.14.0.0+0512-3k15) yangtze; urgency=medium
* Remove the depend package libnotify-bin.
* User can config network by clicking information button about IP.
* kylin-nm enable create new wired net now.
* QSystemTrayIcon register
-- handsome_feng <jianfengli@ubuntukylin.com> Tue, 25 Feb 2020 14:12:29 +0800
-- zhaoshixu <zhaoshixu@kylinos.cn> Fri, 06 Jan 2023 16:22:59 +0800
kylin-nm (1.0.4-1) unstable; urgency=medium
kylin-nm (3.14.0.0+0512-3k14) yangtze; urgency=medium
* New upstream release.
* debian/control:
- Bump standards-version to 4.4.1. No changes needed.
* debian/{compat,control}:
- Use debhelper-compat notation. Bump to DH compat level
version 12.
* add include QPainterPath
-- handsome_feng <jianfengli@ubuntukylin.com> Mon, 02 Dec 2019 09:48:37 +0800
-- zhaoshixu <zhaoshixu@kylinos.cn> Thu, 05 Jan 2023 16:27:10 +0800
kylin-nm (1.0.3-1) unstable; urgency=medium
kylin-nm (3.14.0.0+0512-3k13) yangtze; urgency=medium
* New upstream release:
- Fix that the connect state doesn't update after net cable plug in or
out. (LP: #1831818)
- Add the function to connect to hidden wireless network. (LP: #1829807)
* Debian/control: Bump standards vertion to 4.4.0.
* 增加三种企业网加密方式LEAP PWD FAST
-- handsome_feng <jianfengli@ubuntukylin.com> Thu, 26 Sep 2019 19:28:24 +0800
-- zhaoshixu <zhaoshixu@kylinos.cn> Mon, 26 Dec 2022 16:11:31 +0800
kylin-nm (1.0.2-0ubuntu1) eoan; urgency=medium
kylin-nm (3.14.0.0+0512-3k12) yangtze; urgency=medium
* Bug-fix only:
- Fix the wrong connection status. (LP: #1823843)
- Fix that unable to close after turned on the network.
(LP: #1823844)
- Implement singleton pattern. (LP: #1823845)
* vpn页面增加
* dns优化
* tabBar圆角
-- handsome_feng <jianfengli@ubuntukylin.com> Tue, 16 Apr 2019 21:16:36 +0800
-- zhaoshixu <zhaoshixu@kylinos.cn> Fri, 16 Dec 2022 12:04:41 +0800
kylin-nm (1.0.0-1) unstable; urgency=medium
kylin-nm (3.14.0.0+0512-3k11) yangtz; urgency=medium
* Initial release. (Closes: #919549)
* 合并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
-- handsome_feng <jianfengli@ubuntukylin.com> Thu, 17 Jan 2019 15:49:40 +0800

1
debian/compat vendored
View File

@ -1 +0,0 @@
9

58
debian/control vendored
View File

@ -2,16 +2,16 @@ 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),
Uploaders: handsome_feng <jianfengli@ubuntukylin.com>,
xibowen <xibowen@kylinos.cn>
Build-Depends: debhelper-compat (=13),
libcap-dev,
libdbus-glib-1-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),
libkysdk-applications-dev(>= 1.2.0),
libnm-dev,
libnma-dev,
libqt5svg5-dev,
@ -26,24 +26,16 @@ Build-Depends: debhelper (>=9),
qtbase5-dev-tools,
qtchooser,
qtscript5-dev,
qttools5-dev-tools,
libkylin-nm-base
Standards-Version: 4.5.0
qttools5-dev-tools
Standards-Version: 4.6.1.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
Homepage: https://gitee.com/openkylin/kylin-nm
Vcs-Git: https://gitee.com/openkylin/kylin-nm.git
Vcs-Browser: https://gitee.com/openkylin/kylin-nm
Package: kylin-nm
Architecture: any
Depends: libkysdk-qtwidgets,
libkysdk-waylandhelper,
network-manager (>=1.2.6),
ukui-control-center (>= 3.1.1+1217),
dpkg-dev,
libkysdk-sysinfo,
${shlibs:Depends},
${misc:Depends}
Depends: network-manager (>=1.2.6), ${misc:Depends}, ${shlibs: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.
@ -52,10 +44,36 @@ Description: Gui Applet tool for display and edit network simply
Package: kylin-nm-plugin
Architecture: any
Depends: libkylin-nm-base,
libkysdk-qtwidgets,
network-manager (>=1.2.6),
${misc:Depends},
${shlibs:Depends}
Description: Gui Applet plugin for display and edit network simply
It has beautiful UI and very comfortable to use.
It's better work together with UKUI.
Package: kylin-nm-plugin-dev
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: Gui Applet plugin for display and edit network simply
It has beautiful UI and very comfortable to use.
It's better work together with UKUI.This is kylin-nm-plugin
development file.
Package: libkylin-nm-base
Section: libs
Architecture: any
Depends: network-manager (>=1.2.6), ${misc:Depends}, ${shlibs: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.
Package: libkylin-nm-base-dev
Section: libdevel
Architecture: any
Depends: ${misc:Depends}, ${shlibs: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.This is libkylin-nm-base
development file.

2
debian/kylin-nm-plugin-dev.install vendored Normal file
View File

@ -0,0 +1,2 @@
usr/include/kylin-nm/kynetworkicon.h
usr/lib/liblibnm-icon-kylin.so

View File

@ -1,4 +1,3 @@
usr/lib/liblibnm-icon-kylin.so*
usr/lib/kylin-nm/libnetconnect.so
usr/lib/kylin-nm/libwlanconnect.so
usr/include/kylin-nm/kynetworkicon.h
usr/lib/liblibnm-icon-kylin.so.*

View File

@ -0,0 +1 @@
package-name-doesnt-match-sonames liblibnm-icon-kylin1

View File

@ -1,5 +1,5 @@
usr/share/*
usr/lib/x86_64-linux-gnu/*
usr/bin/*
/usr/share/dbus-1/system.d/com.kylin.network.qt.systemdbus.conf
etc/xdg/autostart/*
etc/dbus-1/system.d/com.kylin.network.qt.systemdbus.conf
usr/bin/*
usr/lib/x86_64-linux-gnu/*
usr/share/*

View File

@ -1 +1,4 @@
man/kylin-nm-plugin.1
man/kylin-nm-sysdbus.1
man/kylin-nm.1
man/kylin-vpn.1

View File

@ -1,12 +0,0 @@
#!/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

29
debian/libkylin-nm-base-dev.install vendored Normal file
View File

@ -0,0 +1,29 @@
libkylin-nm-base/libnm-kylin/libnm-base-kylin/pkgconfig/kylin-nm-base.pc /usr/share/pkgconfig/
usr/include/kylin-nm/depend/kyapnetresource.h
usr/include/kylin-nm/depend/kyenterpricesettinginfo.h
usr/include/kylin-nm/depend/kylinactiveconnectresource.h
usr/include/kylin-nm/depend/kylinapconnectitem.h
usr/include/kylin-nm/depend/kylinconnectitem.h
usr/include/kylin-nm/depend/kylinconnectoperation.h
usr/include/kylin-nm/depend/kylinconnectsetting.h
usr/include/kylin-nm/depend/kylingeneral.h
usr/include/kylin-nm/depend/kylinnetresource.h
usr/include/kylin-nm/depend/kylinnetworkdeviceresource.h
usr/include/kylin-nm/depend/kylinnetworkmanagerutil.h
usr/include/kylin-nm/depend/kylinnetworkresourcemanager.h
usr/include/kylin-nm/depend/kylinnetworkresourcetype.h
usr/include/kylin-nm/depend/kylinwiredconnectoperation.h
usr/include/kylin-nm/depend/kylinwirednetresource.h
usr/include/kylin-nm/depend/kywirelessconnectoperation.h
usr/include/kylin-nm/depend/kywirelessnetitem.h
usr/include/kylin-nm/depend/kywirelessnetresource.h
usr/include/kylin-nm/kylin-agent/agentutils.h
usr/include/kylin-nm/kylin-agent/kylinagent.h
usr/include/kylin-nm/kylin-agent/kylinagentobject.h
usr/include/kylin-nm/kylin-agent/kylinpassworddialog.h
usr/include/kylin-nm/kylin-agent/kylinsecretagent.h
usr/include/kylin-nm/kylin-nm-interface.h
usr/include/kylin-nm/kylinnetworkmanager.h
usr/include/kylin-nm/libnm-base-kylin_global.h
usr/lib/libkylin-keyring.so
usr/lib/libkylin-nm-base.so

2
debian/libkylin-nm-base.install vendored Normal file
View File

@ -0,0 +1,2 @@
usr/lib/libkylin-keyring.so.*
usr/lib/libkylin-nm-base.so.*

View File

@ -0,0 +1 @@
libkylin-nm-base: package-name-doesnt-match-sonames libkylin-keyring1 libkylin-nm-base1

28
debian/rules vendored
View File

@ -1,34 +1,6 @@
#!/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

View File

@ -1 +1 @@
3.0 (native)
3.0 (quilt)