update deb packaging

packaging/debian/buildppa.sh

@@ -7,28 +7,26 @@
 # Active series:
 # 18.04LTS bionic 2023-04
 # 20.04LTS focal  2025-04
-# 20.10    groovy 2021-07
-# 21.04    hirsute 2022-01
 # 21.10    impish
 
 PPA_KEYID=7808CE96D38B9201
 
-RCLVERS=1.31.6
+RCLVERS=1.32.0
 SCOPEVERS=1.20.2.4
 GSSPVERS=1.1.1
-PPAVERS=1
+PPAVERS=2
 
 # 
 RCLSRC=/y/home/dockes/projets/fulltext/recoll/src
 SCOPESRC=/y/home/dockes/projets/fulltext/unity-scope-recoll
-GSSPSRC=/home/dockes/projets/fulltext/gssp-recoll
-RCLDOWNLOAD=/home/dockes/projets/lesbonscomptes/recoll
+GSSPSRC=/y/home/dockes/projets/fulltext/gssp-recoll
+RCLDOWNLOAD=/y/home/dockes/projets/lesbonscomptes/recoll
 
 case $RCLVERS in
     [23]*) PPANAME=recollexp-ppa;;
     *)     PPANAME=recoll15-ppa;;
 esac
-#PPANAME=recollexp-ppa
+# PPANAME=recollexp-ppa
 echo "PPA: $PPANAME. Type CR if Ok, else ^C"
 read rep
 
@@ -49,8 +47,8 @@ check_recoll_orig()
 
 ####### QT
 debdir=debian
-series="bionic focal hirsute impish"
-#series=
+series="bionic focal impish jammy"
+series=
 
 if test "X$series" != X ; then
     check_recoll_orig
@@ -85,8 +83,8 @@ done
 
 
 ### KIO.
-#series="bionic focal hirsute impish"
-series=
+series="bionic focal impish jammy"
+series=jammy
 
 debdir=debiankio
 topdir=kio-recoll-${RCLVERS}

packaging/debian/debian/changelog

@@ -1,3 +1,21 @@
+recoll (1.32.0-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
+
+  * GUI: added a collapsible side pane for quick filtering on dates or
+    directories.
+  * Showing duplicates now uses a spreadsheet like the result table for
+    easy access to the duplicate files.
+  * Fixed the temporary copy open dialog (again!).
+  * The default mimeview and mimeconf configuration files were
+    separated into generic and system-specific parts to avoid update
+    errors (no consequences for users).
+  * Renamed all Python input handler with a .py extension. This is
+    relied on Windows rather than listing an explicit python
+    interpreter.
+  * Added %l specification to viewer definitions for opening at a
+    specific line.
+    
+ -- Jean-Francois Dockes <jf@dockes.org>  Fri, 11 Mar 2022 18:17:00 +0100
+
 recoll (1.31.6-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
 
   * Almost no change: translation files update.

packaging/debian/debian/control

@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Jean-Francois Dockes <jfd@recoll.org>
 Build-Depends: bison,
-               debhelper (>= 9),
+               debhelper (>= 10),
                dh-python,
                dpkg-dev (>= 1.16.1~),
                libaspell-dev,

packaging/debian/debian/rules

@@ -21,7 +21,7 @@ endif
 
 # main packaging script based on dh7 syntax
 %:
-	dh $@ --parallel --with python2 --with python3
+	dh $@ --with python2 --with python3
 
 override_dh_auto_configure:
 	dh_auto_configure -- --enable-recollq --enable-xadump

packaging/debian/debiankio/changelog

@@ -1,3 +1,9 @@
+kio-recoll (1.32.0-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
+
+  * Follow
+    
+ -- Jean-Francois Dockes <jf@dockes.org>  Fri, 11 Mar 2022 18:17:00 +0100
+
 kio-recoll (1.31.6-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
 
   * Follow

packaging/debian/debiankio/patches/dirif-fix-kio-version-include.patch

@@ -0,0 +1,13 @@
+diff --git a/src/kde/kioslave/kio_recoll/dirif.cpp b/src/kde/kioslave/kio_recoll/dirif.cpp
+index 4438a1e7..48284ece 100644
+--- a/kde/kioslave/kio_recoll/dirif.cpp
++++ b/kde/kioslave/kio_recoll/dirif.cpp
+@@ -35,7 +35,7 @@
+ #include <QDebug>
+ #include <QUrl>
+ #include <QStandardPaths>
+-#include <KF5/kio_version.h>
++#include <kio_version.h>
+ 
+ #include "kio_recoll.h"
+ #include "pathut.h"

packaging/debian/debiankio/patches/series

@@ -0,0 +1 @@
+dirif-fix-kio-version-include.patch