同步主线代码;更新changelog.

This commit is contained in:
iaom 2022-10-21 11:21:35 +08:00 committed by cckylin-cibot
parent f89e5ad708
commit 952d82fd2c
13 changed files with 471525 additions and 60 deletions

10
debian/changelog vendored
View File

@ -1,3 +1,12 @@
ukui-search (3.22.0.0-ok0~1021) yangtze; urgency=medium
* BUG: 无
* 任务号:无
* 其他改动:同步主线代码,增加平板桌面小插件功能
* 其他改动影响域:全局搜索自身,平板桌面小插件
-- zhangpengfei <zhangpengfei@kylinos.cn> Fri, 21 Oct 2022 11:13:06 +0800
ukui-search (3.14.0.6-ok2~0720) yangtze; urgency=medium
* BUG: 无
@ -24,3 +33,4 @@ ukui-search (3.14.0.6-ok2~0716) yangtze; urgency=medium
* close-cd #127732 #127792 the ukui-search do not quit while losing focus.
-- Xie Wei <xiewei@kylinos.cn> Sat, 18 Jun 2022 10:43:24 +0800

1
debian/compat vendored
View File

@ -1 +0,0 @@
9

104
debian/control vendored
View File

@ -3,76 +3,94 @@ Section: utils
Priority: optional
Maintainer: zhangpengfei <zhangpengfei@kylinos.cn>
Build-Depends: debhelper (>=9.0.0),
libglib2.0-dev,
libgsettings-qt-dev,
libkf5windowsystem-dev,
libopencv-dev,
libpoppler-qt5-dev,
libqt5x11extras5-dev,
libqt5xdg-dev,
libquazip5-dev(>=0.7.6-6build1),
libtesseract-dev,
libuchardet-dev,
libukcc-dev,
libukui-log4qt-dev,
libxapian-dev,
pkgconf,
qt5-qmake,
libgsettings-qt-dev,
qtbase5-dev,
qt5-qmake,
qtchooser,
qtscript5-dev,
qttools5-dev-tools,
libxapian-dev,
libquazip5-dev(>=0.7.6-6build1),
libglib2.0-dev,
libkf5windowsystem-dev,
libqt5x11extras5-dev,
libuchardet-dev,
libpoppler-qt5-dev,
libukui-log4qt-dev,
libqt5xdg-dev,
libukcc-dev,
libopencv-dev,
libtesseract-dev,
libkysdk-waylandhelper-dev,
libkysdk-qtwidgets-dev
libkysdk-qtwidgets-dev,
libukui-appwidget-manager-dev,
libukui-appwidget-provider-dev,
libukui-appwidget-qmlplugin0,
qml-module-org-ukui-stylehelper
Standards-Version: 4.5.0
Rules-Requires-Root: no
Homepage: https://www.ukui.org/
Vcs-Git: https://github.com/ukui/ukui-search.git
Vcs-Git: https://github.com/ukui/ukui-search.git
Vcs-Browser: https://github.com/ukui/ukui-search
Package: ukui-search
Architecture: any
Depends: libukui-search0 (= ${binary:Version}),
ukui-search-systemdbus (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Description: ukui-search is a user-wide desktop search
Depends: ${misc:Depends},
${shlibs:Depends},
libukui-search2 (= ${binary:Version}),
Description: A user-wide desktop search
feature of UKUI desktop environment.
Replaces: ukui-search (<= 3.14.0.6-ok2~0720)
Breaks: ukui-search (<= 3.14.0.6-ok2~0720)
Package: libchinese-segmentation0
Package: libchinese-segmentation1
Section: libs
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Provides: libchinese-segmentation
Depends: ${misc:Depends},
${shlibs:Depends}
Provides: libchinese-segmentation,
Replaces: libchinese-segmentation0
Breaks: libchinese-segmentation0
Description: Libraries for chinese-segmentation
.
This package contains a few runtime libraries needed by
This package contains a few runtime libraries needed by
libsearch.
Package: libukui-search0
Package: libchinese-segmentation-dev
Section: libdevel
Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends},
libchinese-segmentation1 (= ${binary:Version}),
Description: Libraries for chinese-segmentation(development files).
Package: libukui-search2
Section: libs
Architecture: any
Depends: libchinese-segmentation0 (= ${binary:Version}),
ukui-search-systemdbus (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Provides: libukui-search
Description: Libraries for ukui-search.
Conflicts: ukui-search (<< 3.1-2.1.0+0421)
Replaces: ukui-search (<< 3.1-2.1.0+0421)
Breaks: ukui-search (<< 3.1-2.1.0+0421)
Depends: ${misc:Depends},
${shlibs:Depends},
libchinese-segmentation1 (= ${binary:Version}),
ukui-search-systemdbus (= ${binary:Version})
Provides: libukui-search,
Description: Libraries for ukui-search.
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
Package: libukui-search-dev
Section: libdevel
Architecture: any
Depends: libchinese-segmentation0 (= ${binary:Version}),
libukui-search0 (= ${binary:Version}),
ukui-search-systemdbus (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
Description: Libraries for ukui-search(development files).
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).
Package: ukui-search-systemdbus
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: ukui-search-systemdbus is a systembus interface to modify max_user_watches nums
Depends: ${shlibs:Depends},
${misc:Depends},
Description: Systembus interface to modify max_user_watches nums
permanent.

4
debian/copyright vendored
View File

@ -28,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

View File

@ -1,2 +1,3 @@
usr/include/chinese-seg/*
usr/lib/*/pkgconfig/chinese-segmentation.pc
usr/lib/*/libchinese-segmentation.so

View File

@ -1,3 +1,3 @@
/usr/share/ukui-search/res/dict/*.txt
/usr/share/ukui-search/res/dict/*.utf8
usr/lib/*/libchinese-segmentation.so.*
/usr/share/ukui-search/res/dict/*.utf8
/usr/share/ukui-search/res/dict/*.txt

View File

@ -1,3 +1,3 @@
usr/include/ukui-search/*
usr/lib/*/pkgconfig/ukui-search.pc
usr/lib/*/libukui-search.so
usr/lib/*/pkgconfig/*.pc

View File

@ -1,5 +0,0 @@
etc/xdg/autostart/ukui-search-service.desktop
libsearch/.qm/*.qm usr/share/ukui-search/translations
usr/bin/ukui-search-service
usr/lib/*/libukui-search.so.*
usr/share/glib-2.0/schemas/org.ukui.search.data.gschema.xml

11
debian/libukui-search2.install vendored Normal file
View File

@ -0,0 +1,11 @@
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

471427
debian/patches/0009-changelog.patch vendored Normal file

File diff suppressed because one or more lines are too long

View File

@ -6,3 +6,4 @@
0006-copyright.patch
0007-UI.patch
0008-Update-changelog-ukui-search3.14.0.6-ok2-0720.patch
0009-changelog.patch

View File

@ -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/bin/ukui-search-systemdbus
/usr/share/dbus-1/system-services/com.ukui.search.qt.systemdbus.service

View File

@ -1,9 +1,12 @@
etc/xdg/autostart/ukui-search.desktop
frontend/.qm/*.qm usr/share/ukui-search/translations
search-ukcc-plugin/.qm/*.qm usr/share/ukui-search/search-ukcc-plugin/translations
usr/bin/ukui-search
usr/lib/*/ukui-control-center/*
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/share/ukui-search/search-ukcc-plugin/image/*
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/dbus-1/services/org.ukui.appwidget.provider.search.service
/usr/share/appwidget/*