From 6a8b1d283fdde431c5375a0be7779b72dd87b36c Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jfd@recoll.org>
Date: Wed, 2 Feb 2011 18:17:11 +0100
Subject: [PATCH] doc/web

---
 packaging/debian/buildppa.sh            |  2 +-
 packaging/debian/debianrclqt4/changelog |  4 ++++
 website/download.html                   | 11 +++++++----
 website/index.html.en                   |  4 ++--
 website/release-1.15.0.html             |  7 +++++--
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/packaging/debian/buildppa.sh b/packaging/debian/buildppa.sh
index eb5845e5..5b50768c 100644
--- a/packaging/debian/buildppa.sh
+++ b/packaging/debian/buildppa.sh
@@ -4,7 +4,7 @@
 # For the kio: (and kdesdk?)
 # sudo apt-get install pkg-kde-tools  cdbs
 
-RCLVERS=1.15.0
+RCLVERS=1.15.1
 PPAVERS=1
 
 case $RCLVERS in
diff --git a/packaging/debian/debianrclqt4/changelog b/packaging/debian/debianrclqt4/changelog
index e2fbd4ec..f8983486 100644
--- a/packaging/debian/debianrclqt4/changelog
+++ b/packaging/debian/debianrclqt4/changelog
@@ -1,3 +1,7 @@
+recoll (1.15.1-0~ppa1~SERIES1) SERIES; urgency=low
+  * Updated package to recoll version 1.15.1 (fixes qt 4.4 build issue on karmic)
+ -- Jean-Francois Dockes <jf@dockes.org>  Wed, 02 Feb 2011 15:48:00 +0200
+
 recoll (1.15.0-0~ppa1~SERIES1) SERIES; urgency=low
   * Updated package to recoll version 1.15.0
  -- Jean-Francois Dockes <jf@dockes.org>  Wed, 02 Feb 2011 09:48:00 +0200
diff --git a/website/download.html b/website/download.html
index d9a94caf..f7011be0 100644
--- a/website/download.html
+++ b/website/download.html
@@ -50,8 +50,11 @@
 
       <h2><a>General information</a></h2>
 
-      <p>The current version is 1.15.0. <a href="release-1.15.0.html">
+      <p>The current version is 1.15.1. <a href="release-1.15.0.html">
           Release notes</a>.</p>
+       <p>Note: 1.15.0 and 1.15.1 are almost identical. 1.15.1 has a
+         small fix to allow building with Qt 4.4. The binary packages
+         were not rebuilt and are mostly 1.15.0.</p>
 
       <p>The download page for Recoll 1.14 is
 	<a href="download-1.14.html">still available</a>.</p>
@@ -101,12 +104,12 @@
 
       <h2><a name="source">Source</a></h2>
 
-      <h3>Current release distribution: 1.15.0:</h3> 
+      <h3>Current release distribution: 1.15.1:</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.15.0.tar.gz">recoll-1.15.0.tar.gz</a>.</p>
-       
+       <p><a href="recoll-1.15.1.tar.gz">recoll-1.15.1.tar.gz</a>.</p>
+
       <h3>Prerequisites for building from source:</h3>
         <ul>
 	 <li>C++ compiler. Its absence sometimes manifests itself by
diff --git a/website/index.html.en b/website/index.html.en
index 4c53445b..bb405355 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.0</a> 
+	<a class="important" href="download.html">1.15.1</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.0</a> is
+	<li>2011-02-02 : Recoll <a href="download.html#source">1.15.1</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/release-1.15.0.html b/website/release-1.15.0.html
index d688f082..ad2e796f 100644
--- a/website/release-1.15.0.html
+++ b/website/release-1.15.0.html
@@ -29,10 +29,13 @@
     
     <div class="content">
 
-      <h1>Release notes for Recoll 1.15.0</h1>
+      <h1>Release notes for Recoll 1.15.0/1.15.1</h1>
+
+      <p><em>Note: 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>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