From da539f3b6e557fd40479610fdeabb34083500b2e Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Tue, 3 May 2011 11:45:12 +0200 Subject: [PATCH] 1.15.8 packaging/doc fixups --- packaging/FreeBSD/recoll/Makefile | 5 +- packaging/FreeBSD/recoll/distinfo | 5 +- .../FreeBSD/recoll/files/patch-configure | 24 ------- packaging/FreeBSD/recoll/pkg-plist | 13 +++- packaging/debian/buildppa.sh | 2 +- packaging/debian/debiankio/changelog | 4 ++ packaging/debian/debianrclqt4/changelog | 4 ++ packaging/rpm/kio_recoll.spec | 7 ++- packaging/rpm/recoll.spec | 4 +- packaging/rpm/recollfedora10+.spec | 6 +- packaging/rpm/recollmdk.spec | 4 +- website/download.html | 62 ++++++++----------- website/index.html.en | 14 ++--- website/index.html.fr | 13 ++-- 14 files changed, 79 insertions(+), 88 deletions(-) delete mode 100644 packaging/FreeBSD/recoll/files/patch-configure diff --git a/packaging/FreeBSD/recoll/Makefile b/packaging/FreeBSD/recoll/Makefile index 5d68a8e3..69da61d3 100644 --- a/packaging/FreeBSD/recoll/Makefile +++ b/packaging/FreeBSD/recoll/Makefile @@ -6,7 +6,7 @@ # PORTNAME= recoll -PORTVERSION= 1.14.2 +PORTVERSION= 1.15.8 CATEGORIES= deskutils MASTER_SITES= http://www.lesbonscomptes.com/recoll/ @@ -16,8 +16,7 @@ COMMENT= A personal full text search package, based on QT and Xapian LIB_DEPENDS= xapian.[1-2][0-9]:${PORTSDIR}/databases/xapian-core USE_QT_VER= 4 -QT_COMPONENTS= gui qmake_build uic_build moc_build rcc_build \ - qt3support uic3_build porting +QT_COMPONENTS= gui qmake_build uic_build moc_build rcc_build GNU_CONFIGURE= yes USE_GMAKE= yes USE_ICONV= yes diff --git a/packaging/FreeBSD/recoll/distinfo b/packaging/FreeBSD/recoll/distinfo index 12917bca..3d5f1c6e 100644 --- a/packaging/FreeBSD/recoll/distinfo +++ b/packaging/FreeBSD/recoll/distinfo @@ -1,3 +1,2 @@ -MD5 (recoll-1.14.2.tar.gz) = 6130d2c6c9d82ef7e2f01f4441b7abc5 -SHA256 (recoll-1.14.2.tar.gz) = 064932fb359760fb757ef72f04e1c6b54bf4990e2e0331b8babe97251ad32eb2 -SIZE (recoll-1.14.2.tar.gz) = 1285595 +SHA256 (recoll-1.15.8.tar.gz) = f89f2cc76c915177372798b301eca7dfff36b35d474cd1dea6dddbb691f72b08 +SIZE (recoll-1.15.8.tar.gz) = 1324656 diff --git a/packaging/FreeBSD/recoll/files/patch-configure b/packaging/FreeBSD/recoll/files/patch-configure deleted file mode 100644 index f55b3df4..00000000 --- a/packaging/FreeBSD/recoll/files/patch-configure +++ /dev/null @@ -1,24 +0,0 @@ -diff -r 3ff2556caa01 src/configure ---- configure Sat Sep 25 08:32:10 2010 +0200 -+++ configure Sat Sep 25 16:16:33 2010 +0200 -@@ -5159,8 +5159,9 @@ - if test X$QMAKE = X ; then - QMAKE=qmake - fi -- -- # Extract the first word of "$QMAKE", so it can be a program name with args. -+ case $QMAKE in -+ */*) QMAKEPATH=$QMAKE;; -+ *) # Extract the first word of "$QMAKE", so it can be a program name with args. - set dummy $QMAKE; ac_word=$2 - { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } -@@ -5200,6 +5201,8 @@ - $as_echo "no" >&6; } - fi - -+;; -+ esac - - if test X$QMAKEPATH = XNOTFOUND ; then - { { $as_echo "$as_me:$LINENO: error: Cannot find the qmake diff --git a/packaging/FreeBSD/recoll/pkg-plist b/packaging/FreeBSD/recoll/pkg-plist index 8f715eca..f1dce6f6 100644 --- a/packaging/FreeBSD/recoll/pkg-plist +++ b/packaging/FreeBSD/recoll/pkg-plist @@ -11,6 +11,7 @@ share/pixmaps/recoll.png %%DATADIR%%/examples/mimeview %%DATADIR%%/examples/rclmon.sh %%DATADIR%%/examples/recoll.conf +%%DATADIR%%/filters/hotrecoll.py %%DATADIR%%/filters/rclabw %%DATADIR%%/filters/rclaptosidman %%DATADIR%%/filters/rclaudio @@ -25,29 +26,36 @@ share/pixmaps/recoll.png %%DATADIR%%/filters/rclics %%DATADIR%%/filters/rclid3 %%DATADIR%%/filters/rclimg +%%DATADIR%%/filters/rclinfo +%%DATADIR%%/filters/rclkar %%DATADIR%%/filters/rclkwd +%%DATADIR%%/filters/rcllatinclass.py +%%DATADIR%%/filters/rcllatinstops.zip %%DATADIR%%/filters/rcllyx %%DATADIR%%/filters/rclman %%DATADIR%%/filters/rclnull %%DATADIR%%/filters/rclogg %%DATADIR%%/filters/rclopxml %%DATADIR%%/filters/rclpdf -%%DATADIR%%/filters/rclpurple -%%DATADIR%%/filters/rclpython %%DATADIR%%/filters/rclppt %%DATADIR%%/filters/rclps +%%DATADIR%%/filters/rclpurple +%%DATADIR%%/filters/rclpython %%DATADIR%%/filters/rclrtf %%DATADIR%%/filters/rclscribus +%%DATADIR%%/filters/rclshowinfo %%DATADIR%%/filters/rclsiduxman %%DATADIR%%/filters/rclsoff %%DATADIR%%/filters/rclsvg %%DATADIR%%/filters/rcltex %%DATADIR%%/filters/rcltext %%DATADIR%%/filters/rcluncomp +%%DATADIR%%/filters/rclwar %%DATADIR%%/filters/rclwpd %%DATADIR%%/filters/rclxls %%DATADIR%%/filters/rclzip %%DATADIR%%/filters/xdg-open +%%DATADIR%%/images/aptosid-book.png %%DATADIR%%/images/aptosid-manual.png %%DATADIR%%/images/document.png %%DATADIR%%/images/drawing.png @@ -70,6 +78,7 @@ share/pixmaps/recoll.png %%DATADIR%%/images/wordprocessing.png %%DATADIR%%/translations/recoll_fr.qm %%DATADIR%%/translations/recoll_it.qm +%%DATADIR%%/translations/recoll_lt.qm %%DATADIR%%/translations/recoll_de.qm %%DATADIR%%/translations/recoll_uk.qm %%DATADIR%%/translations/recoll_ru.qm diff --git a/packaging/debian/buildppa.sh b/packaging/debian/buildppa.sh index 6437d70f..ab490e69 100644 --- a/packaging/debian/buildppa.sh +++ b/packaging/debian/buildppa.sh @@ -4,7 +4,7 @@ # For the kio: (and kdesdk?) # sudo apt-get install pkg-kde-tools cdbs -RCLVERS=1.15.7 +RCLVERS=1.15.8 PPAVERS=1 case $RCLVERS in diff --git a/packaging/debian/debiankio/changelog b/packaging/debian/debiankio/changelog index 85d06d68..64321242 100644 --- a/packaging/debian/debiankio/changelog +++ b/packaging/debian/debiankio/changelog @@ -1,3 +1,7 @@ +kio-recoll (1.15.8-0~ppa1~SERIES1) SERIES; urgency=low + * Updated package to recoll version 1.15.8 + -- Jean-Francois Dockes Mon, 02 May 2011 17:27:00 +0200 + kio-recoll (1.15.5-0~ppa1~SERIES1) SERIES; urgency=low * Update to recoll version 1.15.5 -- Jean-Francois Dockes Fri, 04 Mar 2011 13:54:00 +0200 diff --git a/packaging/debian/debianrclqt4/changelog b/packaging/debian/debianrclqt4/changelog index e6523ee7..a0081b92 100644 --- a/packaging/debian/debianrclqt4/changelog +++ b/packaging/debian/debianrclqt4/changelog @@ -1,3 +1,7 @@ +recoll (1.15.8-0~ppa1~SERIES1) SERIES; urgency=low + * Updated package to recoll version 1.15.8 + -- Jean-Francois Dockes Mon, 02 May 2011 17:27:00 +0200 + recoll (1.15.7-0~ppa1~SERIES1) SERIES; urgency=low * Updated package to recoll version 1.15.7 -- Jean-Francois Dockes Thu, 10 Mar 2011 10:54:00 +0200 diff --git a/packaging/rpm/kio_recoll.spec b/packaging/rpm/kio_recoll.spec index 67d885df..c53cb800 100644 --- a/packaging/rpm/kio_recoll.spec +++ b/packaging/rpm/kio_recoll.spec @@ -1,5 +1,5 @@ %define name kio_recoll -%define version 1.15.6 +%define version 1.15.8 %define release 0 Name: %{name} @@ -14,7 +14,7 @@ Group: Applications/Databases BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot License: GPL -BuildRequires: libkde4-devel zlib-devel-static libxapian-devel libuuid-devel +BuildRequires: libkde4-devel zlib-devel libxapian-devel libuuid-devel Requires: recoll %description @@ -66,5 +66,8 @@ rm -rf $RPM_BUILD_ROOT # --------------------------------------------------------------------------- %changelog +* Mon May 02 2011 Jean-Francois Dockes 1.15.8-0 +- Initial spec file for kio * Sun Mar 06 2011 Jean-Francois Dockes 1.15.5-0 - Initial spec file for kio + diff --git a/packaging/rpm/recoll.spec b/packaging/rpm/recoll.spec index d306c00e..22e301e4 100644 --- a/packaging/rpm/recoll.spec +++ b/packaging/rpm/recoll.spec @@ -1,5 +1,5 @@ %define name recoll -%define version 1.15.5 +%define version 1.15.8 %define release 0 Name: %{name} @@ -67,6 +67,8 @@ rm -rf $RPM_BUILD_ROOT # --------------------------------------------------------------------------- %changelog +* Mon May 02 2011 Jean-Francois Dockes 1.15.8-0 +- Update to release 1.15.8 * Fri Mar 04 2011 Jean-Francois Dockes 1.15.5-0 - Update to release 1.15.2 * Thu Feb 15 2011 Jean-Francois Dockes 1.15.2-0 diff --git a/packaging/rpm/recollfedora10+.spec b/packaging/rpm/recollfedora10+.spec index 68e53597..2e1ca758 100644 --- a/packaging/rpm/recollfedora10+.spec +++ b/packaging/rpm/recollfedora10+.spec @@ -1,12 +1,12 @@ Name: recoll -Version: 1.15.5 +Version: 1.15.8 Release: 1%{?dist} Summary: Desktop full text search tool with a qt gui Group: Applications/Databases License: GPLv2 URL: http://www.recoll.org/ -Source0: http://www.recoll.org/recoll-1.15.5.tar.gz +Source0: http://www.recoll.org/recoll-1.15.8.tar.gz BuildRequires: qt-devel xapian-core-devel zlib-devel desktop-file-utils @@ -50,6 +50,8 @@ rm -rf %{buildroot} %doc %changelog +* Mon May 02 2011 J.F. Dockes 1.15.8-1 +- updated to release 1.15.8 * Fri Mar 15 2011 J.F. Dockes 1.15.5-1 - updated to release 1.15.5 * Thu Feb 15 2011 J.F. Dockes 1.15.2-1 diff --git a/packaging/rpm/recollmdk.spec b/packaging/rpm/recollmdk.spec index 1613a6a9..dbe15d65 100644 --- a/packaging/rpm/recollmdk.spec +++ b/packaging/rpm/recollmdk.spec @@ -1,5 +1,5 @@ %define name recoll -%define version 1.15.5 +%define version 1.15.8 %define release %mkrel 1 Name: %{name} @@ -59,6 +59,8 @@ rm -rf $RPM_BUILD_ROOT # --------------------------------------------------------------------------- %changelog +* Tue May 03 2011 Jean-Francois Dockes 1.15.8-1 +- Update to release 1.15.8 * Fri Mar 04 2011 Jean-Francois Dockes 1.15.5-1 - Update to release 1.15.5 * Thu Feb 15 2011 Jean-Francois Dockes 1.15.2-1 diff --git a/website/download.html b/website/download.html index 92efd7ff..56703014 100644 --- a/website/download.html +++ b/website/download.html @@ -50,7 +50,7 @@

General information

-

The current version is 1.15.7. +

The current version is 1.15.8. Release notes.

The download page for Recoll 1.14 is @@ -101,12 +101,13 @@

Source

-

Current release distribution: 1.15.7:

+

Current release distribution: 1.15.8:

-

recoll-1.15.7.tar.gz.

+

recoll-1.15.8.tar.gz.

+

Prerequisites for building from source: