diff --git a/packaging/debian/buildppa.sh b/packaging/debian/buildppa.sh index f6808641..498a65fc 100644 --- a/packaging/debian/buildppa.sh +++ b/packaging/debian/buildppa.sh @@ -4,9 +4,9 @@ # For the kio: (and kdesdk?) # sudo apt-get install pkg-kde-tools cdbs -RCLVERS=1.20.0 -LENSVERS=1.20.0.3519 -SCOPEVERS=1.20.0.3519 +RCLVERS=1.19.10 +LENSVERS=1.19.10.3543 +SCOPEVERS=1.19.10.3543 PPAVERS=2 case $RCLVERS in @@ -20,38 +20,12 @@ echo "PPA: $PPANAME. Type CR if Ok, else ^C" read rep ####### QT4 -debdir=debianrclqt4 -series="lucid oneiric precise" -series="" -if test X$series != X ; then - test -d recoll-${RCLVERS} || tar xvzf recoll_${RCLVERS}.orig.tar.gz -fi - -for series in $series ; do - rm -rf recoll-${RCLVERS}/debian - cp -rp ${debdir}/ recoll-${RCLVERS}/debian || exit 1 - - if test -f $debdir/control-$series ; then - cp -f -p $debdir/control-$series recoll-${RCLVERS}/debian/control - else - cp -f -p $debdir/control recoll-${RCLVERS}/debian/control - fi - - sed -e s/SERIES/${series}/g \ - -e s/PPAVERS/${PPAVERS}/g \ - < ${debdir}/changelog > recoll-${RCLVERS}/debian/changelog - - (cd recoll-${RCLVERS};debuild -S -sa) || break - - dput $PPANAME recoll_${RCLVERS}-1~ppa${PPAVERS}~${series}1_source.changes -done - -####### QT4 separate python packages debdir=debian -series="quantal raring saucy" -series="" +# Note: no new releases for lucid: no webkit. Or use old debianrclqt4 dir. +series="precise quantal raring saucy" +series="precise saucy" -if test X$series != X ; then +if test "X$series" != X ; then test -d recoll-${RCLVERS} || tar xvzf recoll_${RCLVERS}.orig.tar.gz fi @@ -76,17 +50,23 @@ for series in $series ; do done ### KIO -series="lucid oneiric precise quantal raring" -series= +series="precise quantal raring saucy" +series="precise saucy" debdir=debiankio topdir=kio-recoll-${RCLVERS} -if test X$series != X ; then - test -d kio-recoll_${RCLVERS}.orig.tar.gz || \ +if test "X$series" != X ; then + if test ! -d kio-recoll_${RCLVERS}.orig.tar.gz ; then cp -p recoll_${RCLVERS}.orig.tar.gz \ - kio-recoll_${RCLVERS}.orig.tar.gz || \ - exit 1 - test -d $topdir || tar xvzf recoll_${RCLVERS}.orig.tar.gz + kio-recoll_${RCLVERS}.orig.tar.gz || exit 1 + fi + if test ! -d $topdir ; then + mkdir temp + cd temp + tar xvzf ../recoll_${RCLVERS}.orig.tar.gz || exit 1 + mv recoll-${RCLVERS} ../$topdir || exit 1 + cd .. + fi fi for series in $series ; do @@ -104,15 +84,15 @@ for series in $series ; do done ### Unity Lens -series="oneiric precise quantal raring" -series= +series="precise quantal raring" +series=precise debdir=debianunitylens topdir=recoll-lens-${LENSVERS} -if test X$series != X ; then +if test "X$series" != X ; then test -d $topdir || tar xvzf recoll-lens_${LENSVERS}.orig.tar.gz fi -test -d $topdir || + for series in $series ; do rm -rf $topdir/debian @@ -135,7 +115,7 @@ series="saucy" debdir=debianunityscope topdir=unity-scope-recoll-${SCOPEVERS} -if test X$series != X ; then +if test "X$series" != X ; then test -d $topdir || tar xvzf unity-scope-recoll_${LENSVERS}.orig.tar.gz fi for series in $series ; do diff --git a/packaging/debian/debian/changelog b/packaging/debian/debian/changelog index 1c8ed949..6d4f9cd7 100644 --- a/packaging/debian/debian/changelog +++ b/packaging/debian/debian/changelog @@ -1,8 +1,8 @@ -recoll (1.20.0-1~ppaPPAVERS~SERIES1) SERIES; urgency=low +recoll (1.19.10-1~ppaPPAVERS~SERIES1) SERIES; urgency=low - * Separate python packages and "smart" scope + * Support for saucy in 1.19. Separate python and python3 packages - -- Jean-Francois Dockes Mon, 11 Nov 2013 11:01:46 +0100 + -- Jean-Francois Dockes Sat, 23 Nov 2013 16:01:46 +0100 recoll (1.18.1-1) experimental; urgency=low diff --git a/packaging/debian/debian/control b/packaging/debian/debian/control index 129b2ba5..e4c090bf 100644 --- a/packaging/debian/debian/control +++ b/packaging/debian/debian/control @@ -21,7 +21,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/recoll.git;a=summa Package: recoll Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} -Recommends: aspell, python, xdg-utils, xsltproc +Recommends: recoll-python, aspell, python, xdg-utils, xsltproc Suggests: antiword, catdoc, ghostscript, diff --git a/packaging/debian/debian/rules b/packaging/debian/debian/rules index 64b39b6b..f130a078 100755 --- a/packaging/debian/debian/rules +++ b/packaging/debian/debian/rules @@ -9,7 +9,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) CFLAGS = -Wall -g -LDFLAGS = -Wl,-z,defs +#LDFLAGS = -Wl,-z,defs #build qt4 UI only export QMAKE=qmake-qt4 @@ -33,7 +33,7 @@ build-arch: build-stamp build-indep: build-stamp build-stamp: config.status dh_testdir - $(MAKE) -j 5 + $(MAKE) touch $@ clean: diff --git a/packaging/debian/debiankio/changelog b/packaging/debian/debiankio/changelog index 799566a9..c8aed12d 100644 --- a/packaging/debian/debiankio/changelog +++ b/packaging/debian/debiankio/changelog @@ -1,3 +1,7 @@ +kio-recoll (1.19.10-0~ppaPPAVERS~SERIES1) SERIES; urgency=low + * Updated package to recoll version 1.19.10 + -- Jean-Francois Dockes Sat, 25 Nov 2013 18:00:00 +0100 + kio-recoll (1.19.2-0~ppaPPAVERS~SERIES1) SERIES; urgency=low * Updated package to recoll version 1.19.2 -- Jean-Francois Dockes Mon, 13 May 2013 12:09:00 +0100 diff --git a/packaging/debian/debianunitylens/changelog b/packaging/debian/debianunitylens/changelog index 7b5b731f..301b6eb6 100644 --- a/packaging/debian/debianunitylens/changelog +++ b/packaging/debian/debianunitylens/changelog @@ -1,3 +1,7 @@ +recoll-lens (1.19.10.3543-1~ppaPPAVERS~SERIES1) SERIES; urgency=low + * Updated lens to release 1.19.10 + -- Jean-Francois Dockes Sat, 23 Nov 2013 18:00:00 +0100 + recoll-lens (1.19.2.3328-1~ppaPPAVERS~SERIES1) SERIES; urgency=low * Updated lens to release 1.19.2, for consistency, same as 1.19.0 in fact -- Jean-Francois Dockes Mon, 14 May 2013 08:22:00 +0100 diff --git a/packaging/debian/debianunitylens/control b/packaging/debian/debianunitylens/control index fc556cc6..706ce5e4 100644 --- a/packaging/debian/debianunitylens/control +++ b/packaging/debian/debianunitylens/control @@ -5,8 +5,9 @@ Maintainer: Jean-Francois Dockes Build-Depends: debhelper (>= 7), autotools-dev, recoll, + python-recoll, python -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Package: recoll-lens Architecture: all diff --git a/packaging/debian/debianunitylens/rules b/packaging/debian/debianunitylens/rules index 63fef561..0b244d33 100755 --- a/packaging/debian/debianunitylens/rules +++ b/packaging/debian/debianunitylens/rules @@ -39,6 +39,7 @@ binary-indep: build install dh_testroot dh_installchangelogs ChangeLog dh_installdocs README + dh_python2 dh_link dh_compress dh_fixperms diff --git a/src/desktop/unity-scope-recoll/debian/changelog b/src/desktop/unity-scope-recoll/debian/changelog index 1519466b..b3432633 100644 --- a/src/desktop/unity-scope-recoll/debian/changelog +++ b/src/desktop/unity-scope-recoll/debian/changelog @@ -1,4 +1,4 @@ -unity-scope-recoll (1.20.0.3519-1~ppaPPAVERS~SERIES1) SERIES; urgency=low +unity-scope-recoll (1.19.10.3543-1~ppaPPAVERS~SERIES1) SERIES; urgency=low * Initial port of the recoll lens to the new Dash - -- Jean-Francois Dockes Wed, 06 Nov 2013 15:23:00 +0200 + -- Jean-Francois Dockes Wed, 23 Nov 2013 18:00:00 +0200