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

[Fathi Boudra]

Author: fboudra-guest
Date: 2007-10-28 14:07:17 +0000 (Sun, 28 Oct 2007)
New Revision: 7695

Added:
   kde-extras/strigi/trunk/debian/patches/01_strigi_branch_r729946.diff
Removed:
   kde-extras/strigi/trunk/debian/patches/01_strigi_branch_r727526.diff
Modified:
   kde-extras/strigi/trunk/debian/changelog
   kde-extras/strigi/trunk/debian/control
   kde-extras/strigi/trunk/debian/libstreamanalyzer-dev.install
   kde-extras/strigi/trunk/debian/patches/series
Log:
Prepare Strigi 0.5.7-1.

  * New upstream release.
  * Update branch pull patch to r729946.
  * Add query.h, queryparser.h and variant.h to libstreamanalyzer-dev package.
  * Add Dm-Upload-Allowed for Debian Maintainer uploads.



Modified: kde-extras/strigi/trunk/debian/changelog
===================================================================
--- kde-extras/strigi/trunk/debian/changelog	2007-10-28 14:05:27 UTC (rev 7694)
+++ kde-extras/strigi/trunk/debian/changelog	2007-10-28 14:07:17 UTC (rev 7695)
@@ -1,3 +1,12 @@
+strigi (0.5.7-1) unstable; urgency=low
+
+  * New upstream release.
+  * Update branch pull patch to r729946.
+  * Add query.h, queryparser.h and variant.h to libstreamanalyzer-dev package.
+  * Add Dm-Upload-Allowed for Debian Maintainer uploads.
+
+ -- Fathi Boudra <fboudra at free.fr>  Fri, 26 Oct 2007 19:15:00 +0200
+
 strigi (0.5.6-1) unstable; urgency=low
 
   * New upstream release.

Modified: kde-extras/strigi/trunk/debian/control
===================================================================
--- kde-extras/strigi/trunk/debian/control	2007-10-28 14:05:27 UTC (rev 7694)
+++ kde-extras/strigi/trunk/debian/control	2007-10-28 14:07:17 UTC (rev 7695)
@@ -8,6 +8,7 @@
  libexiv2-dev, libqt4-dev, libxml2-dev, zlib1g-dev, libxml2-utils,
  python-support, python
 Standards-Version: 3.7.2
+XS-Dm-Upload-Allowed: yes
 
 Package: strigi-daemon
 Architecture: any

Modified: kde-extras/strigi/trunk/debian/libstreamanalyzer-dev.install
===================================================================
--- kde-extras/strigi/trunk/debian/libstreamanalyzer-dev.install	2007-10-28 14:05:27 UTC (rev 7694)
+++ kde-extras/strigi/trunk/debian/libstreamanalyzer-dev.install	2007-10-28 14:07:17 UTC (rev 7695)
@@ -9,6 +9,8 @@
 usr/include/strigi/indexplugin.h
 usr/include/strigi/indexreader.h
 usr/include/strigi/indexwriter.h
+usr/include/strigi/query.h
+usr/include/strigi/queryparser.h
 usr/include/strigi/streamanalyzer.h
 usr/include/strigi/streamanalyzerfactory.h
 usr/include/strigi/streamendanalyzer.h
@@ -16,5 +18,6 @@
 usr/include/strigi/streamlineanalyzer.h
 usr/include/strigi/streamsaxanalyzer.h
 usr/include/strigi/streamthroughanalyzer.h
+usr/include/strigi/variant.h
 usr/lib/libstreamanalyzer.so
 usr/lib/pkgconfig/libstreamanalyzer.pc

Deleted: kde-extras/strigi/trunk/debian/patches/01_strigi_branch_r727526.diff

Added: kde-extras/strigi/trunk/debian/patches/01_strigi_branch_r729946.diff
===================================================================
--- kde-extras/strigi/trunk/debian/patches/01_strigi_branch_r729946.diff	                        (rev 0)
+++ kde-extras/strigi/trunk/debian/patches/01_strigi_branch_r729946.diff	2007-10-28 14:07:17 UTC (rev 7695)
@@ -0,0 +1,49 @@
+--- a/src/luceneindexer/luceneindexer.cpp
++++ b/src/luceneindexer/luceneindexer.cpp
+@@ -36,19 +36,20 @@
+     }
+     return false;
+ }
+-void
++bool
+ checkIndexdirIsEmpty(const char* dir) {
+     DIR* d = opendir(dir);
+-    if (!d) return;
++    if (!d) return false;
+     struct dirent* de = readdir(d);
+     while (de) {
+         if (strcmp(de->d_name, "..") && strcmp(de->d_name, ".")) {
+             fprintf(stderr, "Directory %s is not empty.\n", dir);
+-            exit(1);
++            return false;
+         }
+         de = readdir(d);
+     }
+     closedir(d);
++    return true;
+ }
+ int
+ main(int argc, char **argv) {
+@@ -57,7 +58,9 @@
+         return -1;
+     }
+ 
+-    checkIndexdirIsEmpty(argv[1]);
++    if (!checkIndexdirIsEmpty(argv[1])) {
++        return 1;
++    }
+ 
+     vector<pair<bool,string> >filters;
+     filters.push_back(make_pair<bool,string>(false,".*/"));
+--- a/src/streamanalyzer/variant.cpp
++++ b/src/streamanalyzer/variant.cpp
+@@ -64,7 +64,9 @@
+ Variant::Variant(const Variant& v) :p(new VariantPrivate(*v.p)) {
+ }
+ Variant::~Variant() {
++  delete p;
+ }
++
+ Variant::Type
+ Variant::type() const { return p->vartype; }
+ const Variant&

Modified: kde-extras/strigi/trunk/debian/patches/series
===================================================================
--- kde-extras/strigi/trunk/debian/patches/series	2007-10-28 14:05:27 UTC (rev 7694)
+++ kde-extras/strigi/trunk/debian/patches/series	2007-10-28 14:07:17 UTC (rev 7695)
@@ -1 +1 @@
-01_strigi_branch_r727526.diff
+01_strigi_branch_r729946.diff