diff --git a/packaging/debian/buildppa.sh b/packaging/debian/buildppa.sh index 09a1907f..1f5db4be 100644 --- a/packaging/debian/buildppa.sh +++ b/packaging/debian/buildppa.sh @@ -13,7 +13,7 @@ PPA_KEYID=7808CE96D38B9201 -RCLVERS=1.31.0 +RCLVERS=1.31.2 SCOPEVERS=1.20.2.4 GSSPVERS=1.1.1 PPAVERS=1 @@ -49,8 +49,8 @@ check_recoll_orig() ####### QT debdir=debian -series="bionic focal groovy hirsute" -series= +series="bionic focal groovy hirsute impish" +#series= if test "X$series" != X ; then check_recoll_orig @@ -85,7 +85,7 @@ done ### KIO. -series="bionic focal groovy hirsute" +series="bionic focal groovy hirsute impish" series= debdir=debiankio @@ -125,8 +125,8 @@ for svers in $series ; do done ### GSSP -series="bionic focal groovy hirsute" -#series= +series="bionic focal groovy hirsute impish" +series= debdir=debiangssp if test ! -d ${debdir}/ ; then diff --git a/packaging/debian/debian/changelog b/packaging/debian/debian/changelog index a0261997..c862f376 100644 --- a/packaging/debian/debian/changelog +++ b/packaging/debian/debian/changelog @@ -1,3 +1,21 @@ +recoll (1.31.2-1~ppaPPAVERS~SERIES1) SERIES; urgency=low + + * Add support for .ipynb iPython/Jupyter notebook format. + * Implement Alt+/ shortcut to search the menu entries and possibly execute the result. + * Fix configuration GUI button margins on Mac OS. + * Add *.pyc __pycache__ .pytest_cache .tox and .direnv to the default skipped names list. + * Add /opt/homebrew/bin to the helper search path when built under Mac Homebrew. + * Linux: let recollindex adjust its OOM killer "badness" on startup. + * simple search: add Ctrl+H as keyboard shortcut for "show history". + * Renamed the fragment buttons configuration file from fragbuts.xml to fragment-buttons.xml. + * Zip archives: set the modification date attribute for members. + * ost/pst filter: fix not fetching the message dates. + * Anchored searches: remove unwarranted slack increase. The anchor term should behave like a + normal one for slack computations. + * Fix djvu issues on Windows. + + -- Jean-Francois Dockes Mon, 11 Oct 2021 10:51:00 +0200 + recoll (1.31.0-1~ppaPPAVERS~SERIES1) SERIES; urgency=low * GUI: modified shortcuts were not read from the preferences ! diff --git a/packaging/debian/debian/control b/packaging/debian/debian/control index 25d2255d..2f51305d 100644 --- a/packaging/debian/debian/control +++ b/packaging/debian/debian/control @@ -14,7 +14,7 @@ Build-Depends: bison, libxslt1-dev, libz-dev, pkg-config, - python-all-dev (>= 2.6.6-3~), + python2-dev (>= 2.6.6-3~), python-setuptools, python3-all-dev, python3-setuptools, diff --git a/packaging/debian/debiankio/changelog b/packaging/debian/debiankio/changelog index 24f500c3..e5714d71 100644 --- a/packaging/debian/debiankio/changelog +++ b/packaging/debian/debiankio/changelog @@ -1,3 +1,9 @@ +kio-recoll (1.31.2-1~ppaPPAVERS~SERIES1) SERIES; urgency=low + + * Follow recoll version + + -- Jean-Francois Dockes Mon, 11 Oct 2021 10:55:00 +0200 + kio-recoll (1.31.0-1~ppaPPAVERS~SERIES1) SERIES; urgency=low * Follow recoll version diff --git a/src/Makefile.am b/src/Makefile.am index e41d01c3..cbcd4dc5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -388,6 +388,9 @@ kde/kioslave/kio_recoll-kde4/recoll.protocol \ \ query/location.hh query/position.hh query/stack.hh \ \ +qtgui/actsearch.ui \ +qtgui/actsearch_w.cpp \ +qtgui/actsearch_w.h \ qtgui/advsearch.ui \ qtgui/advsearch_w.cpp \ qtgui/advsearch_w.h \ diff --git a/src/RECOLL-VERSION.txt b/src/RECOLL-VERSION.txt index 6bae5402..3492b09b 100644 --- a/src/RECOLL-VERSION.txt +++ b/src/RECOLL-VERSION.txt @@ -1 +1 @@ -1.31.1 +1.31.2 diff --git a/src/common/autoconfig-mac.h b/src/common/autoconfig-mac.h index 52c48ab8..eaa0b04d 100644 --- a/src/common/autoconfig-mac.h +++ b/src/common/autoconfig-mac.h @@ -125,7 +125,7 @@ #define PACKAGE_NAME "Recoll" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "Recoll 1.31.1" +#define PACKAGE_STRING "Recoll 1.31.2" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "recoll" @@ -134,7 +134,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.31.1" +#define PACKAGE_VERSION "1.31.2" /* putenv parameter is const */ /* #undef PUTENV_ARG_CONST */ diff --git a/src/common/autoconfig-win.h b/src/common/autoconfig-win.h index e1a70278..f9b40e22 100644 --- a/src/common/autoconfig-win.h +++ b/src/common/autoconfig-win.h @@ -118,7 +118,7 @@ #define PACKAGE_NAME "Recoll" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "Recoll 1.31.1" +#define PACKAGE_STRING "Recoll 1.31.2" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "recoll" @@ -127,7 +127,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.31.1" +#define PACKAGE_VERSION "1.31.2" /* putenv parameter is const */ /* #undef PUTENV_ARG_CONST */