From beb0806779143a21b3ac54337200740cb7533a83 Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Sat, 25 Sep 2010 08:31:57 +0200 Subject: [PATCH] doc --- packaging/debian/buildppa.sh | 28 +++++++++++++++++++------ packaging/debian/debiankio/changelog | 6 +++--- packaging/debian/debiankio/control | 2 +- packaging/debian/debianrclqt3/changelog | 6 +++--- packaging/debian/debianrclqt4/changelog | 6 +++--- packaging/debian/debianrclqt4/control | 2 +- website/BUGS.html | 4 +++- website/CHANGES.html | 2 +- website/download.html | 19 +++++++++++------ website/index.html.en | 2 +- website/index.html.fr | 2 +- 11 files changed, 52 insertions(+), 27 deletions(-) diff --git a/packaging/debian/buildppa.sh b/packaging/debian/buildppa.sh index 43aa9611..2834006b 100644 --- a/packaging/debian/buildppa.sh +++ b/packaging/debian/buildppa.sh @@ -1,11 +1,15 @@ #!/bin/sh +# Packages needed +# sudo apt-get install g++ gnupg dput lintian mini-dinstall yaclc bzr devscripts +# For the kio: (and kdesdk?) +# sudo apt-get install pkg-kde-tools cdbs -RCLVERS=1.14.0 +RCLVERS=1.14.2 PPAVERS=1 ########## QT3 series3="" -series3="dapper hardy intrepid" +series3="dapper hardy" debdir=debianrclqt3 @@ -14,14 +18,13 @@ cp -rp $debdir recoll-${RCLVERS}/debian for series in $series3;do sed -e s/SERIES/$series/g < ${debdir}/changelog > \ recoll-${RCLVERS}/debian/changelog ; - (cd recoll-${RCLVERS};debuild -S -sa) + (cd recoll-${RCLVERS};debuild -S -sa) || break dput recoll-ppa recoll_${RCLVERS}-0~ppa${PPAVERS}~${series}1_source.changes done ####### QT4 series4="" -#series4="jaunty karmic lucid" -series4="jaunty lucid" +series4="jaunty karmic lucid" debdir=debianrclqt4 rm -rf recoll-${RCLVERS}/debian @@ -29,7 +32,20 @@ cp -rp $debdir recoll-${RCLVERS}/debian for series in $series4 ; do sed -e s/SERIES/$series/g < ${debdir}/changelog > \ recoll-${RCLVERS}/debian/changelog ; - (cd recoll-${RCLVERS};debuild -S -sa) + (cd recoll-${RCLVERS};debuild -S -sa) || break dput recoll-ppa recoll_${RCLVERS}-0~ppa${PPAVERS}~${series}1_source.changes done +### KIO +seriesk="" +seriesk="jaunty karmic lucid" + +debdir=debiankio +rm -rf recoll-${RCLVERS}/debian +cp -rp $debdir recoll-${RCLVERS}/debian +for series in $seriesk ; do + sed -e s/SERIES/$series/g < ${debdir}/changelog > \ + recoll-${RCLVERS}/debian/changelog ; + (cd recoll-${RCLVERS};debuild -S -sa) || break + dput recoll-ppa kio-recoll_${RCLVERS}-0~ppa${PPAVERS}~${series}1_source.changes +done diff --git a/packaging/debian/debiankio/changelog b/packaging/debian/debiankio/changelog index a937d28f..d17f9c48 100644 --- a/packaging/debian/debiankio/changelog +++ b/packaging/debian/debiankio/changelog @@ -1,8 +1,8 @@ -kio-recoll (1.14.0-0~ppa1~SERIES1) SERIES; urgency=low +kio-recoll (1.14.2-0~ppa1~SERIES1) SERIES; urgency=low - * Update to recoll version 1.14.0 + * Update to recoll version 1.14.2 - -- Jean-Francois Dockes Mon Sep 13 21:26:27 CEST 2010 + -- Jean-Francois Dockes Sat, 25 Sep 2010 09:37:20 +0200 kio-recoll (1.13.01-0~ppa4~SERIES1) SERIES; urgency=low diff --git a/packaging/debian/debiankio/control b/packaging/debian/debiankio/control index 86a09af6..e3885456 100644 --- a/packaging/debian/debiankio/control +++ b/packaging/debian/debiankio/control @@ -2,7 +2,7 @@ Source: kio-recoll Section: kde Priority: extra Maintainer: Jean-Francois Dockes -Build-Depends: cdbs, cmake, debhelper (>= 7), kdelibs5-dev (>= 4:4.2.2), pkg-kde-tools (>= 0.4.0), libxapian-dev +Build-Depends: cdbs, cmake, debhelper (>= 7), kdelibs5-dev (>= 4:4.2.2), pkg-kde-tools (>= 0.4.0), libxapian-dev, libz-dev Standards-Version: 3.8.1 Homepage: http://www.recoll.org/ diff --git a/packaging/debian/debianrclqt3/changelog b/packaging/debian/debianrclqt3/changelog index 4b274e47..541c9728 100644 --- a/packaging/debian/debianrclqt3/changelog +++ b/packaging/debian/debianrclqt3/changelog @@ -1,6 +1,6 @@ -recoll (1.14.0-0~ppa1~SERIES1) SERIES; urgency=low - * Updated package to recoll version 1.14.0 - -- Jean-Francois Dockes Mon Sep 13 21:26:27 CEST 2010 +recoll (1.14.2-0~ppa1~SERIES1) SERIES; urgency=low + * Updated package to recoll version 1.14.2 + -- Jean-Francois Dockes Sat, 25 Sep 2010 09:37:20 +0200 recoll (1.13.04-0~ppa1~SERIES1) SERIES; urgency=low * Updated package to recoll version 1.13.04 diff --git a/packaging/debian/debianrclqt4/changelog b/packaging/debian/debianrclqt4/changelog index bf67a47c..15f6bdb0 100644 --- a/packaging/debian/debianrclqt4/changelog +++ b/packaging/debian/debianrclqt4/changelog @@ -1,6 +1,6 @@ -recoll (1.14.0-0~ppa1~SERIES1) SERIES; urgency=low - * Update to release 1.14.0 - -- Jean-Francois Dockes Mon Sep 13 21:26:27 CEST 2010 +recoll (1.14.2-0~ppa1~SERIES1) SERIES; urgency=low + * Update to release 1.14.2 + -- Jean-Francois Dockes Sat, 25 Sep 2010 09:37:20 +0200 recoll (1.13.04-0~ppa2~SERIES1) SERIES; urgency=low * Switch to qt4 on Jaunty. diff --git a/packaging/debian/debianrclqt4/control b/packaging/debian/debianrclqt4/control index 22f51463..3a4a9c07 100644 --- a/packaging/debian/debianrclqt4/control +++ b/packaging/debian/debianrclqt4/control @@ -14,7 +14,7 @@ Package: recoll Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: aspell, python -Suggests: antiword, catdoc, ghostscript, libimage-exiftool-perl, poppler-utils, unrtf, xpdf +Suggests: antiword, catdoc, ghostscript, libimage-exiftool-perl, poppler-utils, unrtf, python-mutagen, xsltproc Description: a personal full text search package with a QT GUI The Recoll personal full text search package is based on a very strong backend (Xapian), for which it provides an easy to use and feature-rich diff --git a/website/BUGS.html b/website/BUGS.html index 5a9931d7..0dc6c167 100644 --- a/website/BUGS.html +++ b/website/BUGS.html @@ -35,7 +35,7 @@ supposedly fixed in later versions. Bugs listed in the topmost section may also exist in older versions.

