Update debian packaging, and use the new appropriate kde version for newer ubuntu releases

packaging/debian/buildppa.sh

@@ -4,7 +4,7 @@
 # For the kio: (and kdesdk?)
 # sudo apt-get install pkg-kde-tools  cdbs
 
-RCLVERS=1.22.2
+RCLVERS=1.22.4
 LENSVERS=1.19.10.3543
 SCOPEVERS=1.20.2.4
 PPAVERS=1
@@ -43,8 +43,8 @@ check_recoll_orig()
 ####### QT
 debdir=debian
 # Note: no new releases for lucid: no webkit. Or use old debianrclqt4 dir.
-series="trusty vivid wily xenial"
+series="trusty xenial yakkety"
-#series=trusty
+series=
 
 if test "X$series" != X ; then
     check_recoll_orig
@@ -72,8 +72,8 @@ for series in $series ; do
 done
 
 ### KIO
-series="trusty vivid wily xenial"
+series="trusty xenial yakkety"
-series=
+series="xenial yakkety"
 
 debdir=debiankio
 topdir=kio-recoll-${RCLVERS}
@@ -91,18 +91,23 @@ if test "X$series" != X ; then
         cd ..
     fi
 fi
-for series in $series ; do
+for svers in $series ; do
 
   rm -rf $topdir/debian
   cp -rp ${debdir}/ $topdir/debian || exit 1
 
-  sed -e s/SERIES/$series/g \
+  sed -e s/SERIES/$svers/g \
       -e s/PPAVERS/${PPAVERS}/g \
           < ${debdir}/changelog > $topdir/debian/changelog ;
-
+  if test $svers = "trusty" ; then
+      mv -f $topdir/debian/control-4 $topdir/debian/control
+      mv -f $topdir/debian/rules-4 $topdir/debian/rules
+  else
+      rm -f $topdir/debian/control-4 $topdir/debian/rules-4
+  fi
   (cd $topdir;debuild -S -sa) || exit 1
 
-  dput $PPANAME kio-recoll_${RCLVERS}-0~ppa${PPAVERS}~${series}1_source.changes
+  dput $PPANAME kio-recoll_${RCLVERS}-0~ppa${PPAVERS}~${svers}1_source.changes
 
 done
 
@@ -142,7 +147,7 @@ for series in $series ; do
 done
 
 ### Unity Scope
-series="trusty vivid wily xenial"
+series="trusty xenial yakkety"
 series=
 
 debdir=debianunityscope

packaging/debian/debian/changelog

@@ -1,8 +1,20 @@
+recoll (1.22.4-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
+                
+  * Fix advanced search 'start search' not doing anything with qt5
+
+ -- Jean-Francois Dockes <jf@dockes.org>  Tue, 25 Nov 2016 11:38:00 +0100
+
+recoll (1.22.3-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
+                
+  * 
+
+ -- Jean-Francois Dockes <jf@dockes.org>  Tue, 21 Jun 2016 15:11:00 +0200
+
 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
+ -- Jean-Francois Dockes <jf@dockes.org>  Thu, 16 Jun 2016 09:11:00 +0200
 
 recoll (1.22.1-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
                 

packaging/debian/debiankio/changelog

@@ -1,3 +1,15 @@
+kio-recoll (1.22.4-0~ppaPPAVERS~SERIES1) SERIES; urgency=low
+
+  * Switch to kf5 for appropriate series. Update to 1.22.4 (same as .3)
+
+ -- Jean-Francois Dockes <jf@dockes.org>  Sat, 26 Nov 2016 09:46:00 +0100
+
+kio-recoll (1.22.3-0~ppaPPAVERS~SERIES1) SERIES; urgency=low
+
+  * No changes specific to the KIO, just use the 1.22 lib. Update to .3
+
+ -- Jean-Francois Dockes <jf@dockes.org>  Fri, 25 Nov 2016 10:59:00 +0100
+
 kio-recoll (1.22.2-0~ppaPPAVERS~SERIES1) SERIES; urgency=low
 
   * No changes specific to the KIO, just use the 1.22 lib.

packaging/debian/debiankio/control

@@ -8,17 +8,20 @@ Build-Depends: cdbs,
                debhelper (>= 7), 
                bison,
                kdelibs5-dev (>= 4:4.2.2),
+               qtbase5-dev,
+               extra-cmake-modules,
+               kio-dev,
                pkg-kde-tools (>= 0.4.0), 
                libxapian-dev, 
                libz-dev
-Standards-Version: 3.9.5
+Standards-Version: 3.9.7
 Homepage: http://www.recoll.org/
 
 Package: kio-recoll
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, recoll
-Description: A Recoll KIO slave for KDE 4
+Description: Recoll KIO slave for KDE 4
- A Recoll KIO slave for KDE 4, allows performing a Recoll search by
+ 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,

packaging/debian/debiankio/control-4

@@ -0,0 +1,33 @@
+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), 
+               pkg-kde-tools (>= 0.4.0), 
+               libxapian-dev, 
+               libz-dev
+Standards-Version: 3.9.5
+Homepage: http://www.recoll.org/
+
+Package: kio-recoll
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}, recoll
+Description: A Recoll KIO slave for KDE 4
+ A 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). 

packaging/debian/debiankio/copyright

@@ -54,7 +54,7 @@ Copyright (c) 1991-2004 Unicode, Inc.
 
   COPYRIGHT AND PERMISSION NOTICE
   
-  Copyright © 1991-2006 Unicode, Inc. All rights reserved. Distributed under
+  Copyright © 1991-2006 Unicode, Inc. All rights reserved. Distributed under
   the Terms of Use in http://www.unicode.org/copyright.html. 
   
   Permission is hereby granted, free of charge, to any person obtaining a

packaging/debian/debiankio/patches/fix-cmake-build-parser.patch

@@ -1,21 +0,0 @@
-diff -r 1e9d7ca73884 src/kde/kioslave/kio_recoll/CMakeLists.txt
---- a/kde/kioslave/kio_recoll/CMakeLists.txt	Tue Jun 16 15:06:07 2015 +0200
-+++ b/kde/kioslave/kio_recoll/CMakeLists.txt	Wed Jun 17 09:08:36 2015 +0200
-@@ -57,11 +57,16 @@
- 
- kde4_add_plugin(kio_recoll ${kio_recoll_SRCS})
- 
-+add_custom_target(parser
-+                 COMMAND make wasaparse.tab.cpp
-+                 WORKING_DIRECTORY ${rcltop}/query
-+)
- add_custom_target(rcllib
-                  COMMAND make librecoll.a
-                  WORKING_DIRECTORY ${rcltop}/lib
- )
--add_dependencies(kio_recoll rcllib)
-+add_dependencies(rcllib parser)
-+add_dependencies(kio_recoll parser rcllib)
- 
- target_link_libraries(kio_recoll recoll xapian z ${EXTRA_LIBS} ${KDE4_KIO_LIBS})
- 

packaging/debian/debiankio/patches/series

@@ -1 +0,0 @@
-fix-cmake-build-parser.patch

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-kde4
+DEB_SRCDIR = kde/kioslave/kio_recoll

packaging/debian/debiankio/rules-4

@@ -0,0 +1,6 @@
+#!/usr/bin/make -f
+
+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-kde4