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 There are Personal Package Archives on launchpad.net for
Xapian,
-
+
Recoll and kio-recoll. 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:
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
Mandriva linux one 2010 with Qt 4 and a static link to Xapian 1.2.3 with the --without-sse configure option.: - - recoll-1.15.0-1mdv2008.1.i586.rpm. + + recoll-1.15.0-1mdv2010.2.i586.rpm. Source: - - recoll-1.15.0-1mdv2008.1.src.rpm + + recoll-1.15.0-1mdv2010.2.src.rpm
@@ -286,8 +286,8 @@ sudo add-apt-repository ppa:recoll-backports/ppaThe 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).
-FreeBSD 7.3 i386 Qt 4.6.1. Statically linked to - Xapian 1.2.3 with --disable-sse: +
FreeBSD 7.3 i386 Qt 4.7.1 Statically linked to + Xapian 1.2.3 with --disable-sse: recoll-1.15.0-FreeBSD-7.3-STABLE.tgz