From f72a8307f525ad1c60533805a1e1b3611e97721b Mon Sep 17 00:00:00 2001 From: xibowen Date: Fri, 26 Jan 2024 14:32:07 +0800 Subject: [PATCH] Merge from openkylin/yangtze for debian --- debian/changelog | 7 +- debian/control | 136 +++++++----- debian/copyright | 210 +----------------- debian/libchinese-segmentation-common.install | 2 + debian/libchinese-segmentation-dev.install | 5 +- debian/libchinese-segmentation1.install | 2 - debian/libukui-search-common.install | 1 + debian/libukui-search-dev.install | 3 +- debian/libukui-search2.install | 10 - debian/rules | 26 ++- debian/source/format | 2 +- debian/ukui-search-service.install | 9 + debian/ukui-search-systemdbus.install | 4 +- debian/ukui-search.install | 16 +- 14 files changed, 139 insertions(+), 294 deletions(-) create mode 100644 debian/libchinese-segmentation-common.install create mode 100644 debian/libukui-search-common.install create mode 100644 debian/ukui-search-service.install diff --git a/debian/changelog b/debian/changelog index e98bdc3..f90beac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -ukui-search (3.22.4.2) unstable; urgency=medium +ukui-search (4.0.3.2-1) sid; urgency=medium - * Initial + * Initial release. + + -- Mouse Zhang Sun, 23 Jul 2023 22:52:54 -0400 - -- MouseZhang Fri, 10 Feb 2023 11:26:15 +0800 diff --git a/debian/control b/debian/control index e0842aa..62ae2b3 100644 --- a/debian/control +++ b/debian/control @@ -1,36 +1,34 @@ Source: ukui-search Section: utils Priority: optional -Maintainer: Kylin Team -Uploaders: MouseZhang -Build-Depends: debhelper-compat (=13), - pkgconf, - libgsettings-qt-dev, - qtbase5-dev, - qt5-qmake, - qtchooser, - qtscript5-dev, - qttools5-dev-tools, - libxapian-dev, - libquazip5-dev(>=0.7.6-6build1), +Maintainer: zhangpengfei +Build-Depends: cmake, + debhelper-compat (=13), libglib2.0-dev, + libgsettings-qt-dev, libkf5windowsystem-dev, - libqt5x11extras5-dev, - libuchardet-dev, + libkysdk-applications-dev, + libleptonica-dev, libpoppler-qt5-dev, - libukui-log4qt-dev, + libqt5x11extras5-dev, libqt5xdg-dev, - libukcc-dev, - libopencv-dev, + libquazip5-dev(>=0.7.6-6build1), libtesseract-dev, - libkysdk-waylandhelper-dev, - libkysdk-qtwidgets-dev, + libuchardet-dev, + libukcc-dev, libukui-appwidget-manager-dev, libukui-appwidget-provider-dev, libukui-appwidget-qmlplugin0, - qml-module-org-ukui-stylehelper, - qtdeclarative5-dev -Standards-Version: 4.6.1.0 + libukui-log4qt-dev, + libxapian-dev, + pkgconf, + qt5-qmake, + qtbase5-dev, + qtchooser, + qtdeclarative5-dev, + qtscript5-dev, + qttools5-dev +Standards-Version: 4.5.0 Rules-Requires-Root: no Homepage: https://www.ukui.org/ Vcs-Git: https://gitee.com/openkylin/ukui-search.git @@ -38,59 +36,83 @@ Vcs-Browser: https://gitee.com/openkylin/ukui-search Package: ukui-search Architecture: any -Depends: ${misc:Depends}, - ${shlibs:Depends}, - libukui-search2 (= ${binary:Version}), -Description: User-wide desktop search feature of UKUI desktop environment - Gui application that provides file search, - application search,settings search functions, - and so on. +Depends: libukui-search2 (= ${binary:Version}), + ukui-search-service (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends} +Description: A user-wide desktop search + feature of UKUI desktop environment. + +Package: ukui-search-service +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends} +Replaces: libukui-search0, libukui-search2 (<=4.0.1.1-ok0~0419) +Breaks: libukui-search0, libukui-search2 (<=4.0.1.1-ok0~0419) +Description: Data service for search function in UKUI desktop environment. Package: libchinese-segmentation1 Section: libs Architecture: any -Depends: ${misc:Depends}, +Depends: libchinese-segmentation-common (= ${source:Version}), + ${misc:Depends}, ${shlibs:Depends} Description: Libraries for chinese-segmentation - This package contains a few runtime libraries needed by - libsearch. + . + This package contains a runtime library needed by + ukui-search's file index function. + +Package: libchinese-segmentation-common +Architecture: any +Depends: ${misc:Depends} +Replaces: libchinese-segmentation0, + libchinese-segmentation1 (<=4.0.1.1-ok0~0419) +Breaks: libchinese-segmentation0, libchinese-segmentation1 (<=4.0.1.1-ok0~0419) +Description: Extra files for chinese-segmentation + . + This package contains dicts used by chinese-segmentation. Package: libchinese-segmentation-dev Section: libdevel Architecture: any -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. +Depends: libchinese-segmentation1 (= ${binary:Version}), ${misc:Depends} +Description: Libraries for chinese-segmentation(development files). Package: libukui-search2 Section: libs Architecture: any -Depends: ${misc:Depends}, - ${shlibs: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. +Depends: libchinese-segmentation1 (= ${binary:Version}), + libukui-search-common (= ${source:Version}), + ukui-search-systemdbus (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends} +Provides: libukui-search +Description: Libraries for ukui-search. + . + This package contains a runtime library needed by + ukui-search and it's extensions. + +Package: libukui-search-common +Architecture: any +Depends: ${misc:Depends} +Replaces: libukui-search0, + libukui-search2 (<=4.0.1.1-ok0~0419), + ukui-search (<= 3.14.0.6-ok2~0720) +Breaks: libukui-search0, + libukui-search2 (<=4.0.1.1-ok0~0419), + ukui-search (<= 3.14.0.6-ok2~0720) +Description: Extra files for libukui-search + . + This package contains some extra files for libukui-search, + for now, translation files only. Package: libukui-search-dev Section: libdevel Architecture: any -Depends: ${misc:Depends}, - ${shlibs:Depends}, - libukui-search2 (= ${binary:Version}), -Description: Libraries for ukui-search(development files) - This package can be used to implement a gui application. +Depends: libukui-search2 (= ${binary:Version}), ${misc:Depends} +Description: Libraries for ukui-search(development files). Package: ukui-search-systemdbus Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, -Description: Systembus interface to modify max_user_watches nums permanent - This package contains functions used when ukui-search want to - modify some system settings. +Depends: ${misc:Depends}, ${shlibs:Depends} +Description: Systembus interface to modify max_user_watches nums + permanent. diff --git a/debian/copyright b/debian/copyright index 729692c..9dbc41e 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,171 +4,13 @@ Files: * Copyright: 2020, KylinSoft Co., Ltd. License: GPL-3+ -Files: 3rd-parties/* -Copyright: 2020, KylinSoft Co., Ltd. - 2015-2018, Itay Grudev -License: Expat - -Files: 3rd-parties/SingleApplication/CHANGELOG.md - 3rd-parties/SingleApplication/Windows.md -Copyright: 2020, KylinSoft Co., Ltd. -License: GPL-3+ - -Files: 3rd-parties/SingleApplication/README.md -Copyright: 2020, KylinSoft Co., Ltd. -License: Expat - -Files: 3rd-parties/SingleApplication/singleapplication.cpp - 3rd-parties/SingleApplication/singleapplication.h - 3rd-parties/SingleApplication/singleapplication_p.cpp - 3rd-parties/SingleApplication/singleapplication_p.h -Copyright: 2015-2018, Itay Grudev -License: Expat - -Files: 3rd-parties/qtsingleapplication/* -Copyright: 2013, Digia Plc and/or its subsidiary(-ies). -License: BSD-3-clause - -Files: 3rd-parties/qtsingleapplication/QtLockedFile - 3rd-parties/qtsingleapplication/QtSingleApplication -Copyright: 2020, KylinSoft Co., Ltd. -License: GPL-3+ - -Files: frontend/* -Copyright: 2020-2022, KylinSoft Co., Ltd. -License: GPL-3+ - -Files: frontend/control/flow-layout/* -Copyright: 2019, Tianjin KYLIN Information Technology Co., Ltd. -License: GPL-2+ - -Files: frontend/model/best-list-model.h - frontend/model/web-search-model.h -Copyright: 2020, KylinSoft Co., Ltd. -License: GPL-3+ - -Files: frontend/ukui-search-dbus-service.cpp - frontend/ukui-search-dbus-service.h - frontend/ukui-search-gui.cpp - frontend/ukui-search-gui.h -Copyright: 2020, KylinSoft Co., Ltd. -License: GPL-3+ - -Files: frontend/view/* -Copyright: 2020, KylinSoft Co., Ltd. -License: GPL-3+ - -Files: frontend/view/result-view-delegate.h - frontend/view/web-search-view.cpp -Copyright: 2020-2022, KylinSoft Co., Ltd. -License: GPL-3+ - -Files: libchinese-segmentation/* -Copyright: 2020-2022, KylinSoft Co., Ltd. -License: GPL-3+ - -Files: libchinese-segmentation/chinese-segmentation-private.h - libchinese-segmentation/common-struct.h -Copyright: 2020, KylinSoft Co., Ltd. -License: GPL-3+ - -Files: libchinese-segmentation/cppjieba/* -Copyright: 2020, KylinSoft Co., Ltd. -License: GPL-3+ - -Files: libchinese-segmentation/cppjieba/idf-trie/* -Copyright: 2020-2022, KylinSoft Co., Ltd. -License: GPL-3+ - Files: libchinese-segmentation/cppjieba/limonp/Md5.hpp Copyright: 1991, 1992, RSA Data Security, Inc. Created 1991 License: NTP -Files: libchinese-segmentation/cppjieba/segment-trie/* -Copyright: 2020-2022, KylinSoft Co., Ltd. -License: GPL-3+ - -Files: libchinese-segmentation/development-files/* -Copyright: 2020, KylinSoft Co., Ltd. -License: GPL-3+ - -Files: libchinese-segmentation/dict/* -Copyright: 2020, KylinSoft Co., Ltd. -License: GPL-3+ - -Files: libchinese-segmentation/storage-base/cedar/* -Copyright: 2009-2015, Naoki Yoshinaga -License: GPL-3+ - -Files: libchinese-segmentation/storage-base/darts-clone/* -Copyright: 2020, KylinSoft Co., Ltd. -License: GPL-3+ - -Files: libchinese-segmentation/test/* -Copyright: 2020, KylinSoft Co., Ltd. -License: GPL-3+ - -Files: libsearch/appsearch/app-match.cpp - libsearch/appsearch/app-match.h -Copyright: 2020-2022, KylinSoft Co., Ltd. -License: GPL-3+ - -Files: libsearch/file-utils.cpp - libsearch/file-utils.h - libsearch/global-settings.cpp - libsearch/global-settings.h - libsearch/gobject-template.cpp - libsearch/gobject-template.h - libsearch/libsearch.cpp - libsearch/libsearch.h - libsearch/libsearch_global.h -Copyright: 2020-2022, KylinSoft Co., Ltd. -License: GPL-3+ - -Files: libsearch/filesystemwatcher/* -Copyright: 2020-2022, KylinSoft Co., Ltd. -License: GPL-3+ - -Files: libsearch/index/* -Copyright: 2020-2022, KylinSoft Co., Ltd. -License: GPL-3+ - -Files: libsearch/index/compatible-define.h - libsearch/index/data-queue.cpp - libsearch/index/data-queue.h - libsearch/index/database.cpp - libsearch/index/database.h - libsearch/index/ocrobject.cpp - libsearch/index/ocrobject.h -Copyright: 2020, KylinSoft Co., Ltd. -License: GPL-3+ - -Files: libsearch/plugininterface/action-label.cpp - libsearch/plugininterface/action-label.h -Copyright: 2020-2022, KylinSoft Co., Ltd. -License: GPL-3+ - -Files: ukui-search-app-data-service/convert-winid-to-desktop.cpp - ukui-search-app-data-service/convert-winid-to-desktop.h -Copyright: 2019, Tianjin KYLIN Information Technology Co., Ltd. -License: GPL-3+ - -Files: ukui-search-service-dir-manager/dirwatcher/dir-watcher-adaptor.cpp - ukui-search-service-dir-manager/dirwatcher/dir-watcher-adaptor.h -Copyright: 2020, The Qt Company Ltd. -License: GPL-3+ - -Files: ukui-search-service-dir-manager/main.cpp -Copyright: 2019, Tianjin KYLIN Information Technology Co., Ltd. -License: GPL-2+ - -Files: ukui-search-service/* -Copyright: 2020-2022, KylinSoft Co., Ltd. -License: GPL-3+ - -Files: ukui-search-service/ukui-search-service.h -Copyright: 2020, KylinSoft Co., Ltd. -License: GPL-3+ +Files: src/singleapplication/* +Copyright: 2013, Digia Plc and/or its subsidiary(-ies) +License: BSD-3-clause Files: ukuisearch-systemdbus/* Copyright: 2019, Tianjin KYLIN Information Technology Co., Ltd. @@ -186,10 +28,10 @@ License: BSD-3-clause notice, this list of conditions and the following disclaimer. * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. + documentation and/or other materials provided with the distribution. * Neither the name of foo nor the names of its contributors may be used to endorse or promote products derived from - this software without specific prior written permission. + this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A @@ -202,34 +44,6 @@ License: BSD-3-clause NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -License: Expat - The MIT License - . - Permission is hereby granted, free of charge, to any person - obtaining a copy of this software and associated - documentation files (the "Software"), to deal in the Software - without restriction, including without limitation the rights to - use, copy, modify, merge, publish, distribute, sublicense, - and/or sell copies of the Software, and to permit persons to - whom the Software is furnished to do so, subject to the - following conditions: - . - The above copyright notice and this permission notice shall - be included in all copies or substantial portions of the - Software. - . - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT - WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, - INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR - PURPOSE AND NONINFRINGEMENT. IN NO EVENT - SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE - LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - CONNECTION WITH THE SOFTWARE OR THE USE OR - OTHER DEALINGS IN THE SOFTWARE. - License: GPL-2+ This software is Copyright (c) 2021 by foo. This is free software, licensed under: @@ -251,17 +65,3 @@ License: GPL-3+ your option) any later version. On Debian systems, the complete text of version 3 of the GNU General Public License can be found in '/usr/share/common-licenses/GPL-3'. - -License: NTP - Copyright (c) (CopyrightHoldersName) (From 4-digit-year)-(To 4-digit-year) - Permission to use, copy, modify, and distribute this software and - its documentation for any purpose with or without fee is hereby - granted, provided that the above copyright notice appears in all - copies and that both the copyright notice and this permission - notice appear in supporting documentation, and that the name - (TrademarkedName) not be used in advertising or publicity - pertaining to distribution of the software without specific, - written prior permission. (TrademarkedName) makes no - representations about the suitability this software for any - purpose. It is provided “as is” without express or implied - warranty. diff --git a/debian/libchinese-segmentation-common.install b/debian/libchinese-segmentation-common.install new file mode 100644 index 0000000..8c45bdc --- /dev/null +++ b/debian/libchinese-segmentation-common.install @@ -0,0 +1,2 @@ +/usr/share/chinese-segmentation/res/dict/*.txt +/usr/share/chinese-segmentation/res/dict/*.utf8 diff --git a/debian/libchinese-segmentation-dev.install b/debian/libchinese-segmentation-dev.install index 4cf98f4..dc0fb11 100644 --- a/debian/libchinese-segmentation-dev.install +++ b/debian/libchinese-segmentation-dev.install @@ -1,3 +1,4 @@ -usr/include/chinese-seg/* -usr/lib/*/pkgconfig/chinese-segmentation.pc +/usr/share/cmake/chinese-segmentation/*.cmake +usr/include/chinese-segmentation/* usr/lib/*/libchinese-segmentation.so +usr/lib/*/pkgconfig/chinese-segmentation.pc diff --git a/debian/libchinese-segmentation1.install b/debian/libchinese-segmentation1.install index 0ff1414..ace82bf 100644 --- a/debian/libchinese-segmentation1.install +++ b/debian/libchinese-segmentation1.install @@ -1,3 +1 @@ usr/lib/*/libchinese-segmentation.so.* -/usr/share/ukui-search/res/dict/*.utf8 -/usr/share/ukui-search/res/dict/*.txt diff --git a/debian/libukui-search-common.install b/debian/libukui-search-common.install new file mode 100644 index 0000000..b98a50e --- /dev/null +++ b/debian/libukui-search-common.install @@ -0,0 +1 @@ +usr/share/ukui-search/translations/libukui-search diff --git a/debian/libukui-search-dev.install b/debian/libukui-search-dev.install index c693652..26c5b0a 100644 --- a/debian/libukui-search-dev.install +++ b/debian/libukui-search-dev.install @@ -1,3 +1,4 @@ usr/include/ukui-search/* -usr/lib/*/pkgconfig/ukui-search.pc usr/lib/*/libukui-search.so +usr/lib/*/pkgconfig/ukui-search.pc +usr/share/cmake/ukui-search/*.cmake diff --git a/debian/libukui-search2.install b/debian/libukui-search2.install index c8dd09e..c6bfa96 100644 --- a/debian/libukui-search2.install +++ b/debian/libukui-search2.install @@ -1,11 +1 @@ usr/lib/*/libukui-search.so.* -usr/bin/ukui-search-service -usr/bin/ukui-search-app-data-service -usr/bin/ukui-search-service-dir-manager -etc/xdg/autostart/ukui-search-service-dir-manager.desktop -etc/xdg/autostart/ukui-search-app-data-service.desktop -etc/xdg/autostart/ukui-search-service.desktop -usr/share/dbus-1/services/com.ukui.search.appdb.service -usr/share/dbus-1/services/com.ukui.search.fileindex.service -usr/share/glib-2.0/schemas/org.ukui.search.data.gschema.xml -libsearch/.qm/*.qm usr/share/ukui-search/translations diff --git a/debian/rules b/debian/rules index 548260b..1e5d8a7 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,27 @@ #!/usr/bin/make -f -export DEB_BUILD_MAINT_OPTIONS = hardening=+all +# 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 %: - dh $@ + dh ${@} --buildsystem cmake + + +# dh_make generated override targets +# This is example for Cmake (See https://bugs.debian.org/641051 ) +#override_dh_auto_configure: +# dh_auto_configure -- # -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) + +override_dh_auto_configure: + dh_auto_configure -- \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo diff --git a/debian/source/format b/debian/source/format index 89ae9db..163aaf8 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (native) +3.0 (quilt) diff --git a/debian/ukui-search-service.install b/debian/ukui-search-service.install new file mode 100644 index 0000000..df33415 --- /dev/null +++ b/debian/ukui-search-service.install @@ -0,0 +1,9 @@ +etc/xdg/autostart/ukui-search-app-data-service.desktop +etc/xdg/autostart/ukui-search-service-dir-manager.desktop +etc/xdg/autostart/ukui-search-service.desktop +usr/bin/ukui-search-app-data-service +usr/bin/ukui-search-service +usr/bin/ukui-search-service-dir-manager +usr/share/dbus-1/services/com.ukui.search.appdb.service +usr/share/dbus-1/services/com.ukui.search.fileindex.service +usr/share/glib-2.0/schemas/org.ukui.search.data.gschema.xml diff --git a/debian/ukui-search-systemdbus.install b/debian/ukui-search-systemdbus.install index fe69413..717494c 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 -/usr/share/dbus-1/system.d/com.ukui.search.qt.systemdbus.conf +/etc/dbus-1/system.d/com.ukui.search.qt.systemdbus.conf /usr/bin/ukui-search-systemdbus +/usr/share/dbus-1/system-services/com.ukui.search.qt.systemdbus.service diff --git a/debian/ukui-search.install b/debian/ukui-search.install index 61ddc04..7ca92d2 100644 --- a/debian/ukui-search.install +++ b/debian/ukui-search.install @@ -1,12 +1,10 @@ -usr/bin/ukui-search etc/xdg/autostart/ukui-search.desktop -usr/share/applications/ukui-search-menu.desktop -frontend/.qm/*.qm usr/share/ukui-search/translations -usr/share/glib-2.0/schemas/org.ukui.log4qt.ukui-search.gschema.xml +usr/bin/ukui-search usr/lib/*/ukui-control-center/* -usr/share/ukui-search/search-ukcc-plugin/translations/* -search-ukcc-plugin/.qm/*.qm usr/share/ukui-search/search-ukcc-plugin/translations -usr/share/ukui-search/search-ukcc-plugin/image/* - +usr/share/applications/ukui-search-menu.desktop +usr/share/appwidget/* usr/share/dbus-1/services/org.ukui.appwidget.provider.search.service -/usr/share/appwidget/* +usr/share/glib-2.0/schemas/org.ukui.log4qt.ukui-search.gschema.xml +usr/share/ukui-search/search-ukcc-plugin/image/* +usr/share/ukui-search/search-ukcc-plugin/translations/* +usr/share/ukui-search/translations/ukui-search