From 2152a5ef85998f3f14cc63525d866b65a03e73cc Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jfd@recoll.org>
Date: Wed, 2 Feb 2011 16:33:37 +0100
Subject: [PATCH] fix qt4.4 compile issue

---
 packaging/debian/buildppa.sh | 13 +++++++++----
 src/VERSION                  |  2 +-
 src/qtgui/restable.cpp       |  5 +++--
 website/download.html        | 16 ++++++++--------
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/packaging/debian/buildppa.sh b/packaging/debian/buildppa.sh
index 609f89ab..eb5845e5 100644
--- a/packaging/debian/buildppa.sh
+++ b/packaging/debian/buildppa.sh
@@ -7,6 +7,11 @@
 RCLVERS=1.15.0
 PPAVERS=1
 
+case $RCLVERS in
+    1.14*) PPANAME=recoll-ppa;;
+    *)     PPANAME=recoll15-ppa;;
+esac
+
 ########## QT3
 series3=""
 case $RCLVERS in
@@ -23,7 +28,7 @@ if test X$series3 != X; then
     sed -e s/SERIES/$series/g < ${debdir}/changelog > \
         recoll-${RCLVERS}/debian/changelog ;
     (cd recoll-${RCLVERS};debuild -S -sa) || break
-    dput recoll-ppa recoll_${RCLVERS}-0~ppa${PPAVERS}~${series}1_source.changes
+    dput $PPANAME recoll_${RCLVERS}-0~ppa${PPAVERS}~${series}1_source.changes
   done
 fi
 
@@ -45,12 +50,12 @@ for series in $series4 ; do
   sed -e s/SERIES/$series/g < ${debdir}/changelog > \
     recoll-${RCLVERS}/debian/changelog ;
   (cd recoll-${RCLVERS};debuild -S -sa)  || break
-  dput recoll-ppa recoll_${RCLVERS}-0~ppa${PPAVERS}~${series}1_source.changes
+  dput $PPANAME recoll_${RCLVERS}-0~ppa${PPAVERS}~${series}1_source.changes
 done
 
 ### KIO
 seriesk=""
-seriesk="jaunty karmic lucid maverick"
+seriesk="jaunty karmic lucid maverick natty"
 
 debdir=debiankio
 rm -rf recoll-${RCLVERS}/debian
@@ -59,5 +64,5 @@ for series in $seriesk ; do
   sed -e s/SERIES/$series/g < ${debdir}/changelog > \
     recoll-${RCLVERS}/debian/changelog ;
   (cd recoll-${RCLVERS};debuild -S -sa) || break
-  dput recoll-ppa kio-recoll_${RCLVERS}-0~ppa${PPAVERS}~${series}1_source.changes
+  dput $PPANAME kio-recoll_${RCLVERS}-0~ppa${PPAVERS}~${series}1_source.changes
 done
diff --git a/src/VERSION b/src/VERSION
index 141f2e80..ace44233 100644
--- a/src/VERSION
+++ b/src/VERSION
@@ -1 +1 @@
-1.15.0
+1.15.1
diff --git a/src/qtgui/restable.cpp b/src/qtgui/restable.cpp
index 7e6379e1..9aeec3f4 100644
--- a/src/qtgui/restable.cpp
+++ b/src/qtgui/restable.cpp
@@ -217,8 +217,9 @@ int RecollModel::columnCount(const QModelIndex&) const
 void RecollModel::readDocSource()
 {
     LOGDEB(("RecollModel::readDocSource()\n"));
-    beginResetModel();
-    endResetModel();
+    reset();
+//    beginResetModel();
+//    endResetModel();
 }
 
 void RecollModel::setDocSource(RefCntr<DocSequence> nsource)
diff --git a/website/download.html b/website/download.html
index 934c0fd4..d9a94caf 100644
--- a/website/download.html
+++ b/website/download.html
@@ -188,7 +188,7 @@
       <p>There are Personal Package Archives on launchpad.net for 
        <a href="http://www.launchpad.net/~xapian-backports/+archive/ppa">
        Xapian</a>, 
-       <a  href="http://www.launchpad.net/~recoll-backports/+archive/ppa">
+       <a  href="https://launchpad.net/~recoll-backports/+archive/recoll-1.15-on">
        Recoll and kio-recoll</a>. These were built from the latest versions,
        for a set of Ubuntu series. You just need to add the
        PPAs to your system software sources (the instructions are on
@@ -209,7 +209,7 @@ gpg --export --armor  A0735AD0 | sudo apt-key add -
        procedure: 
 <pre><tt>
 sudo add-apt-repository ppa:xapian-backports/ppa
-sudo add-apt-repository ppa:recoll-backports/ppa
+sudo add-apt-repository ppa:recoll-backports/recoll-1.15-on
 </tt></pre>
        </p>
       </blockquote>
@@ -263,11 +263,11 @@ sudo add-apt-repository ppa:recoll-backports/ppa
 
         <p><b>Mandriva linux one 2010 with Qt 4 and a static link to
             Xapian 1.2.3 with the --without-sse configure option.</b>: 
-	  <a href="mandriva2010/recoll-1.15.0-1mdv2008.1.i586.rpm">
-	  recoll-1.15.0-1mdv2008.1.i586.rpm</a>. 
+	  <a href="mandriva2010/recoll-1.15.0-1mdv2010.2.i586.rpm">
+	  recoll-1.15.0-1mdv2010.2.i586.rpm</a>. 
 	Source: 
-	<a href="mandriva2008spring/recoll-1.15.0-1mdv2008.1.src.rpm">
-	  recoll-1.15.0-1mdv2008.1.src.rpm</a>
+	<a href="mandriva2010/recoll-1.15.0-1mdv2010.2.src.rpm">
+	  recoll-1.15.0-1mdv2010.2.src.rpm</a>
         </p>
       </blockquote>
 
@@ -286,8 +286,8 @@ sudo add-apt-repository ppa:recoll-backports/ppa
         <p>The FreeBSD ports track the Recoll releases quite
         closely, so there is actually little point in using the
         following (except that the port is currently (10-2010) broken).</p>
-          <p><b>FreeBSD 7.3 i386 Qt 4.6.1. Statically linked to
-          Xapian 1.2.3 with --disable-sse</b>: 
+        <p><b>FreeBSD 7.3 i386 Qt 4.7.1</b> Statically linked to
+          Xapian 1.2.3 with --disable-sse: 
 	   <a href="freebsd/recoll-1.15.0-FreeBSD-7.3-STABLE.tgz">
 	     recoll-1.15.0-FreeBSD-7.3-STABLE.tgz</a>
         </p>