From af4e4fc90d07ec8c7be9d86fa2ae1450defc5ec2 Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jfd@recoll.org>
Date: Thu, 16 Jun 2016 10:28:15 +0200
Subject: [PATCH] pull 1.22.2 packaging changes

---
 packaging/debian/buildppa.sh         | 18 ++++++++++--------
 packaging/debian/debian/changelog    | 13 +++++++++++++
 packaging/debian/debian/control      |  4 ++--
 packaging/debian/debiankio/changelog |  6 ++++++
 packaging/debian/debiankio/control   |  3 ++-
 packaging/debian/debiankio/rules     |  2 +-
 6 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/packaging/debian/buildppa.sh b/packaging/debian/buildppa.sh
index e7bb4cd0..e5ab2ff0 100644
--- a/packaging/debian/buildppa.sh
+++ b/packaging/debian/buildppa.sh
@@ -4,10 +4,10 @@
 # For the kio: (and kdesdk?)
 # sudo apt-get install pkg-kde-tools  cdbs
 
-RCLVERS=1.22.0
+RCLVERS=1.22.2
 LENSVERS=1.19.10.3543
 SCOPEVERS=1.20.2.4
-PPAVERS=3
+PPAVERS=1
 
 # 
 RCLSRC=/y/home/dockes/projets/fulltext/recoll/src
@@ -38,11 +38,13 @@ check_recoll_orig()
     fi
 }
 
-####### QT4
+# Note: recoll 1.22+ builds on precise fail. precise stays at 1.21
+
+####### QT
 debdir=debian
 # Note: no new releases for lucid: no webkit. Or use old debianrclqt4 dir.
-series="precise trusty utopic vivid wily xenial"
-series=
+series="trusty vivid wily xenial"
+#series=trusty
 
 if test "X$series" != X ; then
     check_recoll_orig
@@ -70,7 +72,7 @@ for series in $series ; do
 done
 
 ### KIO
-series="precise trusty utopic vivid wily xenial"
+series="trusty vivid wily xenial"
 series=
 
 debdir=debiankio
@@ -140,8 +142,8 @@ for series in $series ; do
 done
 
 ### Unity Scope
-series="trusty utopic vivid wily xenial"
-series=xenial
+series="trusty vivid wily xenial"
+series=
 
 debdir=debianunityscope
 if test ! -d ${debdir}/ ; then
diff --git a/packaging/debian/debian/changelog b/packaging/debian/debian/changelog
index 0ba5487f..c1f8915d 100644
--- a/packaging/debian/debian/changelog
+++ b/packaging/debian/debian/changelog
@@ -1,3 +1,16 @@
+recoll (1.22.2-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
+                
+  * Packaging fixes.
+
+ -- Jean-Francois Dockes <jf@dockes.org>  Tue, 16 Jun 2016 09:11:00 +0200
+
+recoll (1.22.1-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
+                
+  * Fixed two GUI crashes
+  * Small other fixes
+
+ -- Jean-Francois Dockes <jf@dockes.org>  Tue, 14 Jun 2016 17:31:00 +0200
+
 recoll (1.22.0-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
                 
   * New build based on autotools
diff --git a/packaging/debian/debian/control b/packaging/debian/debian/control
index 851a5f7d..7263aea4 100644
--- a/packaging/debian/debian/control
+++ b/packaging/debian/debian/control
@@ -22,9 +22,9 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/recoll.git;a=summa
 Package: recoll
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, python
-Recommends: python-recoll, aspell, xdg-utils, xsltproc
+Recommends: python-recoll, aspell, xdg-utils, xsltproc,
+            python-libxml2, python-libxslt1
 Suggests: antiword,
-          catdoc,
           ghostscript,
           libimage-exiftool-perl,
           poppler-utils,
diff --git a/packaging/debian/debiankio/changelog b/packaging/debian/debiankio/changelog
index 1cf089c0..707cf905 100644
--- a/packaging/debian/debiankio/changelog
+++ b/packaging/debian/debiankio/changelog
@@ -1,3 +1,9 @@
+kio-recoll (1.22.2-0~ppaPPAVERS~SERIES1) SERIES; urgency=low
+
+  * No changes specific to the KIO, just use the 1.22 lib.
+
+ -- Jean-Francois Dockes <jf@dockes.org>  Tue, 15 Jun 2016 09:57:00 +0200
+
 kio-recoll (1.21.0-0~ppaPPAVERS~SERIES1) SERIES; urgency=low
 
   * No changes specific to the KIO, just use the 1.21 lib.
diff --git a/packaging/debian/debiankio/control b/packaging/debian/debiankio/control
index a86b79f8..cbc1b236 100644
--- a/packaging/debian/debiankio/control
+++ b/packaging/debian/debiankio/control
@@ -3,7 +3,8 @@ Section: kde
 Priority: extra
 Maintainer: Jean-Francois Dockes <jfd@recoll.org>
 Build-Depends: cdbs, 
-               cmake, 
+               cmake,
+               libtool,
                debhelper (>= 7), 
                bison,
                kdelibs5-dev (>= 4:4.2.2), 
diff --git a/packaging/debian/debiankio/rules b/packaging/debian/debiankio/rules
index 8d9a454d..7798525d 100755
--- a/packaging/debian/debiankio/rules
+++ b/packaging/debian/debiankio/rules
@@ -3,4 +3,4 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/pkg-kde-tools/makefiles/1/cdbs/kde.mk
 
-DEB_SRCDIR = kde/kioslave/kio_recoll
+DEB_SRCDIR = kde/kioslave/kio_recoll-kde4