yetangitu/recoll
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

indicate that the PPA recoll package conflicts with the debian python-recoll package

Browse source
This commit is contained in:
Jean-Francois Dockes 2013-09-10 15:42:16 +02:00
parent 70179d5189
commit 3af974bb9a
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
packaging/debian/buildppa.sh
View file

@ -4,9 +4,9 @@
# 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.19.4 RCLVERS=1.19.5
LENSVERS=1.19.2.3328 LENSVERS=1.19.2.3328
PPAVERS=1 PPAVERS=3
case $RCLVERS in case $RCLVERS in
[23]*) PPANAME=recollexp-ppa;; [23]*) PPANAME=recollexp-ppa;;
@ -20,7 +20,8 @@ read rep
####### QT4 ####### QT4
debdir=debianrclqt4 debdir=debianrclqt4
series4="lucid oneiric precise quantal raring" series4="lucid oneiric precise quantal raring saucy"
series4="quantal raring"
for series in $series4 ; do for series in $series4 ; do
rm -rf recoll-${RCLVERS}/debian rm -rf recoll-${RCLVERS}/debian

1
packaging/debian/debianrclqt4/control
View file

@ -15,6 +15,7 @@ Standards-Version: 3.9.3
Package: recoll Package: recoll
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends} Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: python-recoll
Recommends: aspell, python, xdg-utils, xsltproc Recommends: aspell, python, xdg-utils, xsltproc
Suggests: antiword, catdoc, ghostscript, libimage-exiftool-perl, poppler-utils, Suggests: antiword, catdoc, ghostscript, libimage-exiftool-perl, poppler-utils,
pstotext, python-chm, python-mutagen, unrtf, untex pstotext, python-chm, python-mutagen, unrtf, untex