From b22b9dbac54a7ea9c248c96f490d0098fdfeb484 Mon Sep 17 00:00:00 2001 From: Mouse Zhang Date: Tue, 14 Feb 2023 17:11:23 +0800 Subject: [PATCH] fix --- debian/control | 47 +++++---------- debian/rules | 15 +---- debian/source/format | 2 +- debian/ukui-search-systemdbus.install | 2 +- .../cppjieba/limonp/Md5.hpp | 60 +++++++++---------- .../ukuisearch-systemdbus.pro | 2 +- 6 files changed, 50 insertions(+), 78 deletions(-) diff --git a/debian/control b/debian/control index fa43279..df37de1 100644 --- a/debian/control +++ b/debian/control @@ -1,8 +1,9 @@ Source: ukui-search Section: utils Priority: optional -Maintainer: zhangpengfei -Build-Depends: debhelper-compat (=12), +Maintainer: Kylin Team +Uploaders: MouseZhang +Build-Depends: debhelper-compat (=13), pkgconf, libgsettings-qt-dev, qtbase5-dev, @@ -29,10 +30,10 @@ Build-Depends: debhelper-compat (=12), libukui-appwidget-qmlplugin0, qml-module-org-ukui-stylehelper, qtdeclarative5-dev -Standards-Version: 4.5.0 +Standards-Version: 4.6.1.0 Rules-Requires-Root: no Homepage: https://www.ukui.org/ -Vcs-Git: https://gitee.com/openkylin/ukui-search.git +Vcs-Git: https://gitee.com/openkylin/ukui-search.git Vcs-Browser: https://gitee.com/openkylin/ukui-search Package: ukui-search @@ -40,24 +41,17 @@ Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, libukui-search2 (= ${binary:Version}), -Description: A user-wide desktop search feature of UKUI desktop environment. - . +Description: A user-wide desktop search feature of UKUI desktop environment A gui application that provides file search, application search,settings search functions, and so on. -Replaces: ukui-search (<= 3.14.0.6-ok2~0720) -Breaks: ukui-search (<= 3.14.0.6-ok2~0720) Package: libchinese-segmentation1 Section: libs Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} -Provides: libchinese-segmentation, -Replaces: libchinese-segmentation0 -Breaks: libchinese-segmentation0 -Description: Libraries for chinese-segmentation. - . +Description: Libraries for chinese-segmentation This package contains a few runtime libraries needed by libsearch. @@ -68,8 +62,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, libchinese-segmentation1 (= ${binary:Version}), Description: Libraries for chinese-segmentation(development files) - . - This package contains NLP functions used by ukui-search. + This package contains NLP functions used by ukui-search. Package: libukui-search2 Section: libs @@ -79,15 +72,11 @@ Depends: ${misc:Depends}, libchinese-segmentation1 (= ${binary:Version}), ukui-search-systemdbus (= ${binary:Version}) Provides: libukui-search, -Description: Libraries for ukui-search. - . - This package provides libraries for ukui-search, - and contains some binarys for search function implement, - Which are ukui-search-service,ukui-search-app-data-service - and ukui-search-service-dir-manager. -Conflicts: ukui-search (<= 3.14.0.6-ok2~0720) -Replaces: ukui-search (<= 3.14.0.6-ok2~0720),libukui-search0 -Breaks: ukui-search (<= 3.14.0.6-ok2~0720),libukui-search0 +Description: Libraries for ukui-search + This package provides libraries for ukui-search, + and contains some binarys for search function implement, + Which are ukui-search-service,ukui-search-app-data-service + and ukui-search-service-dir-manager. Package: libukui-search-dev Section: libdevel @@ -95,16 +84,12 @@ Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, libukui-search2 (= ${binary:Version}), -Replaces: libukui-search-dev (<= 3.14.0.6-ok2~0720) -Breaks: libukui-search-dev (<= 3.14.0.6-ok2~0720) -Description: Libraries for ukui-search(development files). - . - This package can be used to implement a gui application. +Description: Libraries for ukui-search(development files) + This package can be used to implement a gui application. Package: ukui-search-systemdbus Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, -Description: Systembus interface to modify max_user_watches nums permanent. - . +Description: Systembus interface to modify max_user_watches nums permanent This package contains functions used when ukui-search want to modify some system settings. diff --git a/debian/rules b/debian/rules index e0bdbab..548260b 100755 --- a/debian/rules +++ b/debian/rules @@ -1,18 +1,5 @@ #!/usr/bin/make -f -# See debhelper(7) (uncomment to enable) -# output every command that modifies files on the build system. -#export DH_VERBOSE = 1 - - -# see FEATURE AREAS in dpkg-buildflags(1) -# export QT_SELECT=5 - -# see ENVIRONMENT in dpkg-buildflags(1) -# package maintainers to append CFLAGS -#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic -# package maintainers to append LDFLAGS -#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed - +export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: dh $@ diff --git a/debian/source/format b/debian/source/format index 163aaf8..89ae9db 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (quilt) +3.0 (native) diff --git a/debian/ukui-search-systemdbus.install b/debian/ukui-search-systemdbus.install index 2f81586..fe69413 100644 --- a/debian/ukui-search-systemdbus.install +++ b/debian/ukui-search-systemdbus.install @@ -1,3 +1,3 @@ /usr/share/dbus-1/system-services/com.ukui.search.qt.systemdbus.service -/etc/dbus-1/system.d/com.ukui.search.qt.systemdbus.conf +/usr/share/dbus-1/system.d/com.ukui.search.qt.systemdbus.conf /usr/bin/ukui-search-systemdbus diff --git a/libchinese-segmentation/cppjieba/limonp/Md5.hpp b/libchinese-segmentation/cppjieba/limonp/Md5.hpp index 7c9caf9..db83e97 100644 --- a/libchinese-segmentation/cppjieba/limonp/Md5.hpp +++ b/libchinese-segmentation/cppjieba/limonp/Md5.hpp @@ -1,33 +1,33 @@ -/**************************************************************************** -**Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991 -** 2020, KylinSoft Co., Ltd. -**All rights reserved. -** -**License to copy and use this software is granted provided that it -**is identified as the "RSA Data Security, Inc. MD5 Message-Digest -**Algorithm" in all material mentioning or referencing this software -**or this function. -** -**License is also granted to make and use derivative works provided -**that such works are identified as "derived from the RSA Data -**Security, Inc. MD5 Message-Digest Algorithm" in all material -**mentioning or referencing the derived work. -** -**RSA Data Security, Inc. makes no representations concerning either -**the merchantability of this software or the suitability of this -**software for any particular purpose. It is provided "as is" -**without express or implied warranty of any kind. -** -**These notices must be retained in any copies of any part of this -**documentation and/or software. -** -** -** -**The original md5 implementation avoids external libraries. -**This version has dependency on stdio.h for file input and -**string.h for memcpy. -** -****************************************************************************/ +/*************************************************************************** +*Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991 +* 2020, KylinSoft Co., Ltd. +*All rights reserved. +* +*License to copy and use this software is granted provided that it +*is identified as the "RSA Data Security, Inc. MD5 Message-Digest +*Algorithm" in all material mentioning or referencing this software +*or this function. +* +*License is also granted to make and use derivative works provided +*that such works are identified as "derived from the RSA Data +*Security, Inc. MD5 Message-Digest Algorithm" in all material +*mentioning or referencing the derived work. +* +*RSA Data Security, Inc. makes no representations concerning either +*the merchantability of this software or the suitability of this +*software for any particular purpose. It is provided "as is" +*without express or implied warranty of any kind. +* +*These notices must be retained in any copies of any part of this +*documentation and/or software. +* +* +* +*The original md5 implementation avoids external libraries. +*This version has dependency on stdio.h for file input and +*string.h for memcpy. +* +***************************************************************************/ #ifndef __MD5_H__ #define __MD5_H__ diff --git a/ukuisearch-systemdbus/ukuisearch-systemdbus.pro b/ukuisearch-systemdbus/ukuisearch-systemdbus.pro index 623a8b5..7097cea 100644 --- a/ukuisearch-systemdbus/ukuisearch-systemdbus.pro +++ b/ukuisearch-systemdbus/ukuisearch-systemdbus.pro @@ -15,7 +15,7 @@ INCLUDEPATH += . inst1.files += conf/com.ukui.search.qt.systemdbus.service inst1.path = /usr/share/dbus-1/system-services/ inst2.files += conf/com.ukui.search.qt.systemdbus.conf -inst2.path = /etc/dbus-1/system.d/ +inst2.path = /usr/share/dbus-1/system.d target.source += $$TARGET target.path = /usr/bin