tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

debian packaging->1.23.4 + avoid conflicts with previous version files

Browse Source
This commit is contained in:
Jean-Francois Dockes 2017-11-16 16:25:09 +01:00
parent 502a347df6
commit f01851df40
5 changed files with 36 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
packaging/debian/buildppa.sh
View File

@ -4,10 +4,11 @@
# For the kio: (and kdesdk?)
# sudo apt-get install pkg-kde-tools cdbs
RCLVERS=1.23.2
LENSVERS=1.19.10.3543
PPA_KEYID=D38B9201
RCLVERS=1.23.4
SCOPEVERS=1.20.2.4
PPAVERS=2
PPAVERS=3
#
RCLSRC=/y/home/dockes/projets/fulltext/recoll/src
@ -19,7 +20,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
@ -45,8 +46,8 @@ debdir=debian
# Note: no new releases for lucid: no webkit. Or use old debianrclqt4 dir.
# No new releases for trusty either because of risk of kio compat (kio
# wont build)
series="xenial yakkety zesty artful"
series=artful
series="xenial zesty artful bionic"
series=
if test "X$series" != X ; then
check_recoll_orig
@ -68,7 +69,7 @@ for series in $series ; do
-e s/PPAVERS/${PPAVERS}/g \
< ${debdir}/changelog > recoll-${RCLVERS}/debian/changelog
(cd recoll-${RCLVERS};debuild -S -sa) || break
(cd recoll-${RCLVERS};debuild -k$PPA_KEYID -S -sa) || break
dput $PPANAME recoll_${RCLVERS}-1~ppa${PPAVERS}~${series}1_source.changes
done
@ -77,8 +78,8 @@ done
### KIO. Does not build on trusty from recoll 1.23 because of the need
### for c++11
series="xenial yakkety zesty artful"
series=
series="xenial zesty artful bionic"
#series=
debdir=debiankio
topdir=kio-recoll-${RCLVERS}
@ -104,50 +105,16 @@ for svers in $series ; do
sed -e s/SERIES/$svers/g \
-e s/PPAVERS/${PPAVERS}/g \
< ${debdir}/changelog > $topdir/debian/changelog ;
(cd $topdir;debuild -S -sa) || exit 1
(cd $topdir;debuild -k$PPA_KEYID -S -sa) || exit 1
dput $PPANAME kio-recoll_${RCLVERS}-0~ppa${PPAVERS}~${svers}1_source.changes
done
### Unity Lens
series="precise"
series=
debdir=debianunitylens
topdir=recoll-lens-${LENSVERS}
if test "X$series" != X ; then
if test ! -f recoll-lens_${LENSVERS}.orig.tar.gz ; then
if test -f recoll-lens-${LENSVERS}.tar.gz ; then
mv recoll-lens-${LENSVERS}.tar.gz \
recoll-lens_${LENSVERS}.orig.tar.gz
else
fatal "Can find neither recoll-lens_${LENSVERS}.orig.tar.gz nor " \
"recoll-lens-${LENSVERS}.tar.gz"
fi
fi
test -d $topdir || tar xvzf recoll-lens_${LENSVERS}.orig.tar.gz || exit 1
fi
for series in $series ; do
rm -rf $topdir/debian
cp -rp ${debdir}/ $topdir/debian || exit 1
sed -e s/SERIES/$series/g \
-e s/PPAVERS/${PPAVERS}/g \
< ${debdir}/changelog > $topdir/debian/changelog ;
(cd $topdir;debuild -S -sa) || break
dput $PPANAME \
recoll-lens_${LENSVERS}-1~ppa${PPAVERS}~${series}1_source.changes
done
### Unity Scope
series="trusty xenial yakkety zesty artful"
#series=
series="trusty xenial zesty artful bionic"
series=
debdir=debianunityscope
if test ! -d ${debdir}/ ; then
@ -183,7 +150,7 @@ for series in $series ; do
-e s/PPAVERS/${PPAVERS}/g \
< ${debdir}/changelog > $topdir/debian/changelog ;
(cd $topdir;debuild -S -sa) || break
(cd $topdir;debuild -k$PPA_KEYID -S -sa) || break
dput $PPANAME \
unity-scope-recoll_${SCOPEVERS}-1~ppa${PPAVERS}~${series}1_source.changes

12
packaging/debian/debian/changelog
View File

@ -1,3 +1,15 @@
recoll (1.23.4-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
* Restore search mode when loading saved simple search.
* Add option -P to recollindex to force purge with -i.
* Split package into non-gui/gui subpackages.
* Add -L option to GUI for forcing messages language.
* Removed 'bin' from default skippedNames.
* Improve robustness of email header parser against encoding errors.
* email: fix additional header indexing.
* Restable: fix popup menu (show dups would open parent folder).
-- Jean-Francois Dockes <jf@dockes.org> Thu, 16 Nov 2017 09:33:00 +0100
recoll (1.23.3-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
* Added function to list files which we failed to index (accessible from

4
packaging/debian/debian/control
View File

@ -49,6 +49,8 @@ Description: Personal full text search package with a Qt GUI
Package: recollcmd
Architecture: any
Breaks: recoll (<< 1.23.4)
Replaces: recoll (<< 1.23.4)
Depends: python, ${misc:Depends}, ${shlibs:Depends}
Recommends: python-recoll, aspell, xdg-utils, xsltproc,
python-libxml2, python-libxslt1
@ -67,6 +69,8 @@ Description: Command line programs for recoll
Package: recollgui
Architecture: any
Breaks: recoll (<< 1.23.4)
Replaces: recoll (<< 1.23.4)
Depends: recollcmd (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}

6
packaging/debian/debiankio/changelog
View File

@ -1,3 +1,9 @@
kio-recoll (1.23.4-0~ppaPPAVERS~SERIES1) SERIES; urgency=low
* Follow main package
-- Jean-Francois Dockes <jf@dockes.org> Thu, 16 Nov 2017 15:41:00 +0100
kio-recoll (1.23.2-0~ppaPPAVERS~SERIES1) SERIES; urgency=low
* Fix crash in text splitter

1
packaging/debian/debiankio/patches/series
View File

@ -1 +0,0 @@
fix-kio-build-ldl.patch