rev 4105 - in kde-extras/strigi: tags tags/0.3.2-2/debian
tags/0.3.2-2/debian/patches trunk/debian trunk/debian/patches
Fathi Boudra
fboudra-guest at costa.debian.org
Wed Jul 12 12:25:24 UTC 2006
Author: fboudra-guest
Date: 2006-07-12 12:25:21 +0000 (Wed, 12 Jul 2006)
New Revision: 4105
Added:
kde-extras/strigi/tags/0.3.2-2/
kde-extras/strigi/tags/0.3.2-2/debian/libstrigihtmlgui-dev.install
kde-extras/strigi/tags/0.3.2-2/debian/libstrigihtmlgui0.install
kde-extras/strigi/tags/0.3.2-2/debian/patches/
kde-extras/strigi/tags/0.3.2-2/debian/patches/10_fix_soname.diff
kde-extras/strigi/tags/0.3.2-2/debian/patches/11_fix_plugins_path.diff
kde-extras/strigi/tags/0.3.2-2/debian/patches/12_shared_streamindexer.diff
kde-extras/strigi/tags/0.3.2-2/debian/strigi-daemon.install
kde-extras/strigi/tags/0.3.2-2/debian/strigi-daemon.lintian-overrides
kde-extras/strigi/trunk/debian/libstrigihtmlgui-dev.install
kde-extras/strigi/trunk/debian/libstrigihtmlgui0.install
kde-extras/strigi/trunk/debian/patches/
kde-extras/strigi/trunk/debian/patches/10_fix_soname.diff
kde-extras/strigi/trunk/debian/patches/11_fix_plugins_path.diff
kde-extras/strigi/trunk/debian/patches/12_shared_streamindexer.diff
kde-extras/strigi/trunk/debian/strigi-daemon.install
kde-extras/strigi/trunk/debian/strigi-daemon.lintian-overrides
Removed:
kde-extras/strigi/tags/0.3.2-2/debian/strigi-dev.install
kde-extras/strigi/tags/0.3.2-2/debian/strigi.install
kde-extras/strigi/tags/0.3.2-2/debian/strigi.lintian-overrides
kde-extras/strigi/tags/0.3.2-2/debian/strigi.postinst
kde-extras/strigi/trunk/debian/strigi-dev.install
kde-extras/strigi/trunk/debian/strigi.install
kde-extras/strigi/trunk/debian/strigi.lintian-overrides
kde-extras/strigi/trunk/debian/strigi.postinst
Modified:
kde-extras/strigi/tags/0.3.2-2/debian/changelog
kde-extras/strigi/tags/0.3.2-2/debian/control
kde-extras/strigi/tags/0.3.2-2/debian/rules
kde-extras/strigi/trunk/debian/changelog
kde-extras/strigi/trunk/debian/control
kde-extras/strigi/trunk/debian/rules
Log:
add patch to fix segfault, tag strigi 0.3.2-2
Copied: kde-extras/strigi/tags/0.3.2-2 (from rev 4104, kde-extras/strigi/trunk)
Modified: kde-extras/strigi/tags/0.3.2-2/debian/changelog
===================================================================
--- kde-extras/strigi/trunk/debian/changelog 2006-07-12 00:03:30 UTC (rev 4104)
+++ kde-extras/strigi/tags/0.3.2-2/debian/changelog 2006-07-12 12:25:21 UTC (rev 4105)
@@ -1,3 +1,10 @@
+strigi (0.3.2-2) unstable; urgency=low
+
+ * patches/12_shared_streamindexer.diff: streamindexer become shared library
+ * strigi-daemon.lintian-overrides: update for streamindexer shared library
+
+ -- Fathi Boudra <fboudra at free.fr> Wed, 12 Jul 2006 12:38:56 +0200
+
strigi (0.3.2-1) unstable; urgency=low
* Initial release (Closes: #377243)
Modified: kde-extras/strigi/tags/0.3.2-2/debian/control
===================================================================
--- kde-extras/strigi/trunk/debian/control 2006-07-12 00:03:30 UTC (rev 4104)
+++ kde-extras/strigi/tags/0.3.2-2/debian/control 2006-07-12 12:25:21 UTC (rev 4105)
@@ -5,14 +5,15 @@
libssl-dev, zlib1g-dev, libattr1-dev, libmagic-dev, libxml2-dev, libqt4-dev
Standards-Version: 3.7.2
-Package: strigi
+Package: strigi-daemon
Architecture: any
Section: utils
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: fast indexing and searching tool for your personal data (daemon)
Strigi is a program for fast indexing and searching your personal data. It can
gather and index informations from files in the filesystem even if they are
- hidden in emails or archives. It comes with a Qt4 GUI and an HTML GUI.
+ hidden in emails or archives. It comes with a Qt4 GUI, an HTML GUI and a KDE
+ GUI.
.
Main features:
* very fast crawling
@@ -30,66 +31,45 @@
* calculation of sha1 for every file crawled (allows fast finding of
duplicates)
.
- This package contains strigi daemon.
+ This package contains strigi daemon and libsearch
.
Homepage: http://www.vandenoever.info/software/strigi
Package: strigi-client
Architecture: any
Section: x11
-Depends: ${shlibs:Depends}, ${misc:Depends}, strigi (= ${Source-Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Qt4 client for Strigi Desktop Search
Strigi client is a Qt4 client (GUI) for the Strigi Desktop Search software.
.
- Strigi is a program for fast indexing and searching your personal data. It can
- gather and index informations from files in the filesystem even if they are
- hidden in emails or archives. It comes with a Qt4 GUI and an HTML GUI.
+ This package is part of Strigi Desktop Search, it contains the Qt4 client.
.
- Main features:
- * very fast crawling
- * very small memory footprint
- * no hammering of the system
- * pluggable backend, currently clucene and hyperestraier, sqlite3 and xapian
- are in the works
- * communication between daemon and search program over an abstract interface,
- this is currently a simple socket but implementation of dbus is a
- possibility. There's a small perl program in the code as an example of how
- to query. This is so easy that any KDE app could implement this.
- * simple interface for implementing plugins for extracting information. we'll
- try to reuse the kat plugins, although native plugins will have a large
- speed advantage
- * calculation of sha1 for every file crawled (allows fast finding of
- duplicates)
+ See the 'strigi-daemon' package for more information.
.
- This package contains the Qt4 client.
+ Homepage: http://www.vandenoever.info/software/strigi
+
+Package: libstrigihtmlgui0
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: library for writing html clients for Strigi Desktop Search
.
+ This package is part of Strigi Desktop Search, it contains a library for
+ writing html clients.
+ .
+ See the 'strigi-daemon' package for more information.
+ .
Homepage: http://www.vandenoever.info/software/strigi
-Package: strigi-dev
+Package: libstrigihtmlgui-dev
Architecture: any
-Section: devel
-Depends: ${shlibs:Depends}, ${misc:Depends}, strigi (= ${Source-Version})
+Section: libdevel
+Depends: ${shlibs:Depends}, ${misc:Depends}, libstrigihtmlgui0 (= ${Source-Version})
Description: development files for Strigi Desktop Search
- Strigi is a program for fast indexing and searching your personal data. It can
- gather and index informations from files in the filesystem even if they are
- hidden in emails or archives. It comes with a Qt4 GUI and an HTML GUI.
.
- Main features:
- * very fast crawling
- * very small memory footprint
- * no hammering of the system
- * pluggable backend, currently clucene and hyperestraier, sqlite3 and xapian
- are in the works
- * communication between daemon and search program over an abstract interface,
- this is currently a simple socket but implementation of dbus is a
- possibility. There's a small perl program in the code as an example of how
- to query. This is so easy that any KDE app could implement this.
- * simple interface for implementing plugins for extracting information. we'll
- try to reuse the kat plugins, although native plugins will have a large
- speed advantage
- * calculation of sha1 for every file crawled (allows fast finding of
- duplicates)
+ This package is part of Strigi Desktop Search, it contains the Strigi
+ development files.
.
- This package contains the strigi development files.
+ See the 'strigi-daemon' package for more information.
.
Homepage: http://www.vandenoever.info/software/strigi
Added: kde-extras/strigi/tags/0.3.2-2/debian/libstrigihtmlgui-dev.install
===================================================================
--- kde-extras/strigi/trunk/debian/libstrigihtmlgui-dev.install 2006-07-12 00:03:30 UTC (rev 4104)
+++ kde-extras/strigi/tags/0.3.2-2/debian/libstrigihtmlgui-dev.install 2006-07-12 12:25:21 UTC (rev 4105)
@@ -0,0 +1,2 @@
+usr/include/*.h
+usr/lib/libstrigihtmlgui.so
Added: kde-extras/strigi/tags/0.3.2-2/debian/libstrigihtmlgui0.install
===================================================================
--- kde-extras/strigi/trunk/debian/libstrigihtmlgui0.install 2006-07-12 00:03:30 UTC (rev 4104)
+++ kde-extras/strigi/tags/0.3.2-2/debian/libstrigihtmlgui0.install 2006-07-12 12:25:21 UTC (rev 4105)
@@ -0,0 +1 @@
+usr/lib/libstrigihtmlgui.so.*
Added: kde-extras/strigi/tags/0.3.2-2/debian/patches/10_fix_soname.diff
===================================================================
--- kde-extras/strigi/trunk/debian/patches/10_fix_soname.diff 2006-07-12 00:03:30 UTC (rev 4104)
+++ kde-extras/strigi/tags/0.3.2-2/debian/patches/10_fix_soname.diff 2006-07-12 12:25:21 UTC (rev 4105)
@@ -0,0 +1,69 @@
+diff -Nur strigi-0.3.2/CMakeLists.txt strigi-0.3.2.new/CMakeLists.txt
+--- strigi-0.3.2/CMakeLists.txt 2006-07-04 11:06:05.000000000 +0200
++++ strigi-0.3.2.new/CMakeLists.txt 2006-07-11 14:25:08.000000000 +0200
+@@ -24,12 +24,21 @@
+ find_package(Qt4)
+ check_include_files(sys/xattr.h HAVE_SYS_XATTR_H)
+
++# strigi version number
++SET(STRIGI_VERSION_MAJOR "0")
++SET(STRIGI_VERSION_MINOR "3")
++SET(STRIGI_VERSION_PATCH "2")
++
++# strigi version number composed by major.minor.patch
++SET(STRIGI_VERSION "${STRIGI_VERSION_MAJOR}.${STRIGI_VERSION_MINOR}.${STRIGI_VERSION_PATCH}")
++
+ # packaging target
+ SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Strigi Desktop Search")
+-set(CPACK_SOURCE_GENERATOR "TGZ")
++SET(CPACK_SOURCE_GENERATOR "TGZ")
+ SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README")
+-SET(CPACK_PACKAGE_VERSION_MAJOR "0")
+-SET(CPACK_PACKAGE_VERSION_MINOR "3")
+-SET(CPACK_PACKAGE_VERSION_PATCH "2")
++SET(CPACK_PACKAGE_VERSION_MAJOR ${STRIGI_VERSION_MAJOR})
++SET(CPACK_PACKAGE_VERSION_MINOR ${STRIGI_VERSION_MINOR})
++SET(CPACK_PACKAGE_VERSION_PATCH ${STRIGI_VERSION_PATCH})
+ #SET(CPACK_PACKAGE_EXECUTABLES "strigi" "strigi")
++
+ INCLUDE(CPack)
+diff -Nur strigi-0.3.2/src/daemon/CMakeLists.txt strigi-0.3.2.new/src/daemon/CMakeLists.txt
+--- strigi-0.3.2/src/daemon/CMakeLists.txt 2006-07-04 09:09:33.000000000 +0200
++++ strigi-0.3.2.new/src/daemon/CMakeLists.txt 2006-07-11 14:31:08.000000000 +0200
+@@ -14,6 +14,9 @@
+
+ add_library(searchclient SHARED socketclient.cpp clientinterface.cpp
+ asyncsocket.cpp asyncsocketclient.cpp)
++set_target_properties(searchclient PROPERTIES
++ VERSION ${STRIGI_VERSION}
++ SOVERSION ${STRIGI_VERSION_MAJOR})
+
+ install(TARGETS strigidaemon searchclient
+ RUNTIME DESTINATION bin
+diff -Nur strigi-0.3.2/src/htmlgui/CMakeLists.txt strigi-0.3.2.new/src/htmlgui/CMakeLists.txt
+--- strigi-0.3.2/src/htmlgui/CMakeLists.txt 2006-07-04 09:09:33.000000000 +0200
++++ strigi-0.3.2.new/src/htmlgui/CMakeLists.txt 2006-07-11 14:33:21.000000000 +0200
+@@ -1,6 +1,9 @@
+ include_directories( ../daemon ../streamindexer )
+
+ add_library(strigihtmlgui SHARED strigihtmlgui.cpp)
++set_target_properties(strigihtmlgui PROPERTIES
++ VERSION ${STRIGI_VERSION}
++ SOVERSION ${STRIGI_VERSION_MAJOR})
+ target_link_libraries(strigihtmlgui searchclient streamindexer)
+
+ install(TARGETS strigihtmlgui
+diff -Nur strigi-0.3.2/src/streams/CMakeLists.txt strigi-0.3.2.new/src/streams/CMakeLists.txt
+--- strigi-0.3.2/src/streams/CMakeLists.txt 2006-07-04 11:00:47.000000000 +0200
++++ strigi-0.3.2.new/src/streams/CMakeLists.txt 2006-07-11 14:33:11.000000000 +0200
+@@ -7,7 +7,9 @@
+ subinputstream.cpp mailinputstream.cpp stringterminatedsubstream.cpp
+ tarinputstream.cpp zipinputstream.cpp base64inputstream.cpp
+ dostime.cpp substreamproviderprovider.cpp)
+-
++set_target_properties(streams PROPERTIES
++ VERSION ${STRIGI_VERSION}
++ SOVERSION ${STRIGI_VERSION_MAJOR})
+ target_link_libraries(streams ${ZLIB_LIBRARIES} ${BZIP2_LIBRARY} ${SHA_LIBRARY})
+
+ install(TARGETS streams
Added: kde-extras/strigi/tags/0.3.2-2/debian/patches/11_fix_plugins_path.diff
===================================================================
--- kde-extras/strigi/trunk/debian/patches/11_fix_plugins_path.diff 2006-07-12 00:03:30 UTC (rev 4104)
+++ kde-extras/strigi/tags/0.3.2-2/debian/patches/11_fix_plugins_path.diff 2006-07-12 12:25:21 UTC (rev 4105)
@@ -0,0 +1,32 @@
+diff -Nur strigi-0.3.2/src/streamindexer/streamindexer.cpp strigi-0.3.2.new/src/streamindexer/streamindexer.cpp
+--- strigi-0.3.2/src/streamindexer/streamindexer.cpp 2006-07-03 09:32:08.000000000 +0200
++++ strigi-0.3.2.new/src/streamindexer/streamindexer.cpp 2006-07-11 16:58:02.000000000 +0200
+@@ -82,6 +82,7 @@
+ PluginThroughAnalyzer::loadPlugins("/usr/local/lib");
+ PluginThroughAnalyzer::loadPlugins("/usr/lib");
+ PluginThroughAnalyzer::loadPlugins("/lib");
++ PluginThroughAnalyzer::loadPlugins("/usr/lib/strigi");
+ // two dirs that make development easier, harmless for releases
+ PluginThroughAnalyzer::loadPlugins("/home/oever/testinstall/lib");
+ PluginThroughAnalyzer::loadPlugins("/home/jos/testinstall/lib");
+diff -Nur strigi-0.3.2/src/streamindexer/throughplugins/CMakeLists.txt strigi-0.3.2.new/src/streamindexer/throughplugins/CMakeLists.txt
+--- strigi-0.3.2/src/streamindexer/throughplugins/CMakeLists.txt 2006-07-03 15:26:06.000000000 +0200
++++ strigi-0.3.2.new/src/streamindexer/throughplugins/CMakeLists.txt 2006-07-11 16:55:58.000000000 +0200
+@@ -3,8 +3,7 @@
+ if (HAVE_SYS_XATTR_H)
+ add_library(xattr MODULE xattrthroughanalyzer.cpp)
+ set_target_properties(xattr PROPERTIES PREFIX strigita_)
+-# target_link_libraries(xattr streams)
+- install(TARGETS xattr LIBRARY DESTINATION lib)
++ install(TARGETS xattr LIBRARY DESTINATION lib/strigi)
+ endif (HAVE_SYS_XATTR_H)
+
+ if (FOUND_MAGIC)
+@@ -12,6 +11,6 @@
+ add_library(magic MODULE mimetypethroughanalyzer.cpp)
+ set_target_properties(magic PROPERTIES PREFIX strigita_)
+ target_link_libraries(magic ${MAGIC_LIBRARIES})
+- install(TARGETS magic LIBRARY DESTINATION lib)
++ install(TARGETS magic LIBRARY DESTINATION lib/strigi)
+ endif (FOUND_MAGIC)
+
Added: kde-extras/strigi/tags/0.3.2-2/debian/patches/12_shared_streamindexer.diff
===================================================================
--- kde-extras/strigi/trunk/debian/patches/12_shared_streamindexer.diff 2006-07-12 00:03:30 UTC (rev 4104)
+++ kde-extras/strigi/tags/0.3.2-2/debian/patches/12_shared_streamindexer.diff 2006-07-12 12:25:21 UTC (rev 4105)
@@ -0,0 +1,37 @@
+diff -Nur strigi-0.3.2/src/streamindexer/CMakeLists.txt strigi-0.3.2.new/src/streamindexer/CMakeLists.txt
+--- strigi-0.3.2/src/streamindexer/CMakeLists.txt 2006-07-03 15:24:18.000000000 +0200
++++ strigi-0.3.2.new/src/streamindexer/CMakeLists.txt 2006-07-12 11:43:40.000000000 +0200
+@@ -3,20 +3,26 @@
+ include_directories( ../streams )
+
+ set(streamindexer_SRCS bz2endanalyzer.cpp digestthroughanalyzer.cpp
+- textendanalyzer.cpp streamendanalyzer.cpp zipendanalyzer.cpp
+- tarendanalyzer.cpp streamindexer.cpp pngendanalyzer.cpp query.cpp
+- mailendanalyzer.cpp gzipendanalyzer.cpp filelister.cpp
+- pluginthroughanalyzer.cpp indexwriter.cpp)
++ textendanalyzer.cpp streamendanalyzer.cpp zipendanalyzer.cpp
++ tarendanalyzer.cpp streamindexer.cpp pngendanalyzer.cpp query.cpp
++ mailendanalyzer.cpp gzipendanalyzer.cpp filelister.cpp
++ pluginthroughanalyzer.cpp indexwriter.cpp)
+
+ if (FOUND_LIBXML2)
+ set(streamindexer_SRCS ${streamindexer_SRCS} saxendanalyzer.cpp)
+ set(streamindex_LIBS $(streamindex_LIBS) ${LIBXML2_LIBRARY})
+ include_directories(${LIBXML2_INCLUDE_DIR})
+ endif (FOUND_LIBXML2)
+-add_library(streamindexer ${streamindexer_SRCS})
++
++add_library(streamindexer SHARED ${streamindexer_SRCS})
++
++set_target_properties(streamindexer PROPERTIES
++ VERSION ${STRIGI_VERSION}
++ SOVERSION ${STRIGI_VERSION_MAJOR})
+
+ target_link_libraries(streamindexer streams ${streamindex_LIBS})
+
++install(TARGETS streamindexer LIBRARY DESTINATION lib)
++
+ install(FILES indexeddocument.h indexwriter.h pluginthroughanalyzer.h
+- streamthroughanalyzer.h
+- DESTINATION include)
++ streamthroughanalyzer.h DESTINATION include)
Modified: kde-extras/strigi/tags/0.3.2-2/debian/rules
===================================================================
--- kde-extras/strigi/trunk/debian/rules 2006-07-12 00:03:30 UTC (rev 4104)
+++ kde-extras/strigi/tags/0.3.2-2/debian/rules 2006-07-12 12:25:21 UTC (rev 4105)
@@ -2,10 +2,11 @@
include debian/cmake.mk
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
-install/strigi::
- install -D -p -m0644 debian/strigi.lintian-overrides \
- debian/strigi/usr/share/lintian/overrides/strigi
+install/strigi-daemon::
+ install -D -p -m0644 debian/strigi-daemon.lintian-overrides \
+ debian/strigi-daemon/usr/share/lintian/overrides/strigi-daemon
Added: kde-extras/strigi/tags/0.3.2-2/debian/strigi-daemon.install
===================================================================
--- kde-extras/strigi/trunk/debian/strigi-daemon.install 2006-07-12 00:03:30 UTC (rev 4104)
+++ kde-extras/strigi/tags/0.3.2-2/debian/strigi-daemon.install 2006-07-12 12:25:21 UTC (rev 4105)
@@ -0,0 +1,5 @@
+usr/bin/strigidaemon
+usr/lib/libsearchclient.*
+usr/lib/libstreamindexer.*
+usr/lib/libstreams.*
+usr/lib/strigi/strigita_*
Added: kde-extras/strigi/tags/0.3.2-2/debian/strigi-daemon.lintian-overrides
===================================================================
--- kde-extras/strigi/trunk/debian/strigi-daemon.lintian-overrides 2006-07-12 00:03:30 UTC (rev 4104)
+++ kde-extras/strigi/tags/0.3.2-2/debian/strigi-daemon.lintian-overrides 2006-07-12 12:25:21 UTC (rev 4105)
@@ -0,0 +1,4 @@
+strigi-daemon: non-dev-pkg-with-shlib-symlink usr/lib/libsearchclient.so.0.3.2 usr/lib/libsearchclient.so
+strigi-daemon: non-dev-pkg-with-shlib-symlink usr/lib/libstreamindexer.so.0.3.2 usr/lib/libstreamindexer.so
+strigi-daemon: non-dev-pkg-with-shlib-symlink usr/lib/libstreams.so.0.3.2 usr/lib/libstreams.so
+strigi-daemon: package-name-doesnt-match-sonames libsearchclient0 libstreamindexer0 libstreams0
Deleted: kde-extras/strigi/tags/0.3.2-2/debian/strigi-dev.install
Deleted: kde-extras/strigi/tags/0.3.2-2/debian/strigi.install
Deleted: kde-extras/strigi/tags/0.3.2-2/debian/strigi.lintian-overrides
Deleted: kde-extras/strigi/tags/0.3.2-2/debian/strigi.postinst
Modified: kde-extras/strigi/trunk/debian/changelog
===================================================================
--- kde-extras/strigi/trunk/debian/changelog 2006-07-12 00:03:30 UTC (rev 4104)
+++ kde-extras/strigi/trunk/debian/changelog 2006-07-12 12:25:21 UTC (rev 4105)
@@ -1,3 +1,10 @@
+strigi (0.3.2-2) unstable; urgency=low
+
+ * patches/12_shared_streamindexer.diff: streamindexer become shared library
+ * strigi-daemon.lintian-overrides: update for streamindexer shared library
+
+ -- Fathi Boudra <fboudra at free.fr> Wed, 12 Jul 2006 12:38:56 +0200
+
strigi (0.3.2-1) unstable; urgency=low
* Initial release (Closes: #377243)
Modified: kde-extras/strigi/trunk/debian/control
===================================================================
--- kde-extras/strigi/trunk/debian/control 2006-07-12 00:03:30 UTC (rev 4104)
+++ kde-extras/strigi/trunk/debian/control 2006-07-12 12:25:21 UTC (rev 4105)
@@ -5,14 +5,15 @@
libssl-dev, zlib1g-dev, libattr1-dev, libmagic-dev, libxml2-dev, libqt4-dev
Standards-Version: 3.7.2
-Package: strigi
+Package: strigi-daemon
Architecture: any
Section: utils
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: fast indexing and searching tool for your personal data (daemon)
Strigi is a program for fast indexing and searching your personal data. It can
gather and index informations from files in the filesystem even if they are
- hidden in emails or archives. It comes with a Qt4 GUI and an HTML GUI.
+ hidden in emails or archives. It comes with a Qt4 GUI, an HTML GUI and a KDE
+ GUI.
.
Main features:
* very fast crawling
@@ -30,66 +31,45 @@
* calculation of sha1 for every file crawled (allows fast finding of
duplicates)
.
- This package contains strigi daemon.
+ This package contains strigi daemon and libsearch
.
Homepage: http://www.vandenoever.info/software/strigi
Package: strigi-client
Architecture: any
Section: x11
-Depends: ${shlibs:Depends}, ${misc:Depends}, strigi (= ${Source-Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Qt4 client for Strigi Desktop Search
Strigi client is a Qt4 client (GUI) for the Strigi Desktop Search software.
.
- Strigi is a program for fast indexing and searching your personal data. It can
- gather and index informations from files in the filesystem even if they are
- hidden in emails or archives. It comes with a Qt4 GUI and an HTML GUI.
+ This package is part of Strigi Desktop Search, it contains the Qt4 client.
.
- Main features:
- * very fast crawling
- * very small memory footprint
- * no hammering of the system
- * pluggable backend, currently clucene and hyperestraier, sqlite3 and xapian
- are in the works
- * communication between daemon and search program over an abstract interface,
- this is currently a simple socket but implementation of dbus is a
- possibility. There's a small perl program in the code as an example of how
- to query. This is so easy that any KDE app could implement this.
- * simple interface for implementing plugins for extracting information. we'll
- try to reuse the kat plugins, although native plugins will have a large
- speed advantage
- * calculation of sha1 for every file crawled (allows fast finding of
- duplicates)
+ See the 'strigi-daemon' package for more information.
.
- This package contains the Qt4 client.
+ Homepage: http://www.vandenoever.info/software/strigi
+
+Package: libstrigihtmlgui0
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: library for writing html clients for Strigi Desktop Search
.
+ This package is part of Strigi Desktop Search, it contains a library for
+ writing html clients.
+ .
+ See the 'strigi-daemon' package for more information.
+ .
Homepage: http://www.vandenoever.info/software/strigi
-Package: strigi-dev
+Package: libstrigihtmlgui-dev
Architecture: any
-Section: devel
-Depends: ${shlibs:Depends}, ${misc:Depends}, strigi (= ${Source-Version})
+Section: libdevel
+Depends: ${shlibs:Depends}, ${misc:Depends}, libstrigihtmlgui0 (= ${Source-Version})
Description: development files for Strigi Desktop Search
- Strigi is a program for fast indexing and searching your personal data. It can
- gather and index informations from files in the filesystem even if they are
- hidden in emails or archives. It comes with a Qt4 GUI and an HTML GUI.
.
- Main features:
- * very fast crawling
- * very small memory footprint
- * no hammering of the system
- * pluggable backend, currently clucene and hyperestraier, sqlite3 and xapian
- are in the works
- * communication between daemon and search program over an abstract interface,
- this is currently a simple socket but implementation of dbus is a
- possibility. There's a small perl program in the code as an example of how
- to query. This is so easy that any KDE app could implement this.
- * simple interface for implementing plugins for extracting information. we'll
- try to reuse the kat plugins, although native plugins will have a large
- speed advantage
- * calculation of sha1 for every file crawled (allows fast finding of
- duplicates)
+ This package is part of Strigi Desktop Search, it contains the Strigi
+ development files.
.
- This package contains the strigi development files.
+ See the 'strigi-daemon' package for more information.
.
Homepage: http://www.vandenoever.info/software/strigi
Added: kde-extras/strigi/trunk/debian/libstrigihtmlgui-dev.install
===================================================================
--- kde-extras/strigi/trunk/debian/libstrigihtmlgui-dev.install 2006-07-12 00:03:30 UTC (rev 4104)
+++ kde-extras/strigi/trunk/debian/libstrigihtmlgui-dev.install 2006-07-12 12:25:21 UTC (rev 4105)
@@ -0,0 +1,2 @@
+usr/include/*.h
+usr/lib/libstrigihtmlgui.so
Added: kde-extras/strigi/trunk/debian/libstrigihtmlgui0.install
===================================================================
--- kde-extras/strigi/trunk/debian/libstrigihtmlgui0.install 2006-07-12 00:03:30 UTC (rev 4104)
+++ kde-extras/strigi/trunk/debian/libstrigihtmlgui0.install 2006-07-12 12:25:21 UTC (rev 4105)
@@ -0,0 +1 @@
+usr/lib/libstrigihtmlgui.so.*
Added: kde-extras/strigi/trunk/debian/patches/10_fix_soname.diff
===================================================================
--- kde-extras/strigi/trunk/debian/patches/10_fix_soname.diff 2006-07-12 00:03:30 UTC (rev 4104)
+++ kde-extras/strigi/trunk/debian/patches/10_fix_soname.diff 2006-07-12 12:25:21 UTC (rev 4105)
@@ -0,0 +1,69 @@
+diff -Nur strigi-0.3.2/CMakeLists.txt strigi-0.3.2.new/CMakeLists.txt
+--- strigi-0.3.2/CMakeLists.txt 2006-07-04 11:06:05.000000000 +0200
++++ strigi-0.3.2.new/CMakeLists.txt 2006-07-11 14:25:08.000000000 +0200
+@@ -24,12 +24,21 @@
+ find_package(Qt4)
+ check_include_files(sys/xattr.h HAVE_SYS_XATTR_H)
+
++# strigi version number
++SET(STRIGI_VERSION_MAJOR "0")
++SET(STRIGI_VERSION_MINOR "3")
++SET(STRIGI_VERSION_PATCH "2")
++
++# strigi version number composed by major.minor.patch
++SET(STRIGI_VERSION "${STRIGI_VERSION_MAJOR}.${STRIGI_VERSION_MINOR}.${STRIGI_VERSION_PATCH}")
++
+ # packaging target
+ SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Strigi Desktop Search")
+-set(CPACK_SOURCE_GENERATOR "TGZ")
++SET(CPACK_SOURCE_GENERATOR "TGZ")
+ SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README")
+-SET(CPACK_PACKAGE_VERSION_MAJOR "0")
+-SET(CPACK_PACKAGE_VERSION_MINOR "3")
+-SET(CPACK_PACKAGE_VERSION_PATCH "2")
++SET(CPACK_PACKAGE_VERSION_MAJOR ${STRIGI_VERSION_MAJOR})
++SET(CPACK_PACKAGE_VERSION_MINOR ${STRIGI_VERSION_MINOR})
++SET(CPACK_PACKAGE_VERSION_PATCH ${STRIGI_VERSION_PATCH})
+ #SET(CPACK_PACKAGE_EXECUTABLES "strigi" "strigi")
++
+ INCLUDE(CPack)
+diff -Nur strigi-0.3.2/src/daemon/CMakeLists.txt strigi-0.3.2.new/src/daemon/CMakeLists.txt
+--- strigi-0.3.2/src/daemon/CMakeLists.txt 2006-07-04 09:09:33.000000000 +0200
++++ strigi-0.3.2.new/src/daemon/CMakeLists.txt 2006-07-11 14:31:08.000000000 +0200
+@@ -14,6 +14,9 @@
+
+ add_library(searchclient SHARED socketclient.cpp clientinterface.cpp
+ asyncsocket.cpp asyncsocketclient.cpp)
++set_target_properties(searchclient PROPERTIES
++ VERSION ${STRIGI_VERSION}
++ SOVERSION ${STRIGI_VERSION_MAJOR})
+
+ install(TARGETS strigidaemon searchclient
+ RUNTIME DESTINATION bin
+diff -Nur strigi-0.3.2/src/htmlgui/CMakeLists.txt strigi-0.3.2.new/src/htmlgui/CMakeLists.txt
+--- strigi-0.3.2/src/htmlgui/CMakeLists.txt 2006-07-04 09:09:33.000000000 +0200
++++ strigi-0.3.2.new/src/htmlgui/CMakeLists.txt 2006-07-11 14:33:21.000000000 +0200
+@@ -1,6 +1,9 @@
+ include_directories( ../daemon ../streamindexer )
+
+ add_library(strigihtmlgui SHARED strigihtmlgui.cpp)
++set_target_properties(strigihtmlgui PROPERTIES
++ VERSION ${STRIGI_VERSION}
++ SOVERSION ${STRIGI_VERSION_MAJOR})
+ target_link_libraries(strigihtmlgui searchclient streamindexer)
+
+ install(TARGETS strigihtmlgui
+diff -Nur strigi-0.3.2/src/streams/CMakeLists.txt strigi-0.3.2.new/src/streams/CMakeLists.txt
+--- strigi-0.3.2/src/streams/CMakeLists.txt 2006-07-04 11:00:47.000000000 +0200
++++ strigi-0.3.2.new/src/streams/CMakeLists.txt 2006-07-11 14:33:11.000000000 +0200
+@@ -7,7 +7,9 @@
+ subinputstream.cpp mailinputstream.cpp stringterminatedsubstream.cpp
+ tarinputstream.cpp zipinputstream.cpp base64inputstream.cpp
+ dostime.cpp substreamproviderprovider.cpp)
+-
++set_target_properties(streams PROPERTIES
++ VERSION ${STRIGI_VERSION}
++ SOVERSION ${STRIGI_VERSION_MAJOR})
+ target_link_libraries(streams ${ZLIB_LIBRARIES} ${BZIP2_LIBRARY} ${SHA_LIBRARY})
+
+ install(TARGETS streams
Added: kde-extras/strigi/trunk/debian/patches/11_fix_plugins_path.diff
===================================================================
--- kde-extras/strigi/trunk/debian/patches/11_fix_plugins_path.diff 2006-07-12 00:03:30 UTC (rev 4104)
+++ kde-extras/strigi/trunk/debian/patches/11_fix_plugins_path.diff 2006-07-12 12:25:21 UTC (rev 4105)
@@ -0,0 +1,32 @@
+diff -Nur strigi-0.3.2/src/streamindexer/streamindexer.cpp strigi-0.3.2.new/src/streamindexer/streamindexer.cpp
+--- strigi-0.3.2/src/streamindexer/streamindexer.cpp 2006-07-03 09:32:08.000000000 +0200
++++ strigi-0.3.2.new/src/streamindexer/streamindexer.cpp 2006-07-11 16:58:02.000000000 +0200
+@@ -82,6 +82,7 @@
+ PluginThroughAnalyzer::loadPlugins("/usr/local/lib");
+ PluginThroughAnalyzer::loadPlugins("/usr/lib");
+ PluginThroughAnalyzer::loadPlugins("/lib");
++ PluginThroughAnalyzer::loadPlugins("/usr/lib/strigi");
+ // two dirs that make development easier, harmless for releases
+ PluginThroughAnalyzer::loadPlugins("/home/oever/testinstall/lib");
+ PluginThroughAnalyzer::loadPlugins("/home/jos/testinstall/lib");
+diff -Nur strigi-0.3.2/src/streamindexer/throughplugins/CMakeLists.txt strigi-0.3.2.new/src/streamindexer/throughplugins/CMakeLists.txt
+--- strigi-0.3.2/src/streamindexer/throughplugins/CMakeLists.txt 2006-07-03 15:26:06.000000000 +0200
++++ strigi-0.3.2.new/src/streamindexer/throughplugins/CMakeLists.txt 2006-07-11 16:55:58.000000000 +0200
+@@ -3,8 +3,7 @@
+ if (HAVE_SYS_XATTR_H)
+ add_library(xattr MODULE xattrthroughanalyzer.cpp)
+ set_target_properties(xattr PROPERTIES PREFIX strigita_)
+-# target_link_libraries(xattr streams)
+- install(TARGETS xattr LIBRARY DESTINATION lib)
++ install(TARGETS xattr LIBRARY DESTINATION lib/strigi)
+ endif (HAVE_SYS_XATTR_H)
+
+ if (FOUND_MAGIC)
+@@ -12,6 +11,6 @@
+ add_library(magic MODULE mimetypethroughanalyzer.cpp)
+ set_target_properties(magic PROPERTIES PREFIX strigita_)
+ target_link_libraries(magic ${MAGIC_LIBRARIES})
+- install(TARGETS magic LIBRARY DESTINATION lib)
++ install(TARGETS magic LIBRARY DESTINATION lib/strigi)
+ endif (FOUND_MAGIC)
+
Added: kde-extras/strigi/trunk/debian/patches/12_shared_streamindexer.diff
===================================================================
--- kde-extras/strigi/trunk/debian/patches/12_shared_streamindexer.diff 2006-07-12 00:03:30 UTC (rev 4104)
+++ kde-extras/strigi/trunk/debian/patches/12_shared_streamindexer.diff 2006-07-12 12:25:21 UTC (rev 4105)
@@ -0,0 +1,37 @@
+diff -Nur strigi-0.3.2/src/streamindexer/CMakeLists.txt strigi-0.3.2.new/src/streamindexer/CMakeLists.txt
+--- strigi-0.3.2/src/streamindexer/CMakeLists.txt 2006-07-03 15:24:18.000000000 +0200
++++ strigi-0.3.2.new/src/streamindexer/CMakeLists.txt 2006-07-12 11:43:40.000000000 +0200
+@@ -3,20 +3,26 @@
+ include_directories( ../streams )
+
+ set(streamindexer_SRCS bz2endanalyzer.cpp digestthroughanalyzer.cpp
+- textendanalyzer.cpp streamendanalyzer.cpp zipendanalyzer.cpp
+- tarendanalyzer.cpp streamindexer.cpp pngendanalyzer.cpp query.cpp
+- mailendanalyzer.cpp gzipendanalyzer.cpp filelister.cpp
+- pluginthroughanalyzer.cpp indexwriter.cpp)
++ textendanalyzer.cpp streamendanalyzer.cpp zipendanalyzer.cpp
++ tarendanalyzer.cpp streamindexer.cpp pngendanalyzer.cpp query.cpp
++ mailendanalyzer.cpp gzipendanalyzer.cpp filelister.cpp
++ pluginthroughanalyzer.cpp indexwriter.cpp)
+
+ if (FOUND_LIBXML2)
+ set(streamindexer_SRCS ${streamindexer_SRCS} saxendanalyzer.cpp)
+ set(streamindex_LIBS $(streamindex_LIBS) ${LIBXML2_LIBRARY})
+ include_directories(${LIBXML2_INCLUDE_DIR})
+ endif (FOUND_LIBXML2)
+-add_library(streamindexer ${streamindexer_SRCS})
++
++add_library(streamindexer SHARED ${streamindexer_SRCS})
++
++set_target_properties(streamindexer PROPERTIES
++ VERSION ${STRIGI_VERSION}
++ SOVERSION ${STRIGI_VERSION_MAJOR})
+
+ target_link_libraries(streamindexer streams ${streamindex_LIBS})
+
++install(TARGETS streamindexer LIBRARY DESTINATION lib)
++
+ install(FILES indexeddocument.h indexwriter.h pluginthroughanalyzer.h
+- streamthroughanalyzer.h
+- DESTINATION include)
++ streamthroughanalyzer.h DESTINATION include)
Modified: kde-extras/strigi/trunk/debian/rules
===================================================================
--- kde-extras/strigi/trunk/debian/rules 2006-07-12 00:03:30 UTC (rev 4104)
+++ kde-extras/strigi/trunk/debian/rules 2006-07-12 12:25:21 UTC (rev 4105)
@@ -2,10 +2,11 @@
include debian/cmake.mk
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
-install/strigi::
- install -D -p -m0644 debian/strigi.lintian-overrides \
- debian/strigi/usr/share/lintian/overrides/strigi
+install/strigi-daemon::
+ install -D -p -m0644 debian/strigi-daemon.lintian-overrides \
+ debian/strigi-daemon/usr/share/lintian/overrides/strigi-daemon
Added: kde-extras/strigi/trunk/debian/strigi-daemon.install
===================================================================
--- kde-extras/strigi/trunk/debian/strigi-daemon.install 2006-07-12 00:03:30 UTC (rev 4104)
+++ kde-extras/strigi/trunk/debian/strigi-daemon.install 2006-07-12 12:25:21 UTC (rev 4105)
@@ -0,0 +1,5 @@
+usr/bin/strigidaemon
+usr/lib/libsearchclient.*
+usr/lib/libstreamindexer.*
+usr/lib/libstreams.*
+usr/lib/strigi/strigita_*
Added: kde-extras/strigi/trunk/debian/strigi-daemon.lintian-overrides
===================================================================
--- kde-extras/strigi/trunk/debian/strigi-daemon.lintian-overrides 2006-07-12 00:03:30 UTC (rev 4104)
+++ kde-extras/strigi/trunk/debian/strigi-daemon.lintian-overrides 2006-07-12 12:25:21 UTC (rev 4105)
@@ -0,0 +1,4 @@
+strigi-daemon: non-dev-pkg-with-shlib-symlink usr/lib/libsearchclient.so.0.3.2 usr/lib/libsearchclient.so
+strigi-daemon: non-dev-pkg-with-shlib-symlink usr/lib/libstreamindexer.so.0.3.2 usr/lib/libstreamindexer.so
+strigi-daemon: non-dev-pkg-with-shlib-symlink usr/lib/libstreams.so.0.3.2 usr/lib/libstreams.so
+strigi-daemon: package-name-doesnt-match-sonames libsearchclient0 libstreamindexer0 libstreams0
Deleted: kde-extras/strigi/trunk/debian/strigi-dev.install
Deleted: kde-extras/strigi/trunk/debian/strigi.install
Deleted: kde-extras/strigi/trunk/debian/strigi.lintian-overrides
Deleted: kde-extras/strigi/trunk/debian/strigi.postinst
More information about the pkg-kde-commits
mailing list