1.15.8 packaging/doc fixups

This commit is contained in:
Jean-Francois Dockes 2011-05-03 11:45:12 +02:00
parent 21b82ec251
commit da539f3b6e
14 changed files with 79 additions and 88 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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 <jf@dockes.org> 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 <jf@dockes.org> Fri, 04 Mar 2011 13:54:00 +0200

View File

@ -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 <jf@dockes.org> 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 <jf@dockes.org> Thu, 10 Mar 2011 10:54:00 +0200

View File

@ -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 <jfd@recoll.org> 1.15.8-0
- Initial spec file for kio
* Sun Mar 06 2011 Jean-Francois Dockes <jfd@recoll.org> 1.15.5-0
- Initial spec file for kio

View File

@ -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 <jfd@recoll.org> 1.15.8-0
- Update to release 1.15.8
* Fri Mar 04 2011 Jean-Francois Dockes <jfd@recoll.org> 1.15.5-0
- Update to release 1.15.2
* Thu Feb 15 2011 Jean-Francois Dockes <jfd@recoll.org> 1.15.2-0

View File

@ -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 <jfd@recoll.org> 1.15.8-1
- updated to release 1.15.8
* Fri Mar 15 2011 J.F. Dockes <jfd@recoll.org> 1.15.5-1
- updated to release 1.15.5
* Thu Feb 15 2011 J.F. Dockes <jfd@recoll.org> 1.15.2-1

View File

@ -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 <jfd@recoll.org> 1.15.8-1
- Update to release 1.15.8
* Fri Mar 04 2011 Jean-Francois Dockes <jfd@recoll.org> 1.15.5-1
- Update to release 1.15.5
* Thu Feb 15 2011 Jean-Francois Dockes <jfd@recoll.org> 1.15.2-1

View File

