tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bump master to 1.26

Browse Source
This commit is contained in:
Jean-Francois Dockes 2019-07-05 18:05:53 +02:00
parent f877e7e459
commit fcc6ae556c
4 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packaging/debian/buildppa.sh
View File

@ -6,7 +6,7 @@
PPA_KEYID=D38B9201 PPA_KEYID=D38B9201
RCLVERS=1.25.18 RCLVERS=1.26.0~pre1
SCOPEVERS=1.20.2.4 SCOPEVERS=1.20.2.4
GSSPVERS=1.0.0 GSSPVERS=1.0.0
PPAVERS=1 PPAVERS=1
@ -22,7 +22,7 @@ case $RCLVERS in
1.14*) PPANAME=recoll-ppa;; 1.14*) PPANAME=recoll-ppa;;
*) PPANAME=recoll15-ppa;; *) PPANAME=recoll15-ppa;;
esac esac
#PPANAME=recollexp-ppa PPANAME=recollexp-ppa
echo "PPA: $PPANAME. Type CR if Ok, else ^C" echo "PPA: $PPANAME. Type CR if Ok, else ^C"
read rep read rep
@ -49,11 +49,11 @@ debdir=debian
# No new releases for trusty either because of risk of kio compat (kio # No new releases for trusty either because of risk of kio compat (kio
# wont build) # wont build)
series="xenial bionic cosmic disco" series="xenial bionic cosmic disco"
#series= series=disco
if test "X$series" != X ; then if test "X$series" != X ; then
check_recoll_orig 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 fi
for series in $series ; do for series in $series ; do
@ -86,7 +86,7 @@ done
### KIO. Does not build on trusty from recoll 1.23 because of the need ### KIO. Does not build on trusty from recoll 1.23 because of the need
### for c++11 ### for c++11
series="xenial bionic cosmic disco" series="xenial bionic cosmic disco"
#series= series=
debdir=debiankio debdir=debiankio
topdir=kio-recoll-${RCLVERS} topdir=kio-recoll-${RCLVERS}
@ -99,7 +99,7 @@ if test "X$series" != X ; then
if test ! -d $topdir ; then if test ! -d $topdir ; then
mkdir temp mkdir temp
cd 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 mv recoll-${RCLVERS} ../$topdir || exit 1
cd .. cd ..
fi fi
@ -150,7 +150,7 @@ if test "X$series" != X ; then
fi fi
fi 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 fi
for series in $series ; do for series in $series ; do
@ -195,7 +195,7 @@ if test "X$series" != X ; then
fi fi
fi 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 || exit 1
fi fi
for series in $series ; do for series in $series ; do

18
packaging/debian/debian/changelog
View File

@ -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 recoll (1.25.20~pre1-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
* Allow controlling the GUI snippets window sort order and length. * Allow controlling the GUI snippets window sort order and length.

2
src/Makefile.am
View File

@ -758,6 +758,6 @@ dist_man5_MANS = doc/man/recoll.conf.5
dist-hook: dist-hook:
(cd $(top_srcdir); find . \ (cd $(top_srcdir); find . \
\( -name '*.pyc' -o -name '#*' -o -name '*~' \) -delete) \( -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`" 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" git tag -a RECOLL-$$vers -m "Release $$vers tagged"

2
src/VERSION
View File

@ -1 +1 @@
1.25.20~pre1 1.26.0~pre1