From 52fa332239b2341666e72023f71e94f4b4a7b899 Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jfd@recoll.org>
Date: Mon, 14 Feb 2011 20:30:34 +0100
Subject: [PATCH] 1.15.2

---
 src/VERSION                 |  2 +-
 src/index/fsindexer.cpp     |  2 +-
 website/BUGS.html           |  7 ++++++-
 website/download.html       |  2 +-
 website/features.html       |  6 +++---
 website/index.html.en       |  4 ++--
 website/index.html.fr       |  4 ++--
 website/release-1.15.0.html | 12 +++++++++---
 8 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/src/VERSION b/src/VERSION
index ace44233..42cf0675 100644
--- a/src/VERSION
+++ b/src/VERSION
@@ -1 +1 @@
-1.15.1
+1.15.2
diff --git a/src/index/fsindexer.cpp b/src/index/fsindexer.cpp
index d043ddeb..b764baff 100644
--- a/src/index/fsindexer.cpp
+++ b/src/index/fsindexer.cpp
@@ -266,7 +266,7 @@ bool FsIndexer::purgeFiles(list<string>& files)
 // Local fields can be set for fs subtrees in the configuration file 
 void FsIndexer::localfieldsfromconf()
 {
-    LOGDEB(("FsIndexer::localfieldsfromconf\n"));
+    LOGDEB0(("FsIndexer::localfieldsfromconf\n"));
     m_localfields.clear();
     m_config->addLocalFields(&m_localfields);
 }
diff --git a/website/BUGS.html b/website/BUGS.html
index 144b6fee..4e7d5cdc 100644
--- a/website/BUGS.html
+++ b/website/BUGS.html
@@ -35,8 +35,13 @@
           supposedly fixed in later versions. Bugs listed in the
           topmost section may also exist in older versions.</i></p>
 
-      <h2><a name="b_latest">recoll 1.14.4 + xapian 1.2+ + qt 4.4.1+</a></h2> 
+      <h2><a name="b_latest">recoll 1.15</a></h2> 
       <ul>
+        <li>After an upgrade, the recoll GUI sometimes crashes on
+          startup. This is fixed by removing (back it up just in case)
+          ~/.config/Recoll.org/recoll.conf, the QSettings storage for
+          recoll.</li> 
+
 	<li>The new mutagen-based audio tags filter (rclaudio) only
 	  works with very recent mutagen
 	  versions. See <a href="filters/filters.html">here</a> for a
diff --git a/website/download.html b/website/download.html
index f7011be0..c7728448 100644
--- a/website/download.html
+++ b/website/download.html
@@ -186,7 +186,7 @@
 	Recoll package will have a static link to Xapian so that you
 	do not need to build/install it separately.</p>
 
-      <h3>Ubuntu</h3>
+      <h3><a name="ubuntu">Ubuntu</h3>
       <blockquote>
       <p>There are Personal Package Archives on launchpad.net for 
        <a href="http://www.launchpad.net/~xapian-backports/+archive/ppa">
diff --git a/website/features.html b/website/features.html
index d75c4a27..ef316f93 100644
--- a/website/features.html
+++ b/website/features.html
@@ -148,8 +148,8 @@
         "http://libwpd.sourceforge.net">libwpd</a>.</li>
 
         <li><span class="literal">postscript</span> with <a href=
-        "http://www.gnu.org/software/ghostscript/ghostscript.html">ghostscript</a>
-        and <a href=
+        "http://www.gnu.org/software/ghostscript/ghostscript.html">
+            ghostscript</a> and <a href=
         "http://www.cs.wisc.edu/~ghost/doc/pstotext.htm">pstotext</a>.
         Actually the pstotext 1.9 found at the latter link has a
         problem with file names using special shell characters, and
@@ -170,7 +170,7 @@
         for indexing, ie, russian or chinese RTF files, I have
         produced a modified version which works much better (as
         indicated by my tests and a few external ones). You can
-        download the <a href="unrtf/unrtf-0.22.0beta.tar.gz">source
+        download the <a href="unrtf/unrtf-0.22.2beta.tar.gz">source
         here</a>. The development is hosted
         on <a href="http://www.bitbucket.org/medoc/unrtf-int">
          bitbucket.org</a>.</li>  
diff --git a/website/index.html.en b/website/index.html.en
index bb405355..1b0f9f3f 100644
--- a/website/index.html.en
+++ b/website/index.html.en
@@ -47,7 +47,7 @@
 
       <p><span class="application">Recoll</span> is free, open source,
 	and licensed under the GPL. The current version is
-	<a class="important" href="download.html">1.15.1</a> 
+	<a class="important" href="download.html">1.15.2</a> 
 	(<a href="release-1.15.0.html">Release notes</a>).</p>
 
       <h2>Features: </h2>
@@ -90,7 +90,7 @@
 
       <h2>News: </h2>
       <ul>
-	<li>2011-02-02 : Recoll <a href="download.html#source">1.15.1</a> is
+	<li>2011-02-02 : Recoll <a href="download.html#source">1.15.2</a> is
 	  out. This brings important GUI improvements, with a new
 	  switchable table-based result list, and direct access to sort
 	  functions. See the <a href="release-1.15.0.html">Release notes</a>.
diff --git a/website/index.html.fr b/website/index.html.fr
index f1bc1b9e..9a97c692 100644
--- a/website/index.html.fr
+++ b/website/index.html.fr
@@ -48,7 +48,7 @@
       <p><span class="application">Recoll</span> est un logiciel libre
 	gratuit, dont le code source est disponible sous licence GPL.
 	La dernière version est 
-        <a class="important" href="download.html">1.15.0</a>
+        <a class="important" href="download.html">1.15.2</a>
 	(<a href="release-1.15.0.html">notes sur la version, en
 	anglais</a>)</p> 
 
@@ -100,7 +100,7 @@
 
       <h2>Nouvelles: </h2>
       <ul>
-	<li>2011-02-02 : Recoll <a href="download.html#source">1.15.0</a>
+	<li>2011-02-02 : Recoll <a href="download.html#source">1.15.2</a>
 	  vient de sortir. Cette version enrichit notablement
 	  l'interface graphique, avec un mode table optionnel pour la
 	  liste de résultats. Voir les 
diff --git a/website/release-1.15.0.html b/website/release-1.15.0.html
index ad2e796f..0fc11a23 100644
--- a/website/release-1.15.0.html
+++ b/website/release-1.15.0.html
@@ -29,13 +29,19 @@
     
     <div class="content">
 
-      <h1>Release notes for Recoll 1.15.0/1.15.1</h1>
+      <h1>Release notes for Recoll 1.15.0/1.15.2</h1>
 
-      <p><em>Note: 1.15.1 is identical to 1.15.0 except for a very
+      <p><em>Notes:</em> 1.15.1 is identical to 1.15.0 except for a very
           small modification to allow building with qt 4.4.</em></p>
 
       <h2>Caveats</h2>
-      
+
+      <p>There have been reports of the recoll 1.15 GUI crashing when
+        starting up after an upgrade. This was fixed by making a
+        backup of ~/.config/Recoll.org/recoll.conf and deleting it (Qt
+        stores the QSettings for the recoll GUI in this file, things
+        like the search history and mix GUI options).</p>
+
       <p>The support for Qt 3 has been removed in this version which
         uses only native Qt 4 interfaces. If your system has no
         support for Qt 4.4 or newer, you need to stick