Merge pull request #223 from iaom/0506-dev

Delete libchinese-segmentation-dev pkg.

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

debian/libchinese-segmentation-dev.install

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

debian/libchinese-segmentation0.install

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

debian/libukui-search-dev.install

@@ -1,2 +1,2 @@
 usr/include/ukui-search/*
-usr/lib/*/*.so
+usr/lib/*/libukui-search.so

debian/libukui-search0.install

@@ -1 +1 @@
-usr/lib/*/*.so.*
+usr/lib/*/libukui-search.so.*

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 += \

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 <QDebug>
 #include <QThread>
 #include <QUrl>

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 <QStandardPaths>
 

libsearch/index/search-manager.h

@@ -37,9 +37,9 @@
 #include <QThread>
 #include <QUrl>
 
-#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()

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

src/control/highlight-item-delegate.cpp

@@ -25,7 +25,7 @@
 #include <QDebug>
 #include <QTextDocument>
 #include <QAbstractTextDocumentLayout>
-#include "ukui-search/global-settings.h"
+#include "global-settings.h"
 
 using namespace Zeeker;
 HighlightItemDelegate::HighlightItemDelegate(QObject *parent) : QStyledItemDelegate(parent) {

src/control/home-page-item.h

@@ -25,7 +25,7 @@
 #include <QLabel>
 #include <QVBoxLayout>
 #include <QHBoxLayout>
-#include "ukui-search/file-utils.h"
+#include "file-utils.h"
 #include "search-list-view.h"
 
 namespace Zeeker {

src/control/search-detail-view.h

@@ -28,7 +28,7 @@
 //#include <QWebEngineUrlRequestInterceptor>
 #include <QDesktopServices>
 #include "option-view.h"
-#include "ukui-search/global-settings.h"
+#include "global-settings.h"
 
 namespace Zeeker {
 class SearchDetailView : public QWidget {

src/search-app-thread.h

@@ -3,7 +3,7 @@
 #include <QThread>
 #include <QObject>
 #include <QRunnable>
-#include "ukui-search/libsearch.h"
+#include "libsearch.h"
 
 namespace Zeeker {
 class SearchAppThread : public QObject {