rev 7032 - in kde-extras/strigi/trunk/debian: . patches
Fathi Boudra
fboudra-guest at alioth.debian.org
Fri Aug 10 20:39:57 UTC 2007
Author: fboudra-guest
Date: 2007-08-10 20:39:56 +0000 (Fri, 10 Aug 2007)
New Revision: 7032
Added:
kde-extras/strigi/trunk/debian/patches/
kde-extras/strigi/trunk/debian/patches/01_strigi_branch_r698697.diff
Modified:
kde-extras/strigi/trunk/debian/changelog
kde-extras/strigi/trunk/debian/control
Log:
* Add branch pull.
* Add dbus alternative to dbus-x11.
Modified: kde-extras/strigi/trunk/debian/changelog
===================================================================
--- kde-extras/strigi/trunk/debian/changelog 2007-08-10 20:37:13 UTC (rev 7031)
+++ kde-extras/strigi/trunk/debian/changelog 2007-08-10 20:39:56 UTC (rev 7032)
@@ -1,8 +1,12 @@
-strigi (0.5.5-2) UNRELEASED; urgency=low
+strigi (0.5.5-2) unstable; urgency=low
- * NOT RELEASED YET
+ * Add branch pull patch. Fixed call of endAnalysis(bool):
+ handleEnd() should not have a bool complete because dataeventinputstream
+ calls handleEnd(), so that EventThroughAnalyzer::handleEnd() now determines
+ 'complete' with datastream->status() == Eof.
+ * Add dbus as an alternative for dbus-x11. be smart with backporters.
- -- Mark Purcell <msp at debian.org> Tue, 07 Aug 2007 22:21:19 +0100
+ -- Fathi Boudra <fboudra at free.fr> Fri, 10 Aug 2007 22:20:33 +0200
strigi (0.5.5-1) unstable; urgency=low
Modified: kde-extras/strigi/trunk/debian/control
===================================================================
--- kde-extras/strigi/trunk/debian/control 2007-08-10 20:37:13 UTC (rev 7031)
+++ kde-extras/strigi/trunk/debian/control 2007-08-10 20:39:56 UTC (rev 7032)
@@ -11,7 +11,7 @@
Package: strigi-daemon
Architecture: any
Section: utils
-Depends: ${shlibs:Depends}, ${misc:Depends}, poppler-utils, dbus-x11
+Depends: ${shlibs:Depends}, ${misc:Depends}, poppler-utils, dbus-x11 | dbus
Suggests: strigi-plugins
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
Added: kde-extras/strigi/trunk/debian/patches/01_strigi_branch_r698697.diff
===================================================================
--- kde-extras/strigi/trunk/debian/patches/01_strigi_branch_r698697.diff (rev 0)
+++ kde-extras/strigi/trunk/debian/patches/01_strigi_branch_r698697.diff 2007-08-10 20:39:56 UTC (rev 7032)
@@ -0,0 +1,428 @@
+diff -Nur strigi-0.5.5/cmake/FindCLucene.cmake strigi-svn698697/cmake/FindCLucene.cmake
+--- strigi-0.5.5/cmake/FindCLucene.cmake 2007-06-22 18:15:50.000000000 +0200
++++ strigi-svn698697/cmake/FindCLucene.cmake 2007-08-06 21:25:31.000000000 +0200
+@@ -23,8 +23,6 @@
+ SET(TRIAL_INCLUDE_PATHS
+ $ENV{CLUCENE_HOME}/include
+ ${CMAKE_INSTALL_PREFIX}/include
+- /usr/include
+- /usr/local/include
+ /sw/include
+ )
+
+diff -Nur strigi-0.5.5/cmake/FindCppUnit.cmake strigi-svn698697/cmake/FindCppUnit.cmake
+--- strigi-0.5.5/cmake/FindCppUnit.cmake 2007-06-23 09:25:45.000000000 +0200
++++ strigi-svn698697/cmake/FindCppUnit.cmake 2007-08-06 21:25:31.000000000 +0200
+@@ -9,10 +9,7 @@
+
+ SET(CPPUNIT_MIN_VERSION 1.12.0)
+
+-FIND_PROGRAM(CPPUNIT_CONFIG_EXECUTABLE cppunit-config PATHS
+- /usr/bin
+- /usr/local/bin
+-)
++FIND_PROGRAM(CPPUNIT_CONFIG_EXECUTABLE cppunit-config )
+
+ IF(CPPUNIT_INCLUDE_DIR AND CPPUNIT_LIBRARIES)
+
+diff -Nur strigi-0.5.5/cmake/FindExiv2.cmake strigi-svn698697/cmake/FindExiv2.cmake
+--- strigi-0.5.5/cmake/FindExiv2.cmake 2007-06-17 23:02:25.000000000 +0200
++++ strigi-svn698697/cmake/FindExiv2.cmake 2007-08-06 21:25:31.000000000 +0200
+@@ -36,15 +36,11 @@
+
+ FIND_PATH(EXIV2_INCLUDE_DIR exiv2/exif.hpp
+ ${_EXIV2IncDir}
+- /usr/include
+- /usr/local/include
+ )
+
+ FIND_LIBRARY(EXIV2_LIBRARIES NAMES exiv2
+ PATHS
+ ${_EXIV2LinkDir}
+- /usr/lib
+- /usr/local/lib
+ )
+
+ if (EXIV2_INCLUDE_DIR AND EXIV2_LIBRARIES)
+diff -Nur strigi-0.5.5/cmake/FindExpat.cmake strigi-svn698697/cmake/FindExpat.cmake
+--- strigi-0.5.5/cmake/FindExpat.cmake 2007-03-03 19:29:33.000000000 +0100
++++ strigi-svn698697/cmake/FindExpat.cmake 2007-08-06 21:25:31.000000000 +0200
+@@ -19,14 +19,10 @@
+
+ SET(TRIAL_LIBRARY_PATHS
+ $ENV{EXPAT_HOME}/lib/
+- /usr/lib/
+- /usr/local/lib/
+ /sw/lib/
+ )
+ SET(TRIAL_INCLUDE_PATHS
+ $ENV{EXPAT_HOME}/include
+- /usr/include
+- /usr/local/include
+ /sw/include
+ )
+
+diff -Nur strigi-0.5.5/cmake/FindIconv.cmake strigi-svn698697/cmake/FindIconv.cmake
+--- strigi-0.5.5/cmake/FindIconv.cmake 2007-05-04 21:10:23.000000000 +0200
++++ strigi-svn698697/cmake/FindIconv.cmake 2007-08-06 21:25:31.000000000 +0200
+@@ -13,16 +13,9 @@
+ SET(ICONV_FIND_QUIETLY TRUE)
+ ENDIF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
+
+-FIND_PATH(ICONV_INCLUDE_DIR iconv.h
+- /usr/include
+- /usr/local/include
+-)
++FIND_PATH(ICONV_INCLUDE_DIR iconv.h)
+
+-FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv c
+- PATHS
+- /usr/lib/
+- /usr/local/lib
+- )
++FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv c)
+
+ IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
+ SET(ICONV_FOUND TRUE)
+diff -Nur strigi-0.5.5/cmake/FindRegex.cmake strigi-svn698697/cmake/FindRegex.cmake
+--- strigi-0.5.5/cmake/FindRegex.cmake 2007-03-14 16:35:32.000000000 +0100
++++ strigi-svn698697/cmake/FindRegex.cmake 2007-08-06 21:25:31.000000000 +0200
+@@ -4,8 +4,8 @@
+ # Regex_FOUND - system has libregex
+ # REGEX_INCLUDE_DIR - the libregex include directory
+ # REGEX_LIBRARIES - libregex library
+-FIND_PATH(REGEX_INCLUDE_DIR regex.h /usr/include /usr/local/include )
+-FIND_LIBRARY(REGEX_LIBRARIES NAMES libregex PATHS /usr/lib /usr/local/lib )
++FIND_PATH(REGEX_INCLUDE_DIR regex.h )
++FIND_LIBRARY(REGEX_LIBRARIES NAMES libregex)
+ if(REGEX_INCLUDE_DIR AND REGEX_LIBRARIES)
+ set(Regex_FOUND TRUE)
+ endif(REGEX_INCLUDE_DIR AND REGEX_LIBRARIES)
+diff -Nur strigi-0.5.5/cmake/FindSQLite.cmake strigi-svn698697/cmake/FindSQLite.cmake
+--- strigi-0.5.5/cmake/FindSQLite.cmake 2007-03-14 16:35:32.000000000 +0100
++++ strigi-svn698697/cmake/FindSQLite.cmake 2007-08-06 21:25:31.000000000 +0200
+@@ -4,8 +4,8 @@
+ # SQLite_FOUND - system has libsqlite
+ # SQLITE_INCLUDE_DIR - the libsqlite include directory
+ # SQLITE_LIBRARIES - libsqlite library
+-FIND_PATH(SQLITE_INCLUDE_DIR sqlite3.h /usr/include /usr/local/include )
+-FIND_LIBRARY(SQLITE_LIBRARIES NAMES sqlite3 PATHS /usr/lib /usr/local/lib )
++FIND_PATH(SQLITE_INCLUDE_DIR sqlite3.h)
++FIND_LIBRARY(SQLITE_LIBRARIES NAMES sqlite3)
+ if(SQLITE_INCLUDE_DIR AND SQLITE_LIBRARIES)
+ set(SQLite_FOUND TRUE)
+ endif(SQLITE_INCLUDE_DIR AND SQLITE_LIBRARIES)
+diff -Nur strigi-0.5.5/cmake/FindXAttr.cmake strigi-svn698697/cmake/FindXAttr.cmake
+--- strigi-0.5.5/cmake/FindXAttr.cmake 2007-03-14 16:35:32.000000000 +0100
++++ strigi-svn698697/cmake/FindXAttr.cmake 2007-08-06 21:25:31.000000000 +0200
+@@ -5,10 +5,7 @@
+ # XATTR_INCLUDE_DIR - the xattr include directory
+ #
+
+-FIND_PATH(XATTR_INCLUDE_DIR attr/xattr.h
+- /usr/include
+- /usr/local/include
+-)
++FIND_PATH(XATTR_INCLUDE_DIR attr/xattr.h)
+
+ IF(XATTR_INCLUDE_DIR)
+ SET(XATTR_FOUND TRUE)
+diff -Nur strigi-0.5.5/cmake/FindXSD.cmake strigi-svn698697/cmake/FindXSD.cmake
+--- strigi-0.5.5/cmake/FindXSD.cmake 2006-08-08 14:36:17.000000000 +0200
++++ strigi-svn698697/cmake/FindXSD.cmake 2007-08-06 21:25:31.000000000 +0200
+@@ -22,8 +22,6 @@
+ PATHS
+ # "[HKEY_CURRENT_USER\\xsd\\bin"
+ $ENV{XSDDIR}/bin
+- /usr/local/bin
+- /usr/bin
+ )
+
+ # if the include a the library are found then we have it
+diff -Nur strigi-0.5.5/config.h.cmake strigi-svn698697/config.h.cmake
+--- strigi-0.5.5/config.h.cmake 2007-08-06 00:17:23.000000000 +0200
++++ strigi-svn698697/config.h.cmake 2007-08-10 20:52:24.000000000 +0200
+@@ -52,6 +52,11 @@
+ #cmakedefine HAVE_SSIZE_T 1
+
+ //////////////////////////////
++//support large files
++//////////////////////////////
++#define _FILE_OFFSET_BITS 64
++
++//////////////////////////////
+ //missing functions
+ //////////////////////////////
+ #include "src/streams/strigi/compat.h"
+@@ -82,6 +87,8 @@
+ #if !defined(snprintf) && !defined(__MINGW32__)
+ #define snprintf _snprintf
+ #endif
++ #define fseeko fseek
++ #define ftello ftell
+ #endif
+
+ #ifndef S_ISREG
+diff -Nur strigi-0.5.5/src/daemon/dbus/CMakeLists.txt strigi-svn698697/src/daemon/dbus/CMakeLists.txt
+--- strigi-0.5.5/src/daemon/dbus/CMakeLists.txt 2007-07-02 13:00:30.000000000 +0200
++++ strigi-svn698697/src/daemon/dbus/CMakeLists.txt 2007-08-07 22:37:45.000000000 +0200
+@@ -46,7 +46,7 @@
+ "${CMAKE_CURRENT_BINARY_DIR}/dbus${INAME}.h"
+ COMMAND ${CMAKE_COMMAND}
+ ARGS -E copy_if_different
+- "${CMAKE_CURRENT_SOURCE_DIR}/generated/${INAME}.cpp"
++ "${CMAKE_CURRENT_SOURCE_DIR}/generated/dbus${INAME}.cpp"
+ "${CMAKE_CURRENT_BINARY_DIR}/dbus${INAME}.cpp"
+ )
+ ENDIF (PERL_FOUND)
+diff -Nur strigi-0.5.5/src/daemon/dbus/dbuscpp/dbushandler.cpp strigi-svn698697/src/daemon/dbus/dbuscpp/dbushandler.cpp
+--- strigi-0.5.5/src/daemon/dbus/dbuscpp/dbushandler.cpp 2007-06-20 00:17:03.000000000 +0200
++++ strigi-svn698697/src/daemon/dbus/dbuscpp/dbushandler.cpp 2007-08-08 15:44:53.000000000 +0200
+@@ -26,6 +26,9 @@
+ #include <sys/time.h>
+ #include <sys/types.h>
+ #include <unistd.h>
++
++#include <dbus/dbus.h>
++
+ using namespace std;
+
+ DBusHandler::DBusHandler() {
+diff -Nur strigi-0.5.5/src/estraierindexer/estraierindexmanager.cpp strigi-svn698697/src/estraierindexer/estraierindexmanager.cpp
+--- strigi-0.5.5/src/estraierindexer/estraierindexmanager.cpp 2007-08-06 00:15:19.000000000 +0200
++++ strigi-svn698697/src/estraierindexer/estraierindexmanager.cpp 2007-08-07 18:12:54.000000000 +0200
+@@ -99,7 +99,7 @@
+ // remove all entries from the subdir
+ DIR* dir = opendir(d.c_str());
+ if (dir == 0) {
+- fprintf(stderr, "could not open index directory.\n");
++ fprintf(stderr, "could not open index directory %s (%s)\n", d.c_str(), strerror(errno));
+ return;
+ }
+ // delete all the index files
+@@ -126,7 +126,7 @@
+ unlink(filename.c_str());
+ }
+ } else {
+- fprintf(stderr, "could not open file %s\n", filename.c_str());
++ fprintf(stderr, "could not open file %s (%s)\n", filename.c_str(), strerror(errno));
+ }
+ e = readdir(dir);
+ }
+diff -Nur strigi-0.5.5/src/luceneindexer/cluceneindexmanager.cpp strigi-svn698697/src/luceneindexer/cluceneindexmanager.cpp
+--- strigi-0.5.5/src/luceneindexer/cluceneindexmanager.cpp 2007-08-06 00:15:19.000000000 +0200
++++ strigi-svn698697/src/luceneindexer/cluceneindexmanager.cpp 2007-08-07 18:12:54.000000000 +0200
+@@ -162,7 +162,7 @@
+ // loop over directory entries
+ DIR* dir = opendir(dbdir.c_str());
+ if (dir == 0) {
+- fprintf(stderr, "could not open index directory.\n");
++ fprintf(stderr, "could not open index directory %s (%s)\n", dbdir.c_str(), strerror(errno));
+ return -1;
+ }
+ struct dirent* e = readdir(dir);
+@@ -176,7 +176,7 @@
+ size += s.st_size;
+ }
+ } else {
+- fprintf(stderr, "could not open file %s\n", filename.c_str());
++ fprintf(stderr, "could not open file %s (%s)\n", filename.c_str(), strerror(errno));
+ }
+ e = readdir(dir);
+ }
+diff -Nur strigi-0.5.5/src/luceneindexer/cluceneindexwriter.cpp strigi-svn698697/src/luceneindexer/cluceneindexwriter.cpp
+--- strigi-0.5.5/src/luceneindexer/cluceneindexwriter.cpp 2007-08-04 14:33:56.000000000 +0200
++++ strigi-svn698697/src/luceneindexer/cluceneindexwriter.cpp 2007-08-10 20:52:24.000000000 +0200
+@@ -97,7 +97,7 @@
+ Field* field = new Field(name, value,
+ (type & AnalyzerConfiguration::Stored) == AnalyzerConfiguration::Stored,
+ (type & AnalyzerConfiguration::Indexed) == AnalyzerConfiguration::Indexed,
+- type & AnalyzerConfiguration::Tokenized);
++ (type & AnalyzerConfiguration::Tokenized) == AnalyzerConfiguration::Tokenized);
+ doc->doc.add(*field);
+ }
+ void
+diff -Nur strigi-0.5.5/src/streamanalyzer/analyzerloader.cpp strigi-svn698697/src/streamanalyzer/analyzerloader.cpp
+--- strigi-0.5.5/src/streamanalyzer/analyzerloader.cpp 2007-08-06 00:14:33.000000000 +0200
++++ strigi-svn698697/src/streamanalyzer/analyzerloader.cpp 2007-08-10 20:52:24.000000000 +0200
+@@ -151,7 +151,11 @@
+ handle = LoadLibrary(lib);
+ #endif
+ if (!handle) {
++#ifdef HAVE_DLFCN_H
+ cerr << "Could not load '" << lib << "':" << dlerror() << endl;
++#else
++ cerr << "Could not load '" << lib << "': GetLastError(): " << GetLastError() << endl;
++#endif
+ return;
+ }
+ const AnalyzerFactoryFactory* (*f)() = (const AnalyzerFactoryFactory* (*)())
+diff -Nur strigi-0.5.5/src/streamanalyzer/eventthroughanalyzer.cpp strigi-svn698697/src/streamanalyzer/eventthroughanalyzer.cpp
+--- strigi-0.5.5/src/streamanalyzer/eventthroughanalyzer.cpp 2007-08-06 00:14:33.000000000 +0200
++++ strigi-svn698697/src/streamanalyzer/eventthroughanalyzer.cpp 2007-08-09 23:16:27.000000000 +0200
+@@ -78,10 +78,10 @@
+ return more;
+ }
+ void
+-EventThroughAnalyzer::handleEnd(bool complete) {
++EventThroughAnalyzer::handleEnd() {
+ vector<StreamEventAnalyzer*>::iterator i;
+ for (i = event.begin(); i != event.end(); ++i) {
+- (*i)->endAnalysis(complete);
++ (*i)->endAnalysis(datastream->status() == Eof);
+ }
+ }
+ StreamThroughAnalyzer*
+diff -Nur strigi-0.5.5/src/streamanalyzer/eventthroughanalyzer.h strigi-svn698697/src/streamanalyzer/eventthroughanalyzer.h
+--- strigi-0.5.5/src/streamanalyzer/eventthroughanalyzer.h 2007-08-06 00:14:33.000000000 +0200
++++ strigi-svn698697/src/streamanalyzer/eventthroughanalyzer.h 2007-08-09 23:16:27.000000000 +0200
+@@ -47,7 +47,7 @@
+ InputStream* connectInputStream(InputStream* in);
+ bool isReadyWithStream();
+ bool handleData(const char* data, uint32_t size);
+- void handleEnd(bool complete);
++ void handleEnd();
+ const char* name() const { return "EventThroughAnalyzer"; }
+ public:
+ EventThroughAnalyzer(std::vector<StreamEventAnalyzer*>& e)
+diff -Nur strigi-0.5.5/src/streams/fileinputstream.cpp strigi-svn698697/src/streams/fileinputstream.cpp
+--- strigi-0.5.5/src/streams/fileinputstream.cpp 2007-08-06 00:13:47.000000000 +0200
++++ strigi-svn698697/src/streams/fileinputstream.cpp 2007-08-10 20:52:24.000000000 +0200
+@@ -17,6 +17,7 @@
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
++#include "config.h"
+ #include "fileinputstream.h"
+ #include <strigi/strigiconfig.h>
+ #include <iostream>
+@@ -57,11 +58,11 @@
+ return;
+ }
+ // determine file size. if the stream is not seekable, the size will be -1
+- if (fseek(file, 0, SEEK_END) == -1) {
++ if (fseeko(file, 0, SEEK_END) == -1) {
+ m_size = -1;
+ } else {
+- m_size = ftell(file);
+- fseek(file, 0, SEEK_SET);
++ m_size = ftello(file);
++ fseeko(file, 0, SEEK_SET);
+ // if the file has size 0, make sure that it's really empty
+ // this is useful for filesystems like /proc that report files as size 0
+ // for files that do contain content
+@@ -70,7 +71,7 @@
+ size_t n = fread(dummy, 1, 1, file);
+ if (n == 1) {
+ m_size = -1;
+- fseek(file, 0, SEEK_SET);
++ fseeko(file, 0, SEEK_SET);
+ } else {
+ fclose(file);
+ file = 0;
+diff -Nur strigi-0.5.5/src/streams/kmpsearcher.cpp strigi-svn698697/src/streams/kmpsearcher.cpp
+--- strigi-0.5.5/src/streams/kmpsearcher.cpp 2007-08-06 00:13:47.000000000 +0200
++++ strigi-svn698697/src/streams/kmpsearcher.cpp 2007-08-08 22:06:12.000000000 +0200
+@@ -42,7 +42,8 @@
+ void
+ suffixes(const char* x, int32_t m, int32_t* suff) {
+ int32_t f, g, i;
+-
++
++ f = 0;
+ suff[m - 1] = m;
+ g = m - 1;
+ for (i = m - 2; i >= 0; --i) {
+diff -Nur strigi-0.5.5/src/streams/tests/CMakeLists.txt strigi-svn698697/src/streams/tests/CMakeLists.txt
+--- strigi-0.5.5/src/streams/tests/CMakeLists.txt 2007-08-06 00:13:47.000000000 +0200
++++ strigi-svn698697/src/streams/tests/CMakeLists.txt 2007-08-07 23:29:05.000000000 +0200
+@@ -22,6 +22,7 @@
+ SubInputStreamTest.cpp
+ TarInputStreamTest.cpp
+ ZipInputStreamTest.cpp
++ stat64bitTest.cpp
+ )
+ if(NOT WIN32)
+ set(streamtests ${streamtests}
+diff -Nur strigi-0.5.5/src/streams/tests/stat64bitTest.cpp strigi-svn698697/src/streams/tests/stat64bitTest.cpp
+--- strigi-0.5.5/src/streams/tests/stat64bitTest.cpp 1970-01-01 00:00:00.000000000 +0000
++++ strigi-svn698697/src/streams/tests/stat64bitTest.cpp 2007-08-07 23:47:48.000000000 +0200
+@@ -0,0 +1,51 @@
++/* This file is part of Strigi Desktop Search
++ *
++ * Copyright (C) 2007 Jos van den Oever <jos at vandenoever.info>
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Library General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Library General Public License for more details.
++ *
++ * You should have received a copy of the GNU Library General Public License
++ * along with this library; see the file COPYING.LIB. If not, write to
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
++ */
++#include "config.h"
++#include <sys/stat.h>
++#include <cstdio>
++#include <iostream>
++using namespace std;
++
++/*
++ * Test to check if the file size returned from stat() can handle large files
++ **/
++int
++stat64bitTest(int argc, char* argv[]) {
++
++ if (sizeof(off_t) < 8) return 1;
++
++ // create a file of 5 GB
++ FILE* file = tmpfile();
++ if (file == 0) return 1;
++ off_t size = 5368709120ll;
++ if (fseeko(file, size, SEEK_SET)) return 1;
++ if (fwrite("hi", 1, 2, file) != 2) return 1;
++ if (fflush(file)) return 1;
++
++ // check the filesize
++ int fd = fileno(file);
++ if (fd == -1) return 1;
++ struct stat s;
++ if (fstat(fd, &s)) return 1;
++ if (s.st_size != 5368709122ll) return 1;
++ if (fclose(file)) return 1;
++ return 0;
++}
++
+diff -Nur strigi-0.5.5/src/xmlindexer/cgixmlindexer.cpp strigi-svn698697/src/xmlindexer/cgixmlindexer.cpp
+--- strigi-0.5.5/src/xmlindexer/cgixmlindexer.cpp 2007-08-05 00:44:08.000000000 +0200
++++ strigi-svn698697/src/xmlindexer/cgixmlindexer.cpp 2007-08-07 09:13:02.000000000 +0200
+@@ -1,3 +1,23 @@
++/* This file is part of Strigi Desktop Search
++ *
++ * Copyright (C) 2007 Jos van den Oever <jos at vandenoever.info>
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Library General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Library General Public License for more details.
++ *
++ * You should have received a copy of the GNU Library General Public License
++ * along with this library; see the file COPYING.LIB. If not, write to
++ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++ * Boston, MA 02110-1301, USA.
++ */
++
+ #include "stringstream.h"
+ #include "stringterminatedsubstream.h"
+ #include "subinputstream.h"
More information about the pkg-kde-commits
mailing list