From d261688d706aec6df350f26b45dcab1fd4f1fc76 Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jf@dockes.org>
Date: Wed, 20 Feb 2019 14:51:00 +0100
Subject: [PATCH] debian packaging

---
 packaging/debian/buildppa.sh              | 8 ++++----
 packaging/debian/debian/changelog         | 7 +++++++
 packaging/debian/debiankio/changelog      | 7 +++++++
 packaging/debian/debiankio/patches/series | 1 -
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/packaging/debian/buildppa.sh b/packaging/debian/buildppa.sh
index fa920838..bdbecd99 100644
--- a/packaging/debian/buildppa.sh
+++ b/packaging/debian/buildppa.sh
@@ -6,7 +6,7 @@
 
 PPA_KEYID=D38B9201
 
-RCLVERS=1.25.3
+RCLVERS=1.25.4
 SCOPEVERS=1.20.2.4
 PPAVERS=2
 
@@ -79,7 +79,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="xenial"
+#series="xenial"
 
 debdir=debiankio
 topdir=kio-recoll-${RCLVERS}
@@ -102,8 +102,8 @@ for svers in $series ; do
   rm -rf $topdir/debian
   cp -rp ${debdir}/ $topdir/debian || exit 1
 
-  if test -f $debdir/control-$series ; then
-      cp -f -p $debdir/control-$series $topdir/debian/control
+  if test -f $debdir/control-$svers ; then
+      cp -f -p $debdir/control-$svers $topdir/debian/control
   else 
       cp -f -p $debdir/control $topdir/debian/control
   fi
diff --git a/packaging/debian/debian/changelog b/packaging/debian/debian/changelog
index cb0bcf28..75eb3d6d 100644
--- a/packaging/debian/debian/changelog
+++ b/packaging/debian/debian/changelog
@@ -1,3 +1,10 @@
+recoll (1.25.4-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
+                
+  * New release 1.25.4
+  * Fixes a few minor-to-ennoying bugs
+  
+ -- Jean-Francois Dockes <jf@dockes.org>  Fri, 19 Feb 2019 08:42:00 +0100
+
 recoll (1.25.3-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
                 
   * New release 1.25.3
diff --git a/packaging/debian/debiankio/changelog b/packaging/debian/debiankio/changelog
index b2d30ffd..d0d5da22 100644
--- a/packaging/debian/debiankio/changelog
+++ b/packaging/debian/debiankio/changelog
@@ -1,3 +1,10 @@
+kio-recoll (1.25.4-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
+                
+  * New release 1.25.4
+  * Fixes a few minor-to-ennoying bugs
+  
+ -- Jean-Francois Dockes <jf@dockes.org>  Fri, 19 Feb 2019 08:42:00 +0100
+
 kio-recoll (1.25.3-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
                 
   * New release 1.25.3.
diff --git a/packaging/debian/debiankio/patches/series b/packaging/debian/debiankio/patches/series
index 768c4218..e69de29b 100644
--- a/packaging/debian/debiankio/patches/series
+++ b/packaging/debian/debiankio/patches/series
@@ -1 +0,0 @@
-fix-kio-cmake-nopython+xml.patch