From 10779589808ebe0e31f650922ba5df520147e3ca Mon Sep 17 00:00:00 2001 From: iaom <18504285112@163.com> Date: Fri, 7 May 2021 20:48:15 +0800 Subject: [PATCH] Delete libchinese-segmentation-dev pkg. --- debian/control | 8 -------- debian/libchinese-segmentation-dev.install | 2 +- debian/libchinese-segmentation0.install | 2 +- debian/libukui-search-dev.install | 2 +- debian/libukui-search0.install | 2 +- .../libchinese-segmentation.pro | 6 ++---- libsearch/index/construct-document.cpp | 2 +- libsearch/index/index-generator.cpp | 2 +- libsearch/index/search-manager.h | 6 +++--- libsearch/libsearch.pro | 15 ++++----------- src/control/highlight-item-delegate.cpp | 2 +- src/control/home-page-item.h | 2 +- src/control/search-detail-view.h | 2 +- src/search-app-thread.h | 2 +- 14 files changed, 19 insertions(+), 36 deletions(-) diff --git a/debian/control b/debian/control index 8178960..3a03d6d 100644 --- a/debian/control +++ b/debian/control @@ -44,14 +44,6 @@ Description: Libraries for chinese-segmentation This package contains a few runtime libraries needed by libsearch. -Package: libchinese-segmentation-dev -Section: libdevel -Architecture: any -Depends: ${misc:Depends}, - ${shlibs:Depends}, - libchinese-segmentation0 (= ${binary:Version}) -Description: Libraries for chinese-segmentation(development files). - Package: libukui-search0 Section: libs Architecture: any diff --git a/debian/libchinese-segmentation-dev.install b/debian/libchinese-segmentation-dev.install index 037e91e..c16993e 100644 --- a/debian/libchinese-segmentation-dev.install +++ b/debian/libchinese-segmentation-dev.install @@ -1,2 +1,2 @@ usr/include/chinese-seg/* -usr/lib/*.so +usr/lib/*/libchinese-segmentation.so diff --git a/debian/libchinese-segmentation0.install b/debian/libchinese-segmentation0.install index 0299c40..ffb04a7 100644 --- a/debian/libchinese-segmentation0.install +++ b/debian/libchinese-segmentation0.install @@ -1,2 +1,2 @@ -usr/lib/*.so.* +usr/lib/*/libchinese-segmentation.so.* /usr/share/ukui-search/res/dict/*.utf8 diff --git a/debian/libukui-search-dev.install b/debian/libukui-search-dev.install index b814d89..e31886a 100644 --- a/debian/libukui-search-dev.install +++ b/debian/libukui-search-dev.install @@ -1,2 +1,2 @@ usr/include/ukui-search/* -usr/lib/*/*.so \ No newline at end of file +usr/lib/*/libukui-search.so diff --git a/debian/libukui-search0.install b/debian/libukui-search0.install index 3de3b10..c6bfa96 100644 --- a/debian/libukui-search0.install +++ b/debian/libukui-search0.install @@ -1 +1 @@ -usr/lib/*/*.so.* +usr/lib/*/libukui-search.so.* diff --git a/libchinese-segmentation/libchinese-segmentation.pro b/libchinese-segmentation/libchinese-segmentation.pro index 746b555..a082395 100644 --- a/libchinese-segmentation/libchinese-segmentation.pro +++ b/libchinese-segmentation/libchinese-segmentation.pro @@ -35,14 +35,12 @@ INSTALLS += \ # Default rules for deployment. unix { - target.path = /usr/lib + target.path = $$[QT_INSTALL_LIBS] } !isEmpty(target.path): INSTALLS += target header.path = /usr/include/chinese-seg/ - header.files += *.h - header_cppjieba.path = /usr/include/chinese-seg/cppjieba/ - header_cppjieba.files = cppjieba/* + header.files += *.h cppjieba/* INSTALLS += header header_cppjieba #DISTFILES += \ diff --git a/libsearch/index/construct-document.cpp b/libsearch/index/construct-document.cpp index 31556fd..a479ba2 100644 --- a/libsearch/index/construct-document.cpp +++ b/libsearch/index/construct-document.cpp @@ -19,7 +19,7 @@ */ #include "construct-document.h" #include "file-utils.h" -#include "chinese-seg/chinese-segmentation.h" +#include "chinese-segmentation.h" #include #include #include diff --git a/libsearch/index/index-generator.cpp b/libsearch/index/index-generator.cpp index bd5eafb..bbaeef4 100644 --- a/libsearch/index/index-generator.cpp +++ b/libsearch/index/index-generator.cpp @@ -28,7 +28,7 @@ #include "file-utils.h" #include "index-generator.h" #include "global-settings.h" -#include "chinese-seg/chinese-segmentation.h" +#include "chinese-segmentation.h" #include "construct-document.h" #include diff --git a/libsearch/index/search-manager.h b/libsearch/index/search-manager.h index 3fcdde4..c715306 100644 --- a/libsearch/index/search-manager.h +++ b/libsearch/index/search-manager.h @@ -37,9 +37,9 @@ #include #include -#include "../file-utils.h" -#include "../global-settings.h" -#include "chinese-seg/chinese-segmentation.h" +#include "file-utils.h" +#include "global-settings.h" +#include "chinese-segmentation.h" #define INDEX_PATH (QStandardPaths::writableLocation(QStandardPaths::HomeLocation)+"/.config/org.ukui/ukui-search/index_data").toStdString() diff --git a/libsearch/libsearch.pro b/libsearch/libsearch.pro index 03921e2..d5b509c 100644 --- a/libsearch/libsearch.pro +++ b/libsearch/libsearch.pro @@ -66,20 +66,13 @@ unix { INSTALLS += target header.path = /usr/include/ukui-search - header.files += *.h - header_index.path = /usr/include/ukui-search/index - header_index.files = index/*.h - header_appsearch.path = /usr/include/ukui-search/appsearch - header_appsearch.files = appsearch/*.h - header_settingsearch.path = /usr/include/ukui-search/settingsearch - header_settingsearch.files = settingsearch/*.h - INSTALLS += header header_index header_appsearch header_settingsearch + header.files += *.h index/*.h appsearch/*.h settingsearch/*.h + INSTALLS += header } - -#INCLUDEPATH += $$PWD/../libchinese-segmentation -#DEPENDPATH += $$PWD/../libchinese-segmentation +INCLUDEPATH += $$PWD/../libchinese-segmentation +DEPENDPATH += $$PWD/../libchinese-segmentation #DISTFILES += \ # ../translations/libsearch/libukui-search_zh_CN.ts diff --git a/src/control/highlight-item-delegate.cpp b/src/control/highlight-item-delegate.cpp index 9855208..a11d3c3 100644 --- a/src/control/highlight-item-delegate.cpp +++ b/src/control/highlight-item-delegate.cpp @@ -25,7 +25,7 @@ #include #include #include -#include "ukui-search/global-settings.h" +#include "global-settings.h" using namespace Zeeker; HighlightItemDelegate::HighlightItemDelegate(QObject *parent) : QStyledItemDelegate(parent) { diff --git a/src/control/home-page-item.h b/src/control/home-page-item.h index bb589c0..ba16a2a 100644 --- a/src/control/home-page-item.h +++ b/src/control/home-page-item.h @@ -25,7 +25,7 @@ #include #include #include -#include "ukui-search/file-utils.h" +#include "file-utils.h" #include "search-list-view.h" namespace Zeeker { diff --git a/src/control/search-detail-view.h b/src/control/search-detail-view.h index 44a8965..96551da 100644 --- a/src/control/search-detail-view.h +++ b/src/control/search-detail-view.h @@ -28,7 +28,7 @@ //#include #include #include "option-view.h" -#include "ukui-search/global-settings.h" +#include "global-settings.h" namespace Zeeker { class SearchDetailView : public QWidget { diff --git a/src/search-app-thread.h b/src/search-app-thread.h index cc0c430..46cf491 100644 --- a/src/search-app-thread.h +++ b/src/search-app-thread.h @@ -3,7 +3,7 @@ #include #include #include -#include "ukui-search/libsearch.h" +#include "libsearch.h" namespace Zeeker { class SearchAppThread : public QObject {