From e7dc2d4ce7087fd2679c80544fdd39ef9815d797 Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes
Date: Fri, 19 Dec 2014 09:52:59 +0100
Subject: [PATCH] release 1.20.1 web and packaging
---
packaging/debian/buildppa.sh | 21 +++++++++++----------
packaging/debian/debian/changelog | 7 +++++++
packaging/debian/debiankio/changelog | 4 ++++
packaging/debian/debiankio/control | 2 +-
packaging/rpm/recollfedora.spec | 5 ++++-
website/download.html | 28 ++++++++++++++--------------
website/release-1.20.html | 13 ++++++++-----
7 files changed, 49 insertions(+), 31 deletions(-)
diff --git a/packaging/debian/buildppa.sh b/packaging/debian/buildppa.sh
index 7a997bca..fe0582dd 100644
--- a/packaging/debian/buildppa.sh
+++ b/packaging/debian/buildppa.sh
@@ -4,13 +4,13 @@
# For the kio: (and kdesdk?)
# sudo apt-get install pkg-kde-tools cdbs
-RCLVERS=1.19.14p2
+RCLVERS=1.20.1
LENSVERS=1.19.10.3543
SCOPEVERS=1.19.12
-PPAVERS=1
+PPAVERS=2
# For the unity-scope debian directory
-RCLSRC=/home/dockes/projets/fulltext/recoll/src
+RCLSRC=/y/home/dockes/projets/fulltext/recoll/src
case $RCLVERS in
[23]*) PPANAME=recollexp-ppa;;
@@ -41,8 +41,8 @@ check_recoll_orig()
####### QT4
debdir=debian
# Note: no new releases for lucid: no webkit. Or use old debianrclqt4 dir.
-series="precise quantal raring saucy trusty utopic"
-series=
+series="precise trusty utopic"
+#series=
if test "X$series" != X ; then
check_recoll_orig
@@ -70,8 +70,8 @@ for series in $series ; do
done
### KIO
-series="precise quantal raring saucy trusty utopic"
-series=utopic
+series="precise trusty utopic"
+#series=
debdir=debiankio
topdir=kio-recoll-${RCLVERS}
@@ -105,7 +105,7 @@ for series in $series ; do
done
### Unity Lens
-series="precise quantal raring"
+series="precise"
series=
debdir=debianunitylens
@@ -140,11 +140,12 @@ for series in $series ; do
done
### Unity Scope
-series="saucy trusty utopic"
-series=utopic
+series="trusty utopic"
+series=
debdir=debianunityscope
if test ! -d ${debdir}/ ; then
+ rm -f ${debdir}
ln -s ${RCLSRC}/desktop/unity-scope-recoll/debian $debdir
fi
topdir=unity-scope-recoll-${SCOPEVERS}
diff --git a/packaging/debian/debian/changelog b/packaging/debian/debian/changelog
index 65126b94..bce5d8a3 100644
--- a/packaging/debian/debian/changelog
+++ b/packaging/debian/debian/changelog
@@ -1,3 +1,10 @@
+recoll (1.20.1-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
+
+ * 1.20.1 brings improved indexing of compound words like email addresses
+ and miscellaneous usability improvements in the GUI.
+
+ -- Jean-Francois Dockes Fri, 19 Dec 2014 08:14:00 +0200
+
recoll (1.19.14p2-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
* 1.19.14p2 fixes Bengali diacritics processing, a memory leak in the
diff --git a/packaging/debian/debiankio/changelog b/packaging/debian/debiankio/changelog
index adcf4b9e..62fcbb5b 100644
--- a/packaging/debian/debiankio/changelog
+++ b/packaging/debian/debiankio/changelog
@@ -1,3 +1,7 @@
+kio-recoll (1.20.1-0~ppaPPAVERS~SERIES1) SERIES; urgency=low
+ * Updated package to version 1.20.1
+ -- Jean-Francois Dockes Fri, 19 Dec 2014 08:14:00 +0200
+
kio-recoll (1.19.14p2-0~ppaPPAVERS~SERIES1) SERIES; urgency=low
* No changes, build for Ubuntu Utopic
-- Jean-Francois Dockes Sat, 06 Dec 2014 08:44:00 +0200
diff --git a/packaging/debian/debiankio/control b/packaging/debian/debiankio/control
index 7146ed42..9a0644e5 100644
--- a/packaging/debian/debiankio/control
+++ b/packaging/debian/debiankio/control
@@ -3,7 +3,7 @@ Section: kde
Priority: extra
Maintainer: Jean-Francois Dockes
Build-Depends: cdbs, cmake, debhelper (>= 7), kdelibs5-dev (>= 4:4.2.2), pkg-kde-tools (>= 0.4.0), libxapian-dev, libz-dev
-Standards-Version: 3.8.1
+Standards-Version: 3.9.5
Homepage: http://www.recoll.org/
Package: kio-recoll
diff --git a/packaging/rpm/recollfedora.spec b/packaging/rpm/recollfedora.spec
index 05483113..a2606230 100644
--- a/packaging/rpm/recollfedora.spec
+++ b/packaging/rpm/recollfedora.spec
@@ -1,6 +1,6 @@
Summary: Desktop full text search tool with Qt GUI
Name: recoll
-Version: 1.19.14p2
+Version: 1.20.1
Release: 1%{?dist}
Group: Applications/Databases
License: GPLv2+
@@ -84,6 +84,9 @@ exit 0
%{_mandir}/man5/%{name}.conf.5*
%changelog
+* Fri Dec 19 2014 Jean-Francois Dockes - 1.20.1-1
+- 1.20.1
+
* Sun Nov 09 2014 Jean-Francois Dockes - 1.19.14p2-1
- 1.19.14p2
diff --git a/website/download.html b/website/download.html
index b1eaefb1..27f64b28 100644
--- a/website/download.html
+++ b/website/download.html
@@ -101,7 +101,7 @@ first release (X.Y.0), at least for a few weeks.
Z changes for bug fixes only, and moving from X.Y.Z
to X.Y.Z+u should in general involve little risk of regression. But,
any change can bring problems, if you are not affected by the
-corrected bugs (check the release file), there
+corrected bugs (check the release file), there
is probably no necessity to upgrade anyway.
@@ -117,7 +117,7 @@ is probably no necessity to upgrade anyway.
-
Current release distribution: 1.19.14p2:
+
Current release distribution: 1.20.1:
@@ -227,17 +227,17 @@ many distributions.
testing), just use the appropriate Debian repository.
Except they're not at the moment (2014-05).... So here are
-1.19.14p2 packages for Debian stable (Wheezy):
-python3-recoll_1.19.14p2-1_amd64.deb
-python3-recoll_1.19.14p2-1_i386.deb
-python-recoll_1.19.14p2-1_amd64.deb
-python-recoll_1.19.14p2-1_i386.deb
-recoll_1.19.14p2-1_amd64.deb
-recoll_1.19.14p2-1_i386.deb
+1.20.1 packages for Debian stable (Wheezy):
+python3-recoll_1.20.1-1_amd64.deb
+python3-recoll_1.20.1-1_i386.deb
+python-recoll_1.20.1-1_amd64.deb
+python-recoll_1.20.1-1_i386.deb
+recoll_1.20.1-1_amd64.deb
+recoll_1.20.1-1_i386.deb
You can list the directory for the
-source package and other files).
+source package and other files such as older versions).
@@ -251,7 +251,7 @@ a set of Ubuntu series. starting at Lucid. The installation is very simple:
sudo apt-get install recoll
-
The 1.19 packages in the PPA now have a separate package
+
The 1.19/1.20 packages in the PPA now have a separate package
for the Python extension, like the standard ones, so there should be
no more conflict issues while switching from the PPA to the normal
repositories and back.
@@ -284,7 +284,7 @@ packages if you want use the source rpms.
Recoll is present in the standard Fedora package repositories starting from
F-12. The new versions are usually tracked quite closely, but
- 1.19.14p2 is not there yet, so here are some packages
+ 1.20.1 is not there yet, so here are some packages
for Fedora 20 and Fedora
21. There are only x86_64 binaries for now, use the source rpm
for other archs.
@@ -349,7 +349,7 @@ MacPorts applications place.
-
Most of the translations for 1.19 are incomplete The source translation
+
Most of the translations for 1.20 are incomplete The source translation
files are included in the source release. If your language has some english
messages left and you want to take a shot at fixing the problem, you can send
the results to me and earn my gratefulness
@@ -361,7 +361,7 @@ produce the .qm file.). The .qmfile should be
copied to /usr/[local/]share/recoll/translations
-
recoll_xx.ts is a blank Recoll 1.19
+
recoll_xx.ts is a blank Recoll 1.20
message file, handy to work on a new translation.
Updated 1.19 translations that became available after the release:
diff --git a/website/release-1.20.html b/website/release-1.20.html
index f48dd11b..db583266 100644
--- a/website/release-1.20.html
+++ b/website/release-1.20.html
@@ -79,11 +79,14 @@
[somefield:term1,term2].
-
(1.20.1) The Query Fragments tool was added to the GUI. This is a
- window with customizable buttons to add arbitrary query
- language fragments to the current search. This makes it
- easy to define "pre-cooked" filters for things that you need
- repeatedly.
+ (1.20.1) The Query Fragments tool was added to
+ the GUI. This is a window with customizable buttons to add
+ arbitrary query language fragments to the current
+ search. The buttons and fragments are defined in an xml
+ file inside the recoll configuration
+ directory ~/.recoll/fragbuts.xml. This
+ makes it easy to define "pre-cooked" filters for things
+ that you need repeatedly.
See the manual for more details.