1.21 debian packaging

packaging/debian/buildppa.sh

@@ -4,7 +4,7 @@
 # For the kio: (and kdesdk?)
 # sudo apt-get install pkg-kde-tools  cdbs
 
-RCLVERS=1.20.6
+RCLVERS=1.21.0
 LENSVERS=1.19.10.3543
 SCOPEVERS=1.20.2.4
 PPAVERS=1
@@ -19,7 +19,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
 
@@ -41,8 +41,8 @@ check_recoll_orig()
 ####### QT4
 debdir=debian
 # Note: no new releases for lucid: no webkit. Or use old debianrclqt4 dir.
-series="precise trusty utopic vivid"
+#series="precise trusty utopic vivid"
-#series=trusty
+series=
 
 if test "X$series" != X ; then
     check_recoll_orig
@@ -71,7 +71,7 @@ done
 
 ### KIO
 series="precise trusty utopic vivid"
-#series=trusty
+series=vivid
 
 debdir=debiankio
 topdir=kio-recoll-${RCLVERS}

packaging/debian/debian/changelog

@@ -1,3 +1,11 @@
+recoll (1.21.0-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
+                
+  * New bison-based query parser.
+  * Improves filter execution performance
+  * Save/reload queries
+
+ -- Jean-Francois Dockes <jf@dockes.org>  Tue, 16 Jun 2015 18:10:00 +0200
+
 recoll (1.20.6-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
                 
   * Fix some decompression issues with serious performance and

packaging/debian/debian/control

@@ -5,6 +5,7 @@ Maintainer: Jean-Francois Dockes <jfd@recoll.org>
 Build-Depends: autotools-dev,
                debhelper (>= 7),
                hardening-wrapper,
+               bison,
                libqt4-dev,
                libqtwebkit-dev,
                libx11-dev,

packaging/debian/debiankio/changelog

@@ -1,3 +1,9 @@
+kio-recoll (1.21.0-0~ppaPPAVERS~SERIES1) SERIES; urgency=low
+
+  * No changes specific to the KIO, just use the 1.21 lib.
+
+ -- Jean-Francois Dockes <jf@dockes.org>  Tue, 16 Jun 2015 18:21:00 +0200
+
 kio-recoll (1.20.6-0~ppaPPAVERS~SERIES1) SERIES; urgency=low
 
   * Increase the default maximum number of entries displayed in a directory

packaging/debian/debiankio/control

@@ -2,7 +2,14 @@ Source: kio-recoll
 Section: kde
 Priority: extra
 Maintainer: Jean-Francois Dockes <jfd@recoll.org>
-Build-Depends: cdbs, cmake, debhelper (>= 7), kdelibs5-dev (>= 4:4.2.2), pkg-kde-tools (>= 0.4.0), libxapian-dev, libz-dev
+Build-Depends: cdbs, 
+               cmake, 
+               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/
 

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

@@ -0,0 +1,21 @@
+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

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

packaging/debian/debiankio/source/format

@@ -0,0 +1 @@
+3.0 (quilt)