1.21 debian packaging

2015-06-17 09:21:14 +02:00
parent 68c7786059
commit 5ed1b4eed0
8 changed files with 51 additions and 6 deletions
@@ -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
@@ -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/

@@ -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})
+ 
@@ -0,0 +1 @@
+fix-cmake-build-parser.patch
@@ -0,0 +1 @@
+3.0 (quilt)