-

recoll 1.14.1 + xapian 1.2+ + qt 4.4.1+

+

recoll 1.14.2 + xapian 1.2+ + qt 4.4.1+

  • Performing a full index with release 1.11 or later, over a version created with a much older recoll release may @@ -72,6 +72,8 @@ slightly slower indexing for doc files.
+

recoll 1.14.1

+
  • Compressed file view fix broke help viewer.

    • recoll 1.13.04

  • Note: some of the bugs listed here are not actually diff --git a/website/CHANGES.html b/website/CHANGES.html index eb8f28ed..e4a794a6 100644 --- a/website/CHANGES.html +++ b/website/CHANGES.html @@ -31,7 +31,7 @@

    Recoll journal of user-visible changes

    -

    1.14.1

    +

    1.14.2

    • date selection in queries.
      • diff --git a/website/download.html b/website/download.html index 180550b0..30b47e29 100644 --- a/website/download.html +++ b/website/download.html @@ -127,9 +127,7 @@ Changes. Bugs.

      You can also download the brand new - recoll-1.14.0.tar.gz. The - KIO slave in 1.14 does not compile because of a missing - include. Patch here. + recoll-1.14.2.tar.gz.

      Prerequisites for building from source:

      @@ -232,6 +230,13 @@ gpg --export --armor 9DA85604 | sudo apt-key add - gpg --keyserver keyserver.ubuntu.com --recv A0735AD0 gpg --export --armor A0735AD0 | sudo apt-key add - + For Jaunty and newer releases, the procedure has been + simplified, and the 2 following commands perform the whole + procedure: +
      
+sudo add-apt-repository ppa:xapian-backports/ppa
+sudo add-apt-repository ppa:recoll-backports/ppa
+

      @@ -255,9 +260,11 @@ gpg --export --armor A0735AD0 | sudo apt-key add - recoll-1.13.04-1.src.rpm This package usually also installs and runs on Fedora 9.

      -

      Fedora 10 and 12 with Qt 4 - These builds are not statically linked, but depend on the - regular Xapian and zlib rpms from the Fedora repositories. +

      Fedora 10 and 12 with Qt 4Recoll is now included in the + regular Fedora package repositories. The following are just in + case they're not up to the version you want. These builds are + not statically linked, but depend on the regular Xapian and + zlib rpms from the Fedora repositories.
      FC10 recoll-1.13.04-2.fc10.i586.rpm. diff --git a/website/index.html.en b/website/index.html.en index 1007843f..127b7d44 100644 --- a/website/index.html.en +++ b/website/index.html.en @@ -81,7 +81,7 @@

      News:

        -
      • 2010-09-18 : Recoll 1.14.0 is +
      • 2010-09-23 : Recoll 1.14.2 is out. The main new feature is the use of document dates in searches, buf there are a few others too. As usual with a .0 release, there may be diff --git a/website/index.html.fr b/website/index.html.fr index c7b5ec26..a8665418 100644 --- a/website/index.html.fr +++ b/website/index.html.fr @@ -95,7 +95,7 @@

        Nouvelles:

          -
        • 2010-09-18 : Recoll 1.14.0 +
        • 2010-09-18 : Recoll 1.14.2 vient de sortir. L'innovation principale est la possibilité d'utiliser des critères de dates dans les recherches, mais il y en a quelques autres. Comme