From 95c86aa5736d654b327243f1f1e2faf9f36031a9 Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jfd@recoll.org>
Date: Tue, 26 Nov 2013 08:15:07 +0100
Subject: [PATCH] Doc. Commit history note for my future understanding: the
 19_MAINT branch was abandonned at this point.  There is not enough new
 development in trunk to justify version 1.20, and what there is has seen
 quite a lot of test (mostly the code refactoring necessitated by the optional
 "update only ext attr metadata" feature). OTOH the python3 code needs to come
 out to support the new Unity scope, and I was too lazy to merge it the 19
 branch (also a bit too much mod for a "maintenance" branch). So what would
 have been 1.20.0 comes out as 1.19.10, on the trunk.

---
 website/download.html     |  7 ++++---
 website/index.html.en     |  7 ++++++-
 website/index.html.fr     |  7 ++++++-
 website/release-1.19.html | 15 +++++++++++++++
 4 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/website/download.html b/website/download.html
index d2a351a3..c1bf01d6 100644
--- a/website/download.html
+++ b/website/download.html
@@ -67,7 +67,7 @@ function showdiv(viewid)
 <div id="general">
 <h2><a name="general">General information</a></h2>
 
-<p>The current version is 1.19.9. <a href="release-1.19.html">Release
+<p>The current version is 1.19.10. <a href="release-1.19.html">Release
 notes</a>.</p>
 
 <p>The download page for Recoll 1.18 is <a href="download-1.18.html">still
@@ -117,12 +117,12 @@ is probably no necessity to upgrade anyway.</p>
 <div id="source">
 <h2><a name="source">Source</a></h2>
 
-<h3>Current release distribution: 1.19.9:</h3>
+<h3>Current release distribution: 1.19.10:</h3>
 <!-- Attention: source packages must remain here, not in a
 subdirectory, because of all the places they're referred from
 (package watches) -->
 
-<p><a href="recoll-1.19.9.tar.gz">recoll-1.19.9.tar.gz</a>. </p>
+<p><a href="recoll-1.19.10.tar.gz">recoll-1.19.10.tar.gz</a>. </p>
 <!--
 <h3>Snapshot</h3>
 <p>I sometimes release a source tarfile when I consider that the
@@ -182,6 +182,7 @@ branch for the current production version.</p>
 <h3>Older recoll releases:</h3>
 
 <p>
+<a href="recoll-1.19.9.tar.gz">1.19.9</a>. 
 <a href="recoll-1.19.8.tar.gz">1.19.8</a>. 
 <a href="recoll-1.19.7.tar.gz">1.19.7</a>. 
 <a href="recoll-1.19.5.tar.gz">1.19.5</a>. 
diff --git a/website/index.html.en b/website/index.html.en
index 02d4a737..db54a933 100644
--- a/website/index.html.en
+++ b/website/index.html.en
@@ -52,7 +52,7 @@
         <li><a href="features.html">Detailed features</a>.
       </ul>
       <p>The current <span class="application">Recoll</span> version is
-	<a href="download.html">1.19.9</a> 
+	<a href="download.html">1.19.10</a> 
 	(<a href="release-1.19.html">Release notes</a>,
         <a href="BUGS.html">known bugs</a>).</p>
 
@@ -88,6 +88,11 @@
       
       <dl>
 
+        <dt>2013-11-25</dt> <dd>Release 1.19.10 is out. This brings a
+          Unity Scope for Ubuntu 13.10, python3 compatibility, and a
+          new and much improved filter for PowerPoint (.ppt)
+          files.</dd>
+
         <dt>2013-11-19</dt> <dd>A <a href="filters/filters.html">new
             filter</a> for PowerPoint files. The previous one was
           based on the ancient <b>catppt</b> from the <b>catdoc</b>
diff --git a/website/index.html.fr b/website/index.html.fr
index e42dc811..de735c04 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.19.8</a>
+        <a class="important" href="download.html">1.19.10</a>
 	(<a href="release-1.19.html">notes sur la version, en
 	anglais</a>)</p> 
 
@@ -102,6 +102,11 @@
       <h2>Nouvelles: </h2>
       <dl>
 
+        <dt>2013-11-25</dt> <dd> La version 1.19.10 est sortie. Elle
+          apporte un Scope pour le Dash de Ubuntu Unity (am I still
+          speaking French here ?), la compatibilité Python3, et un
+          nouveau filtre pour les fichiers PowerPoint.</dd>
+
         <dt>2013-11-19</dt> <dd>Un <a href="filters/filters.html">nouveau
             filtre</a> pour les fichiers PowerPoint. L'ancien était
             basé sur le vénérable <b>catppt</b> de <b>catdoc</b>, et,
diff --git a/website/release-1.19.html b/website/release-1.19.html
index 5a6e00ca..9acbf9bb 100644
--- a/website/release-1.19.html
+++ b/website/release-1.19.html
@@ -63,6 +63,21 @@ Configuration</em> menu.</p>
 
 <h2><a name="minor_releases">Minor releases at a glance</a></h2>
 <ul>
+  <li>1.19.10 has a bit more changes than
+    usually goes into a Recoll minor version, and could have been
+    1.20.0 instead. On the other hand, it
+    brings some features which needed to be released, and did not
+    really warrant a major version. So here goes:
+    <ul>
+      <li>Python3 compatibility for the Python Recoll module.</li>
+      <li>A Ubuntu Unity Scope for saucy (13.10), replacing the
+        lens (and which needed Python 3).</li>
+      <li>A new PPT format text extractor. Catppt just did not extract
+        anything from more recent .ppt files.</li>
+    </ul> Mostly, if you are not running Ubuntu (Saucy or later), you
+    can just <a href="filters/filters.html">download the ppt
+    filter</a> and stay with 1.19.9. 
+  </li>
   <li>1.19.9 fixes a few <a href="BUGS.html#b_1_19_8">bugs</a>.</li>
   <li>1.19.8 changes the way we handle Hindi / Devanagari
     text (no more stripping of diacritics), and also has a fix for the