rev 6162 - in kde-extras/strigi/trunk/debian: . patches
Fathi Boudra
fboudra-guest at alioth.debian.org
Sat May 12 19:14:04 UTC 2007
Author: fboudra-guest
Date: 2007-05-12 19:14:03 +0000 (Sat, 12 May 2007)
New Revision: 6162
Added:
kde-extras/strigi/trunk/debian/libcluceneindex-dev.install
kde-extras/strigi/trunk/debian/libcluceneindex0.install
kde-extras/strigi/trunk/debian/libstreamanalyzer-dev.install
kde-extras/strigi/trunk/debian/libstreamanalyzer0.install
kde-extras/strigi/trunk/debian/patches/11_gcc4.3_support_bug417714.diff
Removed:
kde-extras/strigi/trunk/debian/libstreamindexer-dev.install
kde-extras/strigi/trunk/debian/libstreamindexer0.install
kde-extras/strigi/trunk/debian/patches/01_strigi_branch_r623754.diff
kde-extras/strigi/trunk/debian/patches/10_fix_include_path.diff
kde-extras/strigi/trunk/debian/patches/Bug417714-GCC4.3.diff
Modified:
kde-extras/strigi/trunk/debian/changelog
kde-extras/strigi/trunk/debian/control
kde-extras/strigi/trunk/debian/copyright
kde-extras/strigi/trunk/debian/libstreams-dev.install
kde-extras/strigi/trunk/debian/rules
kde-extras/strigi/trunk/debian/strigi-utils.install
Log:
update strigi-0.5.1-1 package
Modified: kde-extras/strigi/trunk/debian/changelog
===================================================================
--- kde-extras/strigi/trunk/debian/changelog 2007-05-12 07:06:11 UTC (rev 6161)
+++ kde-extras/strigi/trunk/debian/changelog 2007-05-12 19:14:03 UTC (rev 6162)
@@ -1,8 +1,18 @@
-strigi (0.3.11-3) UNRELEASED; urgency=low
+strigi (0.5.1-1) unstable; urgency=low
- * NOT RELEASED YET
+ * New upstream release.
+ * Update copyright.
+ * Remove branch pull patch to r623754.
+ * Remove include path patch. Merged upstream.
+ * Update gcc 4.3 patch.
+ * Update libstreams-dev installed files.
+ * Replace libstreamindexer by libstreamanalyzer.
+ * Add libcluceneindex package.
+ * Use default options. Comment DEB_CMAKE_EXTRA_FLAGS.
+ * Remove libssl-dev, libmagic-dev, libexpat1-dev and liblog4cxx9-dev
+ from build depends.
- -- Mark Purcell <msp at debian.org> Wed, 02 May 2007 19:03:19 +0100
+ -- Fathi Boudra <fboudra at free.fr> Fri, 11 May 2007 21:17:54 +0200
strigi (0.3.11-2) unstable; urgency=low
Modified: kde-extras/strigi/trunk/debian/control
===================================================================
--- kde-extras/strigi/trunk/debian/control 2007-05-12 07:06:11 UTC (rev 6161)
+++ kde-extras/strigi/trunk/debian/control 2007-05-12 19:14:03 UTC (rev 6162)
@@ -4,8 +4,7 @@
Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
Uploaders: Fathi Boudra <fboudra at free.fr>, Mark Purcell <msp at debian.org>
Build-Depends: cdbs, debhelper (>= 5), cmake, libbz2-dev, libclucene-dev,
- libssl-dev, zlib1g-dev, libattr1-dev, libmagic-dev, libxml2-dev, libqt4-dev,
- libdbus-1-dev, libexpat1-dev, liblog4cxx9-dev
+ zlib1g-dev, libattr1-dev, libxml2-dev, libqt4-dev, libdbus-1-dev
Standards-Version: 3.7.2
Package: strigi-daemon
@@ -102,26 +101,29 @@
.
Homepage: http://www.vandenoever.info/software/strigi
-Package: libstreamindexer0
+Package: libstreamanalyzer0
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: strigi-daemon (<< 0.3.11-1)
-Description: streamindexer library for Strigi Desktop Search
+Conflicts: libstreamindexer0 (<< 0.5.1-1)
+Replaces: libstreamindexer0 (<< 0.5.1-1), strigi-daemon (<< 0.3.11-1)
+Description: streamanalyzer library for Strigi Desktop Search
This package is part of Strigi Desktop Search, it contains a library for
- writing clients using libstreamindexer.
+ writing clients using libstreamanalyzer.
.
See the 'strigi-daemon' package for more informations.
.
Homepage: http://www.vandenoever.info/software/strigi
-Package: libstreamindexer-dev
+Package: libstreamanalyzer-dev
Architecture: any
Section: libdevel
-Depends: libstreamindexer0 (= ${Source-Version}), libstreams-dev
-Description: development files for libstreamsindexe
+Depends: libstreamanalyzer0 (= ${Source-Version}), libstreams-dev
+Conflicts: libstreamindexer-dev (<< 0.5.1-1)
+Replaces: libstreamindexer-dev (<< 0.5.1-1)
+Description: development files for libstreamanalyzer
This package is part of Strigi Desktop Search, it contains the Strigi
- development files for libstreamindexer.
+ development files for libstreamanalyzer.
.
See the 'strigi-daemon' package for more informations.
.
@@ -143,7 +145,7 @@
Package: libsearchclient-dev
Architecture: any
Section: libdevel
-Depends: libsearchclient0 (= ${Source-Version}), libstreamindexer-dev
+Depends: libsearchclient0 (= ${Source-Version}), libstreamanalyzer-dev
Description: development files for libsearchclient
This package is part of Strigi Desktop Search, it contains the Strigi
development files for libsearchclient.
@@ -199,3 +201,27 @@
See the 'strigi-daemon' package for more informations.
.
Homepage: http://www.vandenoever.info/software/strigi
+
+Package: libcluceneindex0
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: cluceneindex library for Strigi Desktop Search
+ This package is part of Strigi Desktop Search, it contains a library for
+ clucene indexer.
+ .
+ See the 'strigi-daemon' package for more informations.
+ .
+ Homepage: http://www.vandenoever.info/software/strigi
+
+Package: libcluceneindex-dev
+Architecture: any
+Section: libdevel
+Depends: libcluceneindex0 (= ${Source-Version})
+Description: development files for libsearchclient
+ This package is part of Strigi Desktop Search, it contains the Strigi
+ development files for libcluceneindex.
+ .
+ See the 'strigi-daemon' package for more informations.
+ .
+ Homepage: http://www.vandenoever.info/software/strigi
Modified: kde-extras/strigi/trunk/debian/copyright
===================================================================
--- kde-extras/strigi/trunk/debian/copyright 2007-05-12 07:06:11 UTC (rev 6161)
+++ kde-extras/strigi/trunk/debian/copyright 2007-05-12 19:14:03 UTC (rev 6162)
@@ -3,13 +3,15 @@
It was downloaded from http://www.vandenoever.info/software/strigi/
-Upstream Author: Jos van den Oever <jos at vandenoever.info>
+Upstream Authors:
+ Jos van den Oever <jos at vandenoever.info>
+ Ben van Klinken <bvanklinken at gmail.com>
+ Flavio Castelli <micron at madlab.it>
+ Arend van Beelen jr. <www.arendjr.nl>
+ Christian Ehrlicher <ch.ehrlicher at gmx.de>
+ Christopher Blauvelt <cblauvelt at gmail.com>
+ Jakub Stachowski <qbast at go2.pl>
-Copyrights:
- (C) 2006 Jos van den Oever <jos at vandenoever.info>
- (C) 2006 Ben van Klinken <bvanklinken at gmail.com>
- (C) 2006 Flavio Castelli <flavio.castelli at gmail.com>
-
Copyright for dirent:
(C) 2003-2006 Matt J. Weinstein
Added: kde-extras/strigi/trunk/debian/libcluceneindex-dev.install
===================================================================
--- kde-extras/strigi/trunk/debian/libcluceneindex-dev.install 2007-05-12 07:06:11 UTC (rev 6161)
+++ kde-extras/strigi/trunk/debian/libcluceneindex-dev.install 2007-05-12 19:14:03 UTC (rev 6162)
@@ -0,0 +1 @@
+usr/lib/libcluceneindex.so
Added: kde-extras/strigi/trunk/debian/libcluceneindex0.install
===================================================================
--- kde-extras/strigi/trunk/debian/libcluceneindex0.install 2007-05-12 07:06:11 UTC (rev 6161)
+++ kde-extras/strigi/trunk/debian/libcluceneindex0.install 2007-05-12 19:14:03 UTC (rev 6162)
@@ -0,0 +1 @@
+usr/lib/libcluceneindex.so.*
Added: kde-extras/strigi/trunk/debian/libstreamanalyzer-dev.install
===================================================================
--- kde-extras/strigi/trunk/debian/libstreamanalyzer-dev.install 2007-05-12 07:06:11 UTC (rev 6161)
+++ kde-extras/strigi/trunk/debian/libstreamanalyzer-dev.install 2007-05-12 19:14:03 UTC (rev 6162)
@@ -0,0 +1,17 @@
+usr/include/strigi/analysisresult.h
+usr/include/strigi/analyzerconfiguration.h
+usr/include/strigi/analyzerplugin.h
+usr/include/strigi/diranalyzer.h
+usr/include/strigi/fieldproperties.h
+usr/include/strigi/fieldtypes.h
+usr/include/strigi/indexeddocument.h
+usr/include/strigi/indexwriter.h
+usr/include/strigi/streamanalyzer.h
+usr/include/strigi/streamanalyzerfactory.h
+usr/include/strigi/streamendanalyzer.h
+usr/include/strigi/streameventanalyzer.h
+usr/include/strigi/streamlineanalyzer.h
+usr/include/strigi/streamsaxanalyzer.h
+usr/include/strigi/streamthroughanalyzer.h
+usr/lib/libstreamanalyzer.so
+usr/lib/pkgconfig/libstreamanalyzer.pc
Added: kde-extras/strigi/trunk/debian/libstreamanalyzer0.install
===================================================================
--- kde-extras/strigi/trunk/debian/libstreamanalyzer0.install 2007-05-12 07:06:11 UTC (rev 6161)
+++ kde-extras/strigi/trunk/debian/libstreamanalyzer0.install 2007-05-12 19:14:03 UTC (rev 6162)
@@ -0,0 +1,4 @@
+usr/lib/libstreamanalyzer.so.*
+usr/lib/strigi/strigila_*
+usr/lib/strigi/strigita_*
+usr/share/strigi/fieldproperties/strigi_*
Deleted: kde-extras/strigi/trunk/debian/libstreamindexer-dev.install
Deleted: kde-extras/strigi/trunk/debian/libstreamindexer0.install
Modified: kde-extras/strigi/trunk/debian/libstreams-dev.install
===================================================================
--- kde-extras/strigi/trunk/debian/libstreams-dev.install 2007-05-12 07:06:11 UTC (rev 6161)
+++ kde-extras/strigi/trunk/debian/libstreams-dev.install 2007-05-12 19:14:03 UTC (rev 6162)
@@ -1,16 +1,15 @@
-usr/include/strigi/fileinputstream.h
-usr/include/strigi/substreamprovider.h
-usr/include/strigi/substreamproviderprovider.h
+usr/include/strigi/archivereader.h
usr/include/strigi/bufferedstream.h
-usr/include/strigi/streambase.h
-usr/include/strigi/inputstreambuffer.h
+usr/include/strigi/fileinputstream.h
usr/include/strigi/inputstream.h
-usr/include/strigi/archivereader.h
usr/include/strigi/inputstreamreader.h
+usr/include/strigi/streambase.h
+usr/include/strigi/streambuffer.h
usr/include/strigi/stringreader.h
+usr/include/strigi/stringstream.h
+usr/include/strigi/substreamprovider.h
+usr/include/strigi/substreamproviderprovider.h
usr/include/strigi/jstreamsconfig.h
-usr/include/strigi/timeofday.h
-usr/include/strigi/strigi_fnmatch.h
-usr/include/strigi/strigi_thread.h
-usr/include/strigi/stgdirent.h
+usr/include/strigi/strigiconfig.h
usr/lib/libstreams.so
+usr/lib/pkgconfig/libstreams.pc
Deleted: kde-extras/strigi/trunk/debian/patches/01_strigi_branch_r623754.diff
Deleted: kde-extras/strigi/trunk/debian/patches/10_fix_include_path.diff
Added: kde-extras/strigi/trunk/debian/patches/11_gcc4.3_support_bug417714.diff
===================================================================
--- kde-extras/strigi/trunk/debian/patches/11_gcc4.3_support_bug417714.diff 2007-05-12 07:06:11 UTC (rev 6161)
+++ kde-extras/strigi/trunk/debian/patches/11_gcc4.3_support_bug417714.diff 2007-05-12 19:14:03 UTC (rev 6162)
@@ -0,0 +1,223 @@
+diff -Nur strigi-0.5.1/src/daemon/asyncsocket.h strigi-0.5.1.new/src/daemon/asyncsocket.h
+--- strigi-0.5.1/src/daemon/asyncsocket.h 2007-03-13 14:08:15.000000000 +0100
++++ strigi-0.5.1.new/src/daemon/asyncsocket.h 2007-05-12 11:30:04.000000000 +0200
+@@ -20,6 +20,7 @@
+ #ifndef ASYNCSOCKET_H
+ #define ASYNCSOCKET_H
+
++#include <cstdlib>
+ #include <string>
+
+ class AsyncSocket {
+diff -Nur strigi-0.5.1/src/daemon/dbus/dbusserver.cpp strigi-0.5.1.new/src/daemon/dbus/dbusserver.cpp
+--- strigi-0.5.1/src/daemon/dbus/dbusserver.cpp 2007-03-13 15:14:04.000000000 +0100
++++ strigi-0.5.1.new/src/daemon/dbus/dbusserver.cpp 2007-05-12 11:32:18.000000000 +0200
+@@ -28,6 +28,8 @@
+ #include <sys/time.h>
+ #include <sys/types.h>
+ #include <unistd.h>
++#include <cstdlib>
++
+ using namespace std;
+
+ void*
+diff -Nur strigi-0.5.1/src/daemon/eventlistener/pollinglistener.h strigi-0.5.1.new/src/daemon/eventlistener/pollinglistener.h
+--- strigi-0.5.1/src/daemon/eventlistener/pollinglistener.h 2007-03-13 15:14:31.000000000 +0100
++++ strigi-0.5.1.new/src/daemon/eventlistener/pollinglistener.h 2007-05-12 11:33:10.000000000 +0200
+@@ -22,6 +22,7 @@
+
+ #include "eventlistener.h"
+
++#include <cstdlib>
+ #include <map>
+ #include <pthread.h>
+
+diff -Nur strigi-0.5.1/src/daemon/indexscheduler.h strigi-0.5.1.new/src/daemon/indexscheduler.h
+--- strigi-0.5.1/src/daemon/indexscheduler.h 2007-04-22 23:44:28.000000000 +0200
++++ strigi-0.5.1.new/src/daemon/indexscheduler.h 2007-05-12 11:34:07.000000000 +0200
+@@ -20,6 +20,7 @@
+ #ifndef INDEXSCHEDULER_H
+ #define INDEXSCHEDULER_H
+
++#include <cstdlib>
+ #include <map>
+ #include <string>
+ #include <set>
+diff -Nur strigi-0.5.1/src/daemon/socketclient.cpp strigi-0.5.1.new/src/daemon/socketclient.cpp
+--- strigi-0.5.1/src/daemon/socketclient.cpp 2007-03-15 00:57:37.000000000 +0100
++++ strigi-0.5.1.new/src/daemon/socketclient.cpp 2007-05-12 12:03:02.000000000 +0200
+@@ -23,6 +23,7 @@
+ #include <sys/un.h>
+ #include <errno.h>
+ #include <assert.h>
++#include <cstdlib>
+ #include <sstream>
+ #include <unistd.h>
+ #include <stdlib.h>
+diff -Nur strigi-0.5.1/src/daemon/socketserver.cpp strigi-0.5.1.new/src/daemon/socketserver.cpp
+--- strigi-0.5.1/src/daemon/socketserver.cpp 2007-03-15 00:57:37.000000000 +0100
++++ strigi-0.5.1.new/src/daemon/socketserver.cpp 2007-05-12 12:04:19.000000000 +0200
+@@ -26,6 +26,7 @@
+ #include <sys/un.h>
+ #include <errno.h>
+ #include <assert.h>
++#include <cstdlib>
+ #include <unistd.h>
+ #include <stdlib.h>
+
+diff -Nur strigi-0.5.1/src/htmlgui/strigihtmlgui.cpp strigi-0.5.1.new/src/htmlgui/strigihtmlgui.cpp
+--- strigi-0.5.1/src/htmlgui/strigihtmlgui.cpp 2007-03-31 14:30:21.000000000 +0200
++++ strigi-0.5.1.new/src/htmlgui/strigihtmlgui.cpp 2007-05-12 12:06:04.000000000 +0200
+@@ -28,6 +28,7 @@
+ #include <fstream>
+ #include <sys/stat.h>
+ #include <stdlib.h>
++#include <cstdlib>
+
+ using namespace std;
+ using namespace Strigi;
+diff -Nur strigi-0.5.1/src/luceneindexer/tests/CLuceneTest.cpp strigi-0.5.1.new/src/luceneindexer/tests/CLuceneTest.cpp
+--- strigi-0.5.1/src/luceneindexer/tests/CLuceneTest.cpp 2007-04-02 20:35:23.000000000 +0200
++++ strigi-0.5.1.new/src/luceneindexer/tests/CLuceneTest.cpp 2007-05-12 12:06:59.000000000 +0200
+@@ -7,6 +7,7 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <stdlib.h>
++#include <cstdlib>
+ #ifdef _WIN32
+ #include <direct.h>
+ #endif
+diff -Nur strigi-0.5.1/src/sqliteindexer/sqliteindexmanager.cpp strigi-0.5.1.new/src/sqliteindexer/sqliteindexmanager.cpp
+--- strigi-0.5.1/src/sqliteindexer/sqliteindexmanager.cpp 2007-03-31 14:30:21.000000000 +0200
++++ strigi-0.5.1.new/src/sqliteindexer/sqliteindexmanager.cpp 2007-05-12 12:07:55.000000000 +0200
+@@ -21,6 +21,8 @@
+ #include "sqliteindexreader.h"
+ #include "sqliteindexwriter.h"
+ #include "strigi_thread.h"
++#include <cstdlib>
++
+ using namespace std;
+ using namespace Strigi;
+
+diff -Nur strigi-0.5.1/src/sqliteindexer/sqliteindexreader.cpp strigi-0.5.1.new/src/sqliteindexer/sqliteindexreader.cpp
+--- strigi-0.5.1/src/sqliteindexer/sqliteindexreader.cpp 2007-03-31 14:30:21.000000000 +0200
++++ strigi-0.5.1.new/src/sqliteindexer/sqliteindexreader.cpp 2007-05-12 12:08:40.000000000 +0200
+@@ -19,8 +19,10 @@
+ */
+ #include "sqliteindexreader.h"
+ #include "sqliteindexmanager.h"
++#include <cstdlib>
+ #include <set>
+ #include <sstream>
++
+ using namespace std;
+ using namespace Strigi;
+
+diff -Nur strigi-0.5.1/src/sqliteindexer/sqliteindexwriter.cpp strigi-0.5.1.new/src/sqliteindexer/sqliteindexwriter.cpp
+--- strigi-0.5.1/src/sqliteindexer/sqliteindexwriter.cpp 2007-04-10 20:17:23.000000000 +0200
++++ strigi-0.5.1.new/src/sqliteindexer/sqliteindexwriter.cpp 2007-05-12 12:09:47.000000000 +0200
+@@ -21,9 +21,11 @@
+ #include "sqliteindexmanager.h"
+ #include "analysisresult.h"
+ #include "fieldtypes.h"
++#include <cstdlib>
+ #include <vector>
+ #include <sstream>
+ #include <cassert>
++
+ using namespace std;
+ using namespace Strigi;
+
+diff -Nur strigi-0.5.1/src/streamanalyzer/endanalyzers/expatsaxendanalyzer.cpp strigi-0.5.1.new/src/streamanalyzer/endanalyzers/expatsaxendanalyzer.cpp
+--- strigi-0.5.1/src/streamanalyzer/endanalyzers/expatsaxendanalyzer.cpp 2007-04-02 20:35:23.000000000 +0200
++++ strigi-0.5.1.new/src/streamanalyzer/endanalyzers/expatsaxendanalyzer.cpp 2007-05-12 12:10:52.000000000 +0200
+@@ -22,7 +22,9 @@
+ #include "inputstreamreader.h"
+ #include "analysisresult.h"
+ #include "fieldtypes.h"
++#include <cctype>
+ #include <expat.h>
++
+ using namespace Strigi;
+ using namespace std;
+
+diff -Nur strigi-0.5.1/src/streamanalyzer/indexwriter.cpp strigi-0.5.1.new/src/streamanalyzer/indexwriter.cpp
+--- strigi-0.5.1/src/streamanalyzer/indexwriter.cpp 2007-04-09 21:37:19.000000000 +0200
++++ strigi-0.5.1.new/src/streamanalyzer/indexwriter.cpp 2007-05-12 12:11:47.000000000 +0200
+@@ -21,5 +21,7 @@
+ #include "analysisresult.h"
+ #include "indexwriter.h"
+ #include "textutils.h"
++#include <cstdlib>
++
+ using namespace Strigi;
+ using namespace std;
+diff -Nur strigi-0.5.1/src/streamanalyzer/query.cpp strigi-0.5.1.new/src/streamanalyzer/query.cpp
+--- strigi-0.5.1/src/streamanalyzer/query.cpp 2007-04-10 20:28:41.000000000 +0200
++++ strigi-0.5.1.new/src/streamanalyzer/query.cpp 2007-05-12 12:34:56.000000000 +0200
+@@ -21,6 +21,9 @@
+ #include "query.h"
+ #include "indexreader.h"
+ #include <ctype.h>
++#include <cctype>
++#include <cstdlib>
++
+ using namespace std;
+ using namespace Strigi;
+
+diff -Nur strigi-0.5.1/src/streamanalyzer/throughplugins/xattrthroughanalyzer.cpp strigi-0.5.1.new/src/streamanalyzer/throughplugins/xattrthroughanalyzer.cpp
+--- strigi-0.5.1/src/streamanalyzer/throughplugins/xattrthroughanalyzer.cpp 2007-04-02 20:35:23.000000000 +0200
++++ strigi-0.5.1.new/src/streamanalyzer/throughplugins/xattrthroughanalyzer.cpp 2007-05-12 12:36:40.000000000 +0200
+@@ -25,6 +25,8 @@
+ #include <sys/types.h>
+ #include <attr/xattr.h>
+ #include <errno.h>
++#include <cctype>
++
+ using namespace Strigi;
+ using namespace std;
+
+diff -Nur strigi-0.5.1/src/streams/kmpsearcher.h strigi-0.5.1.new/src/streams/kmpsearcher.h
+--- strigi-0.5.1/src/streams/kmpsearcher.h 2007-04-02 20:35:23.000000000 +0200
++++ strigi-0.5.1.new/src/streams/kmpsearcher.h 2007-05-12 12:37:36.000000000 +0200
+@@ -20,6 +20,7 @@
+ #ifndef KMPSEARCHER_H
+ #define KMPSEARCHER_H
+
++#include <cstdlib>
+ #include <string>
+ #include <stdlib.h>
+
+diff -Nur strigi-0.5.1/src/streams/pdf/pdfparser.cpp strigi-0.5.1.new/src/streams/pdf/pdfparser.cpp
+--- strigi-0.5.1/src/streams/pdf/pdfparser.cpp 2007-04-02 20:35:23.000000000 +0200
++++ strigi-0.5.1.new/src/streams/pdf/pdfparser.cpp 2007-05-12 12:38:30.000000000 +0200
+@@ -23,6 +23,7 @@
+ #include "gzipinputstream.h"
+ #include "subinputstream.h"
+ #include <ctype.h>
++#include <cctype>
+
+ using namespace std;
+ using namespace Strigi;
+diff -Nur strigi-0.5.1/src/streams/pdf/pdftest.cpp strigi-0.5.1.new/src/streams/pdf/pdftest.cpp
+--- strigi-0.5.1/src/streams/pdf/pdftest.cpp 2007-04-02 20:35:23.000000000 +0200
++++ strigi-0.5.1.new/src/streams/pdf/pdftest.cpp 2007-05-12 12:38:58.000000000 +0200
+@@ -23,6 +23,7 @@
+ #include "gzipinputstream.h"
+ #include "kmpsearcher.h"
+ #include <ctype.h>
++#include <cctype>
+ extern "C" {
+ #include <magic.h>
+ }
+diff -Nur strigi-0.5.1/src/streams/substreamprovider.h strigi-0.5.1.new/src/streams/substreamprovider.h
+--- strigi-0.5.1/src/streams/substreamprovider.h 2007-04-02 20:35:23.000000000 +0200
++++ strigi-0.5.1.new/src/streams/substreamprovider.h 2007-05-12 12:40:45.000000000 +0200
+@@ -20,6 +20,7 @@
+ #ifndef SUBSTREAMPROVIDER
+ #define SUBSTREAMPROVIDER
+
++#include <cstdlib>
+ #include <string>
+ #include "strigiconfig.h"
+ #include "streambase.h"
Deleted: kde-extras/strigi/trunk/debian/patches/Bug417714-GCC4.3.diff
Modified: kde-extras/strigi/trunk/debian/rules
===================================================================
--- kde-extras/strigi/trunk/debian/rules 2007-05-12 07:06:11 UTC (rev 6161)
+++ kde-extras/strigi/trunk/debian/rules 2007-05-12 19:14:03 UTC (rev 6162)
@@ -9,7 +9,7 @@
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CMAKE_EXTRA_FLAGS = -DENABLE_DBUS:BOOL=ON -DENABLE_INOTIFY:BOOL=OFF -DENABLE_LOG4CXX:BOOL=ON
+#DEB_CMAKE_EXTRA_FLAGS = -DENABLE_DBUS:BOOL=ON -DENABLE_INOTIFY:BOOL=OFF -DENABLE_LOG4CXX:BOOL=OFF
DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
get-orig-source:
Modified: kde-extras/strigi/trunk/debian/strigi-utils.install
===================================================================
--- kde-extras/strigi/trunk/debian/strigi-utils.install 2007-05-12 07:06:11 UTC (rev 6161)
+++ kde-extras/strigi/trunk/debian/strigi-utils.install 2007-05-12 19:14:03 UTC (rev 6162)
@@ -1,3 +1,4 @@
usr/bin/deepfind
usr/bin/deepgrep
+usr/bin/strigicmd
usr/bin/xmlindexer
More information about the pkg-kde-commits
mailing list