From 07911c5dc0b12b93b3f1f091b6a1cc9068e1cc7e Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jf@dockes.org>
Date: Fri, 5 Jul 2019 18:05:53 +0200
Subject: [PATCH] bump master to 1.26

---
 packaging/debian/buildppa.sh      | 16 ++++++++--------
 packaging/debian/debian/changelog | 18 ++++++++++++++++++
 src/Makefile.am                   |  2 +-
 src/VERSION                       |  2 +-
 4 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/packaging/debian/buildppa.sh b/packaging/debian/buildppa.sh
index 6c67aadb..7724061a 100644
--- a/packaging/debian/buildppa.sh
+++ b/packaging/debian/buildppa.sh
@@ -6,7 +6,7 @@
 
 PPA_KEYID=D38B9201
 
-RCLVERS=1.25.18
+RCLVERS=1.26.0~pre1
 SCOPEVERS=1.20.2.4
 GSSPVERS=1.0.0
 PPAVERS=1
@@ -22,7 +22,7 @@ case $RCLVERS in
     1.14*) PPANAME=recoll-ppa;;
     *)     PPANAME=recoll15-ppa;;
 esac
-#PPANAME=recollexp-ppa
+PPANAME=recollexp-ppa
 echo "PPA: $PPANAME. Type CR if Ok, else ^C"
 read rep
 
@@ -49,11 +49,11 @@ debdir=debian
 # No new releases for trusty either because of risk of kio compat (kio
 # wont build)
 series="xenial bionic cosmic disco"
-#series=
+series=disco
 
 if test "X$series" != X ; then
     check_recoll_orig
-    test -d recoll-${RCLVERS} || tar xvzf recoll_${RCLVERS}.orig.tar.gz
+    test -d recoll-${RCLVERS} || tar xzf recoll_${RCLVERS}.orig.tar.gz
 fi
 
 for series in $series ; do
@@ -86,7 +86,7 @@ done
 ### KIO. Does not build on trusty from recoll 1.23 because of the need
 ### for c++11
 series="xenial bionic cosmic disco"
-#series=
+series=
 
 debdir=debiankio
 topdir=kio-recoll-${RCLVERS}
@@ -99,7 +99,7 @@ if test "X$series" != X ; then
     if test ! -d $topdir ; then 
         mkdir temp
         cd temp
-        tar xvzf ../recoll_${RCLVERS}.orig.tar.gz || exit 1
+        tar xzf ../recoll_${RCLVERS}.orig.tar.gz || exit 1
         mv recoll-${RCLVERS} ../$topdir || exit 1
         cd ..
     fi
@@ -150,7 +150,7 @@ if test "X$series" != X ; then
             fi
         fi
     fi
-    test -d $topdir || tar xvzf gssp-recoll_${GSSPVERS}.orig.tar.gz || exit 1
+    test -d $topdir || tar xzf gssp-recoll_${GSSPVERS}.orig.tar.gz || exit 1
 fi
 for series in $series ; do
 
@@ -195,7 +195,7 @@ if test "X$series" != X ; then
             fi
         fi
     fi
-    test -d $topdir ||  tar xvzf unity-scope-recoll_${SCOPEVERS}.orig.tar.gz \
+    test -d $topdir ||  tar xzf unity-scope-recoll_${SCOPEVERS}.orig.tar.gz \
         || exit 1
 fi
 for series in $series ; do
diff --git a/packaging/debian/debian/changelog b/packaging/debian/debian/changelog
index 250da533..22c1baeb 100644
--- a/packaging/debian/debian/changelog
+++ b/packaging/debian/debian/changelog
@@ -1,3 +1,21 @@
+recoll (1.26.0~pre1-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
+
+  * Bumped version to 1.26 because the changes are too extensive for a
+    minor release.
+  * Reworked the group matching code used for highlighting and snippets.
+  * Properly highlight phrases, not treating them as NEAR.
+    
+ -- Jean-Francois Dockes <jf@dockes.org>  Wed, 03 Jul 2019 14:00:00 +0200
+
+recoll (1.25.20~pre2-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
+
+  * Allow displaying snippets for successive documents in the snippet
+    window, link to result table hovering.
+  * Process all Korean Hangul as alphabetic, not cjk (split as space
+    separated terms).
+    
+ -- Jean-Francois Dockes <jf@dockes.org>  Wed, 03 Jul 2019 14:00:00 +0200
+
 recoll (1.25.20~pre1-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
 
   * Allow controlling the GUI snippets window sort order and length.
diff --git a/src/Makefile.am b/src/Makefile.am
index f0872b7c..e63aa37c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -758,6 +758,6 @@ dist_man5_MANS = doc/man/recoll.conf.5
 dist-hook:
 	(cd $(top_srcdir); find . \
             \( -name '*.pyc' -o -name '#*' -o -name '*~' \) -delete)
+	vers=`echo $(VERSION) | sed -e 's/~/_/g'`;
 	test -z "`git status -s | grep -v '??' | grep -v Makefile.am`"
-	vers=`echo $(VERSION) | sed -e 's/~/_/g'`;\
 	git tag -a RECOLL-$$vers -m "Release $$vers tagged"
diff --git a/src/VERSION b/src/VERSION
index 2df6a6bf..5cf5857d 100644
--- a/src/VERSION
+++ b/src/VERSION
@@ -1 +1 @@
-1.25.20~pre1
+1.26.0~pre1