diff --git a/debian/control b/debian/control index cee6244..244d4f6 100644 --- a/debian/control +++ b/debian/control @@ -15,16 +15,18 @@ 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 +Package: libkysdk-base2 Architecture: any -Depends: ${misc:Depends}, ${shlibs:Depends} +Multi-Arch: same +Depends: libkysdk-base-common (>= ${source:Version}), + ${misc:Depends}, + ${shlibs:Depends} Description: Kylin SDK basic library libkysdk-base provides common functions in the process of program development, including log management, message communication, process daemon, thread management, timer, debugging and embedding, configuration file reading and writing, etc. - This package is empty package. Package: libkysdk-base-dev Architecture: any @@ -37,3 +39,17 @@ Description: development files for libkysdk-base management, timer, debugging and embedding, configuration file reading and writing, etc. Contains development files for libkysdk-base. + +Package: libkysdk-base-common +Section: misc +Architecture: all +Multi-Arch: foreign +Depends: ${misc:Depends} +Description: common files for kylin sdk base library + libkysdk-base provides common functions in the + process of program development, including log + management, message communication, process + daemon, thread management, timer, debugging and + embedding, configuration file reading and writing, etc. + . + This package contains the common files which the libraries need. diff --git a/debian/libkysdk-base-common.install b/debian/libkysdk-base-common.install new file mode 100644 index 0000000..4fbd4ba --- /dev/null +++ b/debian/libkysdk-base-common.install @@ -0,0 +1,2 @@ +etc/kysdk/kysdk-base/kylog-rotate-default +src/log/kylog-default.conf etc/kysdk/kysdk-base diff --git a/debian/libkysdk-base-dev.install b/debian/libkysdk-base-dev.install index b82cac9..6d2069f 100644 --- a/debian/libkysdk-base-dev.install +++ b/debian/libkysdk-base-dev.install @@ -1,22 +1,3 @@ -development-files/kysdk-base.pc usr/share/pkgconfig/ -development-files/kysdk-config.pc usr/share/pkgconfig/ -development-files/kysdk-gsetting.pc usr/share/pkgconfig/ -development-files/kysdk-log.pc usr/share/pkgconfig/ -development-files/kysdk-timer.pc usr/share/pkgconfig/ -development-files/kysdk-utils.pc usr/share/pkgconfig/ -usr/include/kysdk/kysdk-base/cstring-extension.h -usr/include/kysdk/kysdk-base/kerr.h -usr/include/kysdk/kysdk-base/kyutils.h -usr/include/kysdk/kysdk-base/libkyconf.h -usr/include/kysdk/kysdk-base/libkygsetting.h -usr/include/kysdk/kysdk-base/libkylog.h -usr/include/kysdk/kysdk-base/libkytimer.h -usr/include/kysdk/kysdk-base/listdata.h -usr/include/kysdk/kysdk-base/sdkmarcos.h -usr/include/kysdk/kysdk-base/skip_linklist.h -usr/lib/*/libkydatastruct.so -usr/lib/*/libkysdk-config.so -usr/lib/*/libkysdk-gsetting.so -usr/lib/*/libkysdk-log.so -usr/lib/*/libkysdk-timer.so -usr/lib/*/libkyutils.so +development-files/*.pc usr/share/pkgconfig/ +usr/include/kysdk/kysdk-base/*.h +usr/lib/*/libky*.so diff --git a/debian/libkysdk-base.install b/debian/libkysdk-base.install deleted file mode 100644 index c377730..0000000 --- a/debian/libkysdk-base.install +++ /dev/null @@ -1,8 +0,0 @@ -etc/kysdk/kysdk-base/kylog-rotate-default -src/log/kylog-default.conf etc/kysdk/kysdk-base -usr/lib/*/libkydatastruct.so.* -usr/lib/*/libkysdk-config.so.* -usr/lib/*/libkysdk-gsetting.so.* -usr/lib/*/libkysdk-log.so.* -usr/lib/*/libkysdk-timer.so.* -usr/lib/*/libkyutils.so.* diff --git a/debian/libkysdk-base.lintian-overrides b/debian/libkysdk-base.lintian-overrides deleted file mode 100644 index 4847bb6..0000000 --- a/debian/libkysdk-base.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libkysdk-base: package-name-doesnt-match-sonames libkydatastruct1 libkysdk-config1 libkysdk-gsetting1 libkysdk-log1 libkysdk-timer1 libkyutils1 diff --git a/debian/libkysdk-base2.install b/debian/libkysdk-base2.install new file mode 100644 index 0000000..b554761 --- /dev/null +++ b/debian/libkysdk-base2.install @@ -0,0 +1 @@ +usr/lib/*/libky*.so.* diff --git a/debian/libkysdk-base2.lintian-overrides b/debian/libkysdk-base2.lintian-overrides new file mode 100644 index 0000000..ebdb376 --- /dev/null +++ b/debian/libkysdk-base2.lintian-overrides @@ -0,0 +1 @@ +libkysdk-base: package-name-doesnt-match-sonames libkydatastruct2 libkysdk-config2 libkysdk-gsetting2 libkysdk-log2 libkysdk-timer2 libkyutils2 diff --git a/debian/libkysdk-base.symbols b/debian/libkysdk-base2.symbols similarity index 91% rename from debian/libkysdk-base.symbols rename to debian/libkysdk-base2.symbols index 3dfb340..5d9a032 100644 --- a/debian/libkysdk-base.symbols +++ b/debian/libkysdk-base2.symbols @@ -1,4 +1,4 @@ -libkydatastruct.so.1 libkysdk-base #MINVER# +libkydatastruct.so.2 libkysdk-base #MINVER# * Build-Depends-Package: libkysdk-base-dev kysdk_create_skiplist@Base 2.2.0.0 kysdk_destroy_skiplist@Base 2.2.0.0 @@ -6,7 +6,7 @@ libkydatastruct.so.1 libkysdk-base #MINVER# kysdk_skiplist_insert@Base 2.2.0.0 kysdk_skiplist_search@Base 2.2.0.0 kysdk_skiplist_setmaxlevels@Base 2.2.0.0 -libkysdk-config.so.1 libkysdk-base #MINVER# +libkysdk-config.so.2 libkysdk-base #MINVER# * Build-Depends-Package: libkysdk-base-dev S_destroyParse@Base 2.2.0.0 S_getGroupList@Base 2.2.0.0 @@ -33,7 +33,7 @@ libkysdk-config.so.1 libkysdk-base #MINVER# kdk_conf_reload@Base 2.2.0.0 kdk_conf_set_value@Base 2.2.0.0 kdk_config_freeall@Base 2.2.0.0 -libkysdk-gsetting.so.1 libkysdk-base #MINVER# +libkysdk-gsetting.so.2 libkysdk-base #MINVER# * Build-Depends-Package: libkysdk-base-dev kdk_gsettings_get@Base 2.2.0.0 kdk_gsettings_set@Base 2.2.0.0 @@ -44,7 +44,7 @@ libkysdk-gsetting.so.1 libkysdk-base #MINVER# kdk_settings_set_int@Base 2.2.0.0 kdk_settings_set_string@Base 2.2.0.0 schema_key_is_exist@Base 2.2.0.0 -libkysdk-log.so.1 libkysdk-base #MINVER# +libkysdk-log.so.2 libkysdk-base #MINVER# * Build-Depends-Package: libkysdk-base-dev append_wrap@Base 2.2.0.0 destroyKLogger@Base 2.2.0.0 @@ -73,14 +73,14 @@ libkysdk-log.so.1 libkysdk-base #MINVER# stringLevel@Base 2.2.0.0 writeFile@Base 2.2.0.0 writeLog@Base 2.2.0.0 -libkysdk-timer.so.1 libkysdk-base #MINVER# +libkysdk-timer.so.2 libkysdk-base #MINVER# * Build-Depends-Package: libkysdk-base-dev kdk_timer_destroy@Base 2.2.0.0 kdk_timer_init@Base 2.2.0.0 kdk_timer_reset@Base 2.2.0.0 kdk_timer_start@Base 2.2.0.0 kdk_timer_stop@Base 2.2.0.0 -libkyutils.so.1 libkysdk-base #MINVER# +libkyutils.so.2 libkysdk-base #MINVER# * Build-Depends-Package: libkysdk-base-dev kdkVolumeBaseCharacterConvert@Base 2.2.0.0 kdkVolumeBaseNumericalConvert@Base 2.2.0.0