rev 18964 - in kde-extras/strigi/trunk/debian: . patches

[Fathi Boudra]

Author: fabo
Date: 2011-09-23 09:03:41 +0000 (Fri, 23 Sep 2011)
New Revision: 18964

Added:
   kde-extras/strigi/trunk/debian/patches/
   kde-extras/strigi/trunk/debian/patches/Revert_patch_that_breaks_parsing_of_PDF_files.patch
   kde-extras/strigi/trunk/debian/patches/series
Modified:
   kde-extras/strigi/trunk/debian/changelog
   kde-extras/strigi/trunk/debian/control
Log:
* Add Revert_patch_that_breaks_parsing_of_PDF_files.patch from upstream.
  (Closes: #642318)
* Improve strigi-daemon descritpion. (Closes: #571297)



Modified: kde-extras/strigi/trunk/debian/changelog
===================================================================
--- kde-extras/strigi/trunk/debian/changelog	2011-09-20 15:21:46 UTC (rev 18963)
+++ kde-extras/strigi/trunk/debian/changelog	2011-09-23 09:03:41 UTC (rev 18964)
@@ -1,3 +1,11 @@
+strigi (0.7.6-2) unstable; urgency=low
+
+  * Add Revert_patch_that_breaks_parsing_of_PDF_files.patch from upstream.
+    (Closes: #642318)
+  * Improve strigi-daemon descritpion. (Closes: #571297)
+
+ -- Fathi Boudra <fabo at debian.org>  Fri, 23 Sep 2011 10:42:37 +0300
+
 strigi (0.7.6-1) unstable; urgency=low
 
   * New upstream release.

Modified: kde-extras/strigi/trunk/debian/control
===================================================================
--- kde-extras/strigi/trunk/debian/control	2011-09-20 15:21:46 UTC (rev 18963)
+++ kde-extras/strigi/trunk/debian/control	2011-09-23 09:03:41 UTC (rev 18964)
@@ -38,12 +38,9 @@
   * 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 D-Bus 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.
+  * clucene backend
+  * DBus and socket interfaces are available for communication between daemon
+    and search programs
   * 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

Added: kde-extras/strigi/trunk/debian/patches/Revert_patch_that_breaks_parsing_of_PDF_files.patch
===================================================================
--- kde-extras/strigi/trunk/debian/patches/Revert_patch_that_breaks_parsing_of_PDF_files.patch	                        (rev 0)
+++ kde-extras/strigi/trunk/debian/patches/Revert_patch_that_breaks_parsing_of_PDF_files.patch	2011-09-23 09:03:41 UTC (rev 18964)
@@ -0,0 +1,29 @@
+commit 23d5ce636b7897dc3f233a5293f3164dac50566d
+Author: Jos van den Oever <jos at vandenoever.info>
+Date:   Sun Jul 31 12:32:44 2011 +0200
+
+    Revert patch that breaks parsing of PDF files.
+    The offending patch was 672c8b7b3cb4400bc505421f4cc70cf742ed9df0.
+
+---
+ libstreamanalyzer/lib/pdf/pdfparser.cpp |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- a/libstreamanalyzer/lib/pdf/pdfparser.cpp
++++ b/libstreamanalyzer/lib/pdf/pdfparser.cpp
+@@ -35,12 +35,13 @@ StreamStatus
+ PdfParser::read(int32_t min, int32_t max) {
+     int32_t off = (int32_t)(pos-start);
+     int32_t d = (int32_t)(stream->position() - bufferStart);
+-    bufferStart += off;
++    min += d;
++    if (max > 0) max += d;
+     stream->reset(bufferStart);
+     int32_t n = stream->read(start, min, max);
+ //    printf("objstart %i %i\n", d, n);
+     if (n < min) return stream->status();
+-    pos = start;
++    pos = start + off;
+     end = start + n;
+     return Ok;
+ }

Added: kde-extras/strigi/trunk/debian/patches/series
===================================================================
--- kde-extras/strigi/trunk/debian/patches/series	                        (rev 0)
+++ kde-extras/strigi/trunk/debian/patches/series	2011-09-23 09:03:41 UTC (rev 18964)
@@ -0,0 +1 @@
+Revert_patch_that_breaks_parsing_of_PDF_files.patch