From b773348858ac3bb46a8481372bc5e6fc0999d070 Mon Sep 17 00:00:00 2001 From: KevinDuan Date: Mon, 6 Mar 2023 11:05:58 +0800 Subject: [PATCH] Fix lintian error --- CMakeLists.txt | 3 -- debian/changelog | 6 +-- debian/control | 80 +++++++++++++++---------------- debian/libkysdk-log-dev.install | 2 +- debian/libkysdk-log.install | 2 +- debian/libkysdk-utils-dev.install | 4 +- debian/libkysdk-utils.install | 1 - debian/watch | 2 +- 8 files changed, 46 insertions(+), 54 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 55fdcb7..45b843f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,9 +6,6 @@ include(CMakePackageConfigHelpers) include_directories("${PROJECT_BINARY_DIR}") -set(CMAKE_C_STANDARD 11) -set(CMAKE_CXX_STANDARD 11) - set (CMAKE_EXPORT_COMPILE_COMMANDS ON) set (CMAKE_SKIP_RPATH ON) diff --git a/debian/changelog b/debian/changelog index d47dae2..71c7e25 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -libkysdk-base (1.0.1-1) sid; urgency=medium +libkysdk-base (1.0.1-1) experimental; urgency=medium - * Initial release. (Closes: #1869007) + * Initial release. (Closes: #1031344) - -- xibowen Tue, 14 Feb 2023 10:48:05 +0800 + -- KevinDuan Tue, 14 Feb 2023 10:48:05 +0800 diff --git a/debian/control b/debian/control index 24d3037..c6a98a0 100644 --- a/debian/control +++ b/debian/control @@ -1,28 +1,27 @@ Source: libkysdk-base -Section: libs +Section: libdevel Priority: optional Maintainer: kylin Team -Uploaders: Bowen Xi -Build-Depends: debhelper-compat (= 12), - cmake, - libsystemd-dev, - libdbus-1-dev, - libssl-dev -Standards-Version: 4.6.2 +Uploaders: KevinDuan +Build-Depends: debhelper-compat (= 13), + cmake, + libsystemd-dev, + libdbus-1-dev, + libssl-dev +Standards-Version: 4.6.1.0 Rules-Requires-Root: no Homepage: https://gitee.com/openkylin/libkysdk-base Vcs-Git: https://gitee.com/openkylin/libkysdk-base.git Vcs-Browser: https://gitee.com/openkylin/libkysdk-base Package: libkysdk-base -Architecture: any +Architecture: all Depends: ${shlibs:Depends}, - ${misc:Depends}, - libkysdk-timer, - libkysdk-config, - libkysdk-log, - libkysdk-utils -Multi-Arch: same + ${misc:Depends}, + libkysdk-timer, + libkysdk-config, + libkysdk-log, + libkysdk-utils Description: Kylin SDK basic library It provides common functions in the process of program development, including log management, message communication, @@ -31,16 +30,13 @@ Description: Kylin SDK basic library This package is empty package. Package: libkysdk-base-dev -Architecture: any -Section: libdevel -Depends: ${shlibs:Depends}, - ${misc:Depends}, - libkysdk-base (= ${binary:Version}), - libkysdk-timer-dev, - libkysdk-config-dev, - libkysdk-log-dev, - libkysdk-utils-dev -Multi-Arch: same +Architecture: all +Depends: ${misc:Depends}, + libkysdk-base (= ${binary:Version}), + libkysdk-timer-dev, + libkysdk-config-dev, + libkysdk-log-dev, + libkysdk-utils-dev Description: development files for libkysdk-base It provides common functions in the process of program development, including log management, message communication, @@ -51,8 +47,8 @@ Description: development files for libkysdk-base Package: libkysdk-timer Architecture: any Depends: ${shlibs:Depends}, - ${misc:Depends} , - libkysdk-utils + ${misc:Depends}, + libkysdk-utils Multi-Arch: same Description: C style timer module It supports single trigger and repeated multiple @@ -63,9 +59,9 @@ Package: libkysdk-timer-dev Architecture: any Section: libdevel Depends: ${shlibs:Depends}, - ${misc:Depends}, - libkysdk-utils-dev, - libkysdk-timer (= ${binary:Version}) + ${misc:Depends}, + libkysdk-utils-dev, + libkysdk-timer (= ${binary:Version}) Multi-Arch: same Description: development files for libkysdk-timer It supports single trigger and repeated multiple @@ -104,10 +100,10 @@ Description: development files for libkysdk-config Package: libkysdk-log Architecture: any Depends: ${shlibs:Depends}, - ${misc:Depends}, - libkysdk-config, - logrotate, - libkysdk-utils + ${misc:Depends}, + libkysdk-config, + logrotate, + libkysdk-utils Multi-Arch: same Description: C style log module Support the setting of log level, log storage @@ -118,11 +114,11 @@ Package: libkysdk-log-dev Architecture: any Section: libdevel Depends: ${shlibs:Depends}, - ${misc:Depends}, - libkysdk-log (= ${binary:Version}), - libkysdk-config-dev, - libkysdk-utils-dev, - libsystemd-dev + ${misc:Depends}, + libkysdk-log (= ${binary:Version}), + libkysdk-config-dev, + libkysdk-utils-dev, + libsystemd-dev Multi-Arch: same Description: development files for libkysdk-log Support the setting of log level, log storage @@ -134,7 +130,7 @@ Description: development files for libkysdk-log Package: libkysdk-utils Architecture: any Depends: ${shlibs:Depends}, - ${misc:Depends} + ${misc:Depends} Multi-Arch: same Description: Basic tool function module The decimal conversion function between storage @@ -146,8 +142,8 @@ Package: libkysdk-utils-dev Architecture: any Section: libdevel Depends: ${shlibs:Depends}, - ${misc:Depends}, - libkysdk-utils (= ${binary:Version}) + ${misc:Depends}, + libkysdk-utils (= ${binary:Version}) Multi-Arch: same Description: development files for libkysdk-utils The decimal conversion function between storage diff --git a/debian/libkysdk-log-dev.install b/debian/libkysdk-log-dev.install index c2f70bd..2665da6 100644 --- a/debian/libkysdk-log-dev.install +++ b/debian/libkysdk-log-dev.install @@ -1,3 +1,3 @@ development-files/kysdk-log.pc usr/share/pkgconfig/ -src/log/libkylog.h usr/include/kysdk/kysdk-base +usr/include/kysdk/kysdk-base/libkylog.h usr/lib/*/libkylog.so diff --git a/debian/libkysdk-log.install b/debian/libkysdk-log.install index a9c15fd..9527b8f 100644 --- a/debian/libkysdk-log.install +++ b/debian/libkysdk-log.install @@ -1,5 +1,5 @@ src/log/kylog-default.conf etc/kysdk/kysdk-base -src/log/kylog-rotate-default etc/kysdk/kysdk-base +etc/kysdk/kysdk-base/kylog-rotate-default src/log/logrotate.cron etc/kysdk/kysdk-base #usr/lib/*/kysdk/kysdk-base/*.so* #usr/lib/*/kysdk/kysdk-base/libkyconf.so* diff --git a/debian/libkysdk-utils-dev.install b/debian/libkysdk-utils-dev.install index 26aa885..53011f4 100644 --- a/debian/libkysdk-utils-dev.install +++ b/debian/libkysdk-utils-dev.install @@ -1,7 +1,7 @@ development-files/kysdk-utils.pc usr/share/pkgconfig/ src/utils/cstring-extension.h usr/include/kysdk/kysdk-base -src/utils/data-structure/linklist/listdata.h usr/include/kysdk/kysdk-base -src/utils/data-structure/linklist/skip_linklist/skip_linklist.h usr/include/kysdk/kysdk-base +usr/include/kysdk/kysdk-base/listdata.h +usr/include/kysdk/kysdk-base/skip_linklist.h src/utils/kerr.h usr/include/kysdk/kysdk-base src/utils/sdkmarcos.h usr/include/kysdk/kysdk-base src/utils/kyutils.h usr/include/kysdk/kysdk-base diff --git a/debian/libkysdk-utils.install b/debian/libkysdk-utils.install index 7252e36..e0019f7 100644 --- a/debian/libkysdk-utils.install +++ b/debian/libkysdk-utils.install @@ -1,3 +1,2 @@ -#usr/lib/*/kysdk/kysdk-base/*.so* usr/lib/*/libkydatastruct.so.* usr/lib/*/libkyutils.so.* diff --git a/debian/watch b/debian/watch index 72e8677..7b9fdac 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,2 @@ version=4 -https://github.com/ukui/kylin-nm/releases .*/libkysdk-base_(\d\S+)\.orig\.tar\.gz +https://gitee.com/openkylin/libkysdk-base/releases .*/libkysdk-base_(\d\S+)\.orig\.tar\.gz