@ -50,7 +50,7 @@
<h2><a>General information</a></h2>
<p>The current version is 1.15.7. <a href="release-1.15.html">
<p>The current version is 1.15.8. <a href="release-1.15.html">
Release notes</a>.</p>
<p>The download page for Recoll 1.14 is
@ -101,12 +101,13 @@
<h2><a name="source">Source</a></h2>
<h3>Current release distribution: 1.15.7:</h3>
<h3>Current release distribution: 1.15.8:</h3>
<!-- Attention: source packages must remain here, not in a
subdirectory, because of all the places they're referred from
(package watches( -->
<p><a href="recoll-1.15.7.tar.gz">recoll-1.15.7.tar.gz</a>.</p>
<p><a href="recoll-1.15.8.tar.gz">recoll-1.15.8.tar.gz</a>.</p>
<!--
<h3>Snapshot</h3>
<p>I sometimes release a source tarfile when I consider that the
current development version is stable enough. The current
@ -115,6 +116,7 @@
changelog</a>, and a synthetic abstract in the
current <a href="release-1.16.html">1.16 release notes</a>).
<p><a href="betarecoll-2240.tar.gz">betarecoll-2240.tar.gz</a>.</p>
-->
<h3>Prerequisites for building from source:</h3>
<ul>
@ -163,8 +165,7 @@
<h3>Older recoll releases:</h3>
<p>
<a href="recoll-1.15.5.tar.gz">1.15.5</a>.
<a href="recoll-1.15.2.tar.gz">1.15.2</a>.
<a href="recoll-1.15.7.tar.gz">1.15.7</a>.
<a href="recoll-1.14.4.tar.gz">1.14.4</a>.
<a href="recoll-1.13.04.tar.gz">1.13.04</a>.
<a href="recoll-1.12.4.tar.gz">1.12.4</a>.
@ -241,23 +242,23 @@ gpg --export --armor A0735AD0 | sudo apt-key add -
<p>These builds are not statically linked, but depend on the
regular Xapian and zlib rpms from the Fedora repositories.
<br>Fedora 12
<a href="fc12/recoll-1.15.5-1.fc12.i586.rpm">
recoll-1.15.5-1.fc12.i586.rpm</a>.
<a href="fc12/recoll-1.15.8-1.fc12.i586.rpm">
recoll-1.15.8-1.fc12.i586.rpm</a>.
Source:
<a href="fc12/recoll-1.15.5-1.fc12.src.rpm">
recoll-1.15.5-1.fc12.src.rpm</a>
<a href="fc12/recoll-1.15.8-1.fc12.src.rpm">
recoll-1.15.8-1.fc12.src.rpm</a>
<br>Fedora 13
<a href="fc13/recoll-1.15.5-1.fc13.i586.rpm">
recoll-1.15.5-1.fc13.i586.rpm</a>.
<a href="fc13/recoll-1.15.8-1.fc13.i586.rpm">
recoll-1.15.8-1.fc13.i586.rpm</a>.
Source:
<a href="fc13/recoll-1.15.5-1.fc13.src.rpm">
recoll-1.15.5-1.fc13.src.rpm</a>
<a href="fc13/recoll-1.15.8-1.fc13.src.rpm">
recoll-1.15.8-1.fc13.src.rpm</a>
<br>Fedora 14
<a href="fc14/recoll-1.15.5-1.fc14.i586.rpm">
recoll-1.15.5-1.fc14.i586.rpm</a>.
<a href="fc14/recoll-1.15.8-1.fc14.i586.rpm">
recoll-1.15.8-1.fc14.i586.rpm</a>.
Source:
<a href="fc14/recoll-1.15.5-1.fc14.src.rpm">
recoll-1.15.5-1.fc14.src.rpm</a>
<a href="fc14/recoll-1.15.8-1.fc14.src.rpm">
recoll-1.15.8-1.fc14.src.rpm</a>
</p>
</blockquote>
@ -274,18 +275,7 @@ gpg --export --armor A0735AD0 | sudo apt-key add -
to your repositories. You will then be able to install
recoll and kio_recoll from the software management
interface. The Xapian dependancy will also be satisfied from
the build service repository. <em>Note: the recoll-1.15.6
file which is used to build the
kio_recoll is identical to 1.15.5 except for some minor changes
in the KIO build files.</em></p>
<p>Remaining pre-build service packages: OpenSUSE 11.3
with qt4 and a static link to xapian
1.2.3 with the --disable-sse configure option:
<a href="suse11.3/recoll-1.15.5-0.i586.rpm">
recoll-1.15.5-0.i586.rpm</a>.
Source: <a href="suse11.3/recoll-1.15.5-0.src.rpm">
recoll-1.15.5-0.src.rpm</a></p>
the build service repository.</p>
</blockquote>
<h3>Mandriva</h3>
@ -293,11 +283,11 @@ gpg --export --armor A0735AD0 | sudo apt-key add -
<p><b>Mandriva linux one 2010 with Qt 4 and a static link to
Xapian 1.2.3 with the --without-sse configure option.</b>:
<a href="mandriva2010/recoll-1.15.5-1mdv2010.2.i586.rpm">
recoll-1.15.5-1mdv2010.2.i586.rpm</a>.
<a href="mandriva2010/recoll-1.15.8-1mdv2010.2.i586.rpm">
recoll-1.15.8-1mdv2010.2.i586.rpm</a>.
Source:
<a href="mandriva2010/recoll-1.15.5-1mdv2010.2.src.rpm">
recoll-1.15.5-1mdv2010.2.src.rpm</a>
<a href="mandriva2010/recoll-1.15.8-1mdv2010.2.src.rpm">
recoll-1.15.8-1mdv2010.2.src.rpm</a>
</p>
</blockquote>
@ -316,10 +306,10 @@ gpg --export --armor A0735AD0 | sudo apt-key add -
<p>The FreeBSD ports track the Recoll releases quite
closely, so there is actually little point in using the
following (except that the port is currently (10-2010) broken).</p>
<p><b>FreeBSD 7.3 i386 Qt 4.7.1</b> Statically linked to
<p><b>FreeBSD 7.4 i386 Qt 4.7.1</b> Statically linked to
Xapian 1.2.3 with --disable-sse:
<a href="freebsd/recoll-1.15.5-FreeBSD-7.3-STABLE.tgz">
recoll-1.15.5-FreeBSD-7.3-STABLE.tgz</a>
<a href="freebsd/recoll-1.15.8-FreeBSD-7.4-STABLE.tgz">
recoll-1.15.8-FreeBSD-7.4-STABLE.tgz</a>
</p>
</blockquote>

View File

@ -47,7 +47,7 @@
<p><span class="application">Recoll</span> is free, open source,
and licensed under the GPL. The current version is
<a class="important" href="download.html">1.15.7</a>
<a class="important" href="download.html">1.15.8</a>
(<a href="release-1.15.html">Release notes</a>).</p>
<h2>Features: </h2>
@ -91,17 +91,17 @@
<h2>News: </h2>
<ul>
<li>2011-05-02: release
<a href="download.html#source">1.15.8</a> is out with
<a href="BUGS.html#b_1_15_7">bug fixes</a> and a few
<a href="release-1.15.html">improvements</a>.
</li>
<li>2011-03-26: added a filter for konqueror webarchive (.war)
format, and elementary support for mimehtml (.mhtml). These
work with stock recoll 1.15, you just need to install the filter
and config adjustments.</li>
<li>2011-03-10 : Recoll <a href="download.html#source">1.15.7</a> is
out. This fixes a number of ennoying bugs in 1.15.2 (no need to
upgrade from 1.15.5). See the <a href="release-1.15.html">Release
notes</a>.
</li>
<li>2010-11-29 : Recoll <a href="download.html#source">1.14.4</a> is
out. This is a small bugs fix release, the important <a
href="CHANGES.html">changes</a> were in 1.14.2. 1.14.4 was

View File

@ -101,18 +101,19 @@
<h2>Nouvelles: </h2>
<ul>
<li>2011-05-02: la version
<a href="download.html#source">1.15.8</a> est disponible
avec des
<a href="BUGS.html#b_1_15_7">corrections de bugs</a> et
quelques <a href="release-1.15.html">améliorations</a>.
</li>
<li>2011-03-26: un nouveau filtre pour le format webarchive de
konqueror (.war), et support élémentaire de mimehtml (.mhtml) (un
autre format d'archives web). Utilisable avec une version
1.15 standard, il suffit d'installer le filtre et d'éditer
la configuration.</li>
<li>2011-03-10 : Recoll <a href="download.html#source">1.15.7</a>
vient de sortir. Cette version corrige quelques défauts ennuyeux
de la version 1.15.2 (mais est quasi-identique à la version
1.15.5). Voir les <a href="release-1.15.html">notes de
version</a> (en anglais). </li>
<li>2010-11-24 : Recoll <a href="download.html#source">1.14.4</a>
vient de sortir. Cette version corrige quelques problèmes
mineurs. <a href="CHANGES.html">Liste des modifications</a>.