Commit b060ee18 authored by Jean-Francois Dockes's avatar Jean-Francois Dockes
Browse files

kio build/packaging fixes

--HG--
branch : RECOLL_1_22_MAINT
parent 52ffa1a3
...@@ -4,10 +4,10 @@ ...@@ -4,10 +4,10 @@
# For the kio: (and kdesdk?) # For the kio: (and kdesdk?)
# sudo apt-get install pkg-kde-tools cdbs # sudo apt-get install pkg-kde-tools cdbs
RCLVERS=1.22.1 RCLVERS=1.22.2
LENSVERS=1.19.10.3543 LENSVERS=1.19.10.3543
SCOPEVERS=1.20.2.4 SCOPEVERS=1.20.2.4
PPAVERS=4 PPAVERS=5
# #
RCLSRC=/y/home/dockes/projets/fulltext/recoll/src RCLSRC=/y/home/dockes/projets/fulltext/recoll/src
...@@ -19,7 +19,7 @@ case $RCLVERS in ...@@ -19,7 +19,7 @@ case $RCLVERS in
1.14*) PPANAME=recoll-ppa;; 1.14*) PPANAME=recoll-ppa;;
*) PPANAME=recoll15-ppa;; *) PPANAME=recoll15-ppa;;
esac esac
#PPANAME=recollexp-ppa PPANAME=recollexp-ppa
echo "PPA: $PPANAME. Type CR if Ok, else ^C" echo "PPA: $PPANAME. Type CR if Ok, else ^C"
read rep read rep
...@@ -73,7 +73,7 @@ done ...@@ -73,7 +73,7 @@ done
### KIO ### KIO
series="trusty utopic vivid wily xenial" series="trusty utopic vivid wily xenial"
series=trusty series="utopic vivid wily xenial"
debdir=debiankio debdir=debiankio
topdir=kio-recoll-${RCLVERS} topdir=kio-recoll-${RCLVERS}
......
kio-recoll (1.22.1-0~ppaPPAVERS~SERIES1) SERIES; urgency=low kio-recoll (1.22.2-0~ppaPPAVERS~SERIES1) SERIES; urgency=low
* No changes specific to the KIO, just use the 1.22 lib. * No changes specific to the KIO, just use the 1.22 lib.
......
...@@ -3,7 +3,8 @@ Section: kde ...@@ -3,7 +3,8 @@ Section: kde
Priority: extra Priority: extra
Maintainer: Jean-Francois Dockes <jfd@recoll.org> Maintainer: Jean-Francois Dockes <jfd@recoll.org>
Build-Depends: cdbs, Build-Depends: cdbs,
cmake, cmake,
libtool,
debhelper (>= 7), debhelper (>= 7),
bison, bison,
kdelibs5-dev (>= 4:4.2.2), kdelibs5-dev (>= 4:4.2.2),
......
...@@ -270,7 +270,7 @@ librecoll_la_LIBADD = $(LIBXAPIAN) $(LIBICONV) $(LIBTHREADS) ...@@ -270,7 +270,7 @@ librecoll_la_LIBADD = $(LIBXAPIAN) $(LIBICONV) $(LIBTHREADS)
PicStatic: $(librecoll_la_OBJECTS) PicStatic: $(librecoll_la_OBJECTS)
rm -f .libs/librecoll.a rm -f .libs/librecoll.a
rm -f .libs/librecoll.so rm -f .libs/librecoll.so
libtool --mode=link gcc -g -O -o librecoll.la \ ./libtool --tag=LD --mode=link gcc -g -O -o librecoll.la \
$(librecoll_la_OBJECTS) $(librecoll_la_OBJECTS)
bin_PROGRAMS = recollindex bin_PROGRAMS = recollindex
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment