more kio touchups

packaging/debian/buildppa.sh

@@ -8,7 +8,7 @@ PPA_KEYID=D38B9201
 
 RCLVERS=1.25.3
 SCOPEVERS=1.20.2.4
-PPAVERS=6
+PPAVERS=2
 
 # 
 RCLSRC=/y/home/dockes/projets/fulltext/recoll/src
@@ -20,7 +20,7 @@ case $RCLVERS in
     1.14*) PPANAME=recoll-ppa;;
     *)     PPANAME=recoll15-ppa;;
 esac
-PPANAME=recollexp-ppa
+#PPANAME=recollexp-ppa
 echo "PPA: $PPANAME. Type CR if Ok, else ^C"
 read rep
 
@@ -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="cosmic disco"
+series="xenial"
 
 debdir=debiankio
 topdir=kio-recoll-${RCLVERS}
@@ -103,9 +103,9 @@ for svers in $series ; do
   cp -rp ${debdir}/ $topdir/debian || exit 1
 
   if test -f $debdir/control-$series ; then
-      cp -f -p $debdir/control-$series recoll-${RCLVERS}/debian/control
+      cp -f -p $debdir/control-$series $topdir/debian/control
   else 
-      cp -f -p $debdir/control recoll-${RCLVERS}/debian/control
+      cp -f -p $debdir/control $topdir/debian/control
   fi
 
   sed -e s/SERIES/$svers/g \

packaging/debian/debiankio/control-bionic

@@ -1,37 +0,0 @@
-Source: kio-recoll
-Section: kde
-Priority: extra
-Maintainer: Jean-Francois Dockes <jfd@recoll.org>
-Build-Depends: cdbs, 
-               cmake,
-               libtool,
-               debhelper (>= 7), 
-               bison,
-               kdelibs5-dev (>= 4:4.2.2),
-               qtbase5-dev,
-               extra-cmake-modules,
-               kio-dev,
-               pkg-kde-tools (>= 0.4.0), 
-               libxapian-dev, 
-               libxslt1-dev,
-               libz-dev
-Standards-Version: 3.9.7
-Homepage: http://www.recoll.org/
-
-Package: kio-recoll
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, recoll
-Description: Recoll KIO slave for KDE 4
- Recoll KIO slave for KDE 4, allows performing a Recoll search by
- entering an appropriate URL in a KDE open dialog, or with an HTML-based
- interface displayed in Konqueror.  
- The HTML-based interface is similar to the Recoll GUI QT-based interface,
- slightly less powerful. It allows performing a search while staying fully
- within the KDE framework: drag and drop from the result list works
- normally and you have your normal choice of applications for opening files. 
- An alternative interface uses a directory view of search results. Due to
- limitations in the current KIO slave interface, it is currently not
- obviously useful.
- The interface is described in more detail inside a help file which you can
- access by entering recoll:/ inside the konqueror URL line (this works only
- if the recoll KIO slave has been previously installed).