diff --git a/packaging/debian/buildppa.sh b/packaging/debian/buildppa.sh index 498a65fc..4e7469be 100644 --- a/packaging/debian/buildppa.sh +++ b/packaging/debian/buildppa.sh @@ -7,14 +7,14 @@ RCLVERS=1.19.10 LENSVERS=1.19.10.3543 SCOPEVERS=1.19.10.3543 -PPAVERS=2 +PPAVERS=4 case $RCLVERS in [23]*) PPANAME=recollexp-ppa;; 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 @@ -23,7 +23,7 @@ read rep debdir=debian # Note: no new releases for lucid: no webkit. Or use old debianrclqt4 dir. series="precise quantal raring saucy" -series="precise saucy" +#series="precise saucy" if test "X$series" != X ; then test -d recoll-${RCLVERS} || tar xvzf recoll_${RCLVERS}.orig.tar.gz @@ -51,7 +51,7 @@ done ### KIO series="precise quantal raring saucy" -series="precise saucy" +series= debdir=debiankio topdir=kio-recoll-${RCLVERS} @@ -85,7 +85,7 @@ done ### Unity Lens series="precise quantal raring" -series=precise +series= debdir=debianunitylens topdir=recoll-lens-${LENSVERS} @@ -111,7 +111,7 @@ done ### Unity Scope series="saucy" -#series= +series= debdir=debianunityscope topdir=unity-scope-recoll-${SCOPEVERS} diff --git a/packaging/debian/debian/control b/packaging/debian/debian/control index 7048c8ed..4806655f 100644 --- a/packaging/debian/debian/control +++ b/packaging/debian/debian/control @@ -8,7 +8,7 @@ Build-Depends: autotools-dev, libqt4-dev, libqtwebkit-dev, libx11-dev, - libxapian-dev (>= 1.0.15), + libxapian-dev (>= 1.2.0), libz-dev, python-all-dev (>= 2.6.6-3~), python3-all-dev, diff --git a/packaging/debian/debian/rules b/packaging/debian/debian/rules index f130a078..1287043b 100755 --- a/packaging/debian/debian/rules +++ b/packaging/debian/debian/rules @@ -48,8 +48,10 @@ install: dh_testroot dh_prep dh_installdirs - $(MAKE) STRIP=ls prefix=$(CURDIR)/debian/tmp/usr install + # Work around recollinstall forgetting the PPT text-extract utility + install -m 0444 filters/msodump.zip $(CURDIR)/debian/tmp/usr/share/recoll/filters + install -m 0555 filters/ppt-dump.py $(CURDIR)/debian/tmp/usr/share/recoll/filters (cd python/recoll; python setup.py install \ --install-layout=deb \ --prefix=$(CURDIR)/debian/tmp/usr ) diff --git a/packaging/debian/debianrclqt4/control b/packaging/debian/debianrclqt4/control index 62331420..e3b061f1 100644 --- a/packaging/debian/debianrclqt4/control +++ b/packaging/debian/debianrclqt4/control @@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 7), autotools-dev, libqt4-dev, libqtwebkit-dev, - libxapian-dev (>= 1.0.15), + libxapian-dev (>= 1.2.0), libx11-dev, libz-dev, python-all-dev (>= 2.6.6-3~) diff --git a/packaging/debian/debianrclqt4/control-lucid b/packaging/debian/debianrclqt4/control-lucid index 33a1e592..14b44b58 100644 --- a/packaging/debian/debianrclqt4/control-lucid +++ b/packaging/debian/debianrclqt4/control-lucid @@ -5,7 +5,7 @@ Maintainer: Jean-Francois Dockes Build-Depends: debhelper (>= 7), autotools-dev, libqt4-dev, - libxapian-dev (>= 1.0.15), + libxapian-dev (>= 1.2.0), libx11-dev, libz-dev, python-dev, diff --git a/packaging/debian/debianrclqt4/control-maverick b/packaging/debian/debianrclqt4/control-maverick index 11c159c9..489e332d 100644 --- a/packaging/debian/debianrclqt4/control-maverick +++ b/packaging/debian/debianrclqt4/control-maverick @@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 7), autotools-dev, libqt4-dev, libqtwebkit-dev, - libxapian-dev (>= 1.0.15), + libxapian-dev (>= 1.2.0), libx11-dev, libz-dev, python-dev