From e0774f9a48142d965a12042224751dc53ef4bb53 Mon Sep 17 00:00:00 2001 From: xibowen Date: Fri, 26 Jan 2024 18:01:41 +0800 Subject: [PATCH] Update debian format --- debian/changelog | 7 ++- debian/control | 22 +++------- debian/copyright | 61 ++++++++++++--------------- debian/rules | 27 ++---------- debian/ukui-search-systemdbus.install | 2 +- 5 files changed, 39 insertions(+), 80 deletions(-) diff --git a/debian/changelog b/debian/changelog index f90beac..6adb351 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,5 @@ -ukui-search (4.0.3.2-1) sid; urgency=medium +ukui-search (4.0.6.1-1) unstable; urgency=medium - * Initial release. - - -- Mouse Zhang Sun, 23 Jul 2023 22:52:54 -0400 + * Initial release. (Closes: #1234567) + -- xibowen Sun, 23 Jul 2023 22:52:54 -0400 diff --git a/debian/control b/debian/control index 62ae2b3..2a3d386 100644 --- a/debian/control +++ b/debian/control @@ -2,6 +2,7 @@ Source: ukui-search Section: utils Priority: optional Maintainer: zhangpengfei +Uploaders: xibowen , Mouse Zhang Build-Depends: cmake, debhelper-compat (=13), libglib2.0-dev, @@ -28,9 +29,9 @@ Build-Depends: cmake, qtdeclarative5-dev, qtscript5-dev, qttools5-dev -Standards-Version: 4.5.0 +Standards-Version: 4.6.1.0 Rules-Requires-Root: no -Homepage: https://www.ukui.org/ +Homepage: https://gitee.com/openkylin/ukui-search Vcs-Git: https://gitee.com/openkylin/ukui-search.git Vcs-Browser: https://gitee.com/openkylin/ukui-search @@ -40,14 +41,12 @@ Depends: libukui-search2 (= ${binary:Version}), ukui-search-service (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} -Description: A user-wide desktop search +Description: User-wide desktop search of ukui 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 @@ -62,11 +61,8 @@ Description: Libraries for chinese-segmentation ukui-search's file index function. Package: libchinese-segmentation-common -Architecture: any +Architecture: all 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. @@ -92,14 +88,8 @@ Description: Libraries for ukui-search. ukui-search and it's extensions. Package: libukui-search-common -Architecture: any +Architecture: all 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, diff --git a/debian/copyright b/debian/copyright index 9dbc41e..22f9c96 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,51 +1,42 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: ukui-search +Upstream-Contact: zhangpengfei +Source: Files: * -Copyright: 2020, KylinSoft Co., Ltd. +Copyright: 2020-2023, KylinSoft Co., Ltd. License: GPL-3+ -Files: libchinese-segmentation/cppjieba/limonp/Md5.hpp +Files: 3rd-parties/* +Copyright: 2013, Digia Plc and/or its subsidiary(-ies). +License: UNKNOWN + Please fill license UNKNOWN from header of 3rd-parties/* + +Files: frontend/control/flow-layout/* +Copyright: 2019, Tianjin KYLIN Information Technology Co., Ltd. +License: GPL-2+ + +Files: libchinese-segmentation/cppjieba/limonp/* Copyright: 1991, 1992, RSA Data Security, Inc. Created 1991 License: NTP + Please fill license NTP from header of libchinese-segmentation/cppjieba/limonp/* -Files: src/singleapplication/* -Copyright: 2013, Digia Plc and/or its subsidiary(-ies) -License: BSD-3-clause +Files: libchinese-segmentation/storage-base/cedar/* +Copyright: 2009-2015, Naoki Yoshinaga +License: UNKNOWN + Please fill license UNKNOWN from header of libchinese-segmentation/storage-base/cedar/* + +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: ukuisearch-systemdbus/* Copyright: 2019, Tianjin KYLIN Information Technology Co., Ltd. License: GPL-2+ -License: BSD-3-clause - This software is Copyright (c) 2021 by foo. - This is free software, licensed under: - The (three-clause) BSD License - The BSD License - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - * Redistributions of source code must retain the above copyright - 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. - * 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 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 - PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - License: GPL-2+ - This software is Copyright (c) 2021 by foo. + This software is Copyright (c) 2024 by foo. This is free software, licensed under: The GNU General Public License, Version 2, June 1991 This program is free software; you can redistribute it and/or modify @@ -56,7 +47,7 @@ License: GPL-2+ Public License can be found in '/usr/share/common-licenses/GPL-2'. License: GPL-3+ - This software is Copyright (c) 2021 by foo. + This software is Copyright (c) 2024 by foo. This is free software, licensed under: The GNU General Public License, Version 3, June 2007 This program is free software; you can redistribute it and/or modify diff --git a/debian/rules b/debian/rules index 1e5d8a7..7330eb0 100755 --- a/debian/rules +++ b/debian/rules @@ -1,27 +1,6 @@ #!/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 QT_SELECT=5 +export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: - 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 + dh $@ diff --git a/debian/ukui-search-systemdbus.install b/debian/ukui-search-systemdbus.install index 717494c..bf5101b 100644 --- a/debian/ukui-search-systemdbus.install +++ b/debian/ukui-search-systemdbus.install @@ -1,3 +1,3 @@ -/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 +/usr/share/dbus-1/system.d/com.ukui.search.qt.systemdbus.conf