version 1.8.1 ?

packaging/FreeBSD/recoll/Makefile

@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	recoll
-PORTVERSION=	1.7.5
+PORTVERSION=	1.8.1
 CATEGORIES=	deskutils
 MASTER_SITES=	http://www.lesbonscomptes.com/recoll/
 

packaging/FreeBSD/recoll/distinfo

@@ -1,3 +1,3 @@
-MD5 (recoll-1.7.5.tar.gz) = a1f50cfb8936ecff0603c24eb091d7d5
+MD5 (recoll-1.8.1.tar.gz) = e957102132df819982cd0bf74ec6ad5b
-SHA256 (recoll-1.7.5.tar.gz) = a2c11f1800ce37c3fcb94d85d2290f70e4fed773709849a9e9318c16969e9978
+SHA256 (recoll-1.8.1.tar.gz) = 8d0946278f0726056d6dd1809034a94eb4b5675fc48e6a39d503877a4fd99ac4
-SIZE (recoll-1.7.5.tar.gz) = 698479
+SIZE (recoll-1.8.1.tar.gz) = 824561

packaging/FreeBSD/recoll/pkg-plist

@@ -1,7 +1,7 @@
 bin/recoll
 bin/recollindex
-share/applications/recoll.desktop
+share/applications/recoll-searchgui.desktop
-share/icons/hicolor/48x48/apps/recoll.png
+share/icons/hicolor/48x48/apps/recoll-searchgui.png
 %%DATADIR%%/doc/docbook.css
 %%DATADIR%%/doc/usermanual.html
 %%DATADIR%%/examples/mimeconf
@@ -13,14 +13,18 @@ share/icons/hicolor/48x48/apps/recoll.png
 %%DATADIR%%/filters/rcldoc
 %%DATADIR%%/filters/rcldvi
 %%DATADIR%%/filters/rclgaim
+%%DATADIR%%/filters/rcllyx
+%%DATADIR%%/filters/rclman
 %%DATADIR%%/filters/rclmedia
 %%DATADIR%%/filters/rclpdf
 %%DATADIR%%/filters/rclppt
 %%DATADIR%%/filters/rclps
 %%DATADIR%%/filters/rclrtf
+%%DATADIR%%/filters/rclscribus
 %%DATADIR%%/filters/rclsoff
 %%DATADIR%%/filters/rcluncomp
 %%DATADIR%%/filters/rclxls
+%%DATADIR%%/filters/xdg-open
 %%DATADIR%%/images/document.png
 %%DATADIR%%/images/drawing.png
 %%DATADIR%%/images/folder.png
@@ -38,8 +42,9 @@ share/icons/hicolor/48x48/apps/recoll.png
 %%DATADIR%%/images/txt.png
 %%DATADIR%%/images/wordprocessing.png
 %%DATADIR%%/translations/recoll_fr.qm
-%%DATADIR%%/translations/recoll_ru.qm
+%%DATADIR%%/translations/recoll_it.qm
 %%DATADIR%%/translations/recoll_uk.qm
+%%DATADIR%%/translations/recoll_ru.qm
 @dirrm %%DATADIR%%/doc
 @dirrm %%DATADIR%%/examples
 @dirrm %%DATADIR%%/filters

packaging/debian/changelog

@@ -1,6 +1,7 @@
+recoll (1.8.1-0ubuntu1) feisty; urgency=low
+  * Updated package to recoll version 1.8.1
+ -- Jean-Francois Dockes <jean-francois.dockes@wanadoo.fr>  Wed, 7 Mar 2007 09:08:05 +0100
+
 recoll (1.7.5-0ubuntu1) feisty; urgency=low
-
   * Initial release 
-
  -- Jean-Francois Dockes <jean-francois.dockes@wanadoo.fr>  Wed, 10 Jan 2007 16:04:13 +0100
-

packaging/rpm/recoll.spec

@@ -1,5 +1,5 @@
 %define name recoll
-%define version 1.7.5
+%define version 1.8.1
 %define release 0
 
 Name:           %{name}
@@ -53,14 +53,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_bindir}/*
 %{_datadir}/%{name}
-%{_datadir}/applications/recoll.desktop
+%{_datadir}/applications/recoll-searchgui.desktop
-%{_datadir}/icons/hicolor/48x48/apps/recoll.png
+%{_datadir}/icons/hicolor/48x48/apps/recoll-searchgui.png
 %{_mandir}/man1/recoll*
 %{_mandir}/man5/recoll*
 
 # ---------------------------------------------------------------------------
 
 %changelog
+* Tue Mar 6 2007 Jean-Francois Dockes <jean-francois.dockes@wanadoo.fr> 1.8.1-1
+- Update to release 1.8.1
 * Mon Jan 15 2007 Jean-Francois Dockes <jean-francois.dockes@wanadoo.fr> 1.7.5-1
 - Update to release 1.7.5
 * Mon Jan 08 2007 Jean-Francois Dockes <jean-francois.dockes@wanadoo.fr> 1.7.3-1

packaging/rpm/recollfedora.spec

@@ -1,12 +1,12 @@
 Name:           recoll
-Version:        1.7.5
+Version:        1.8.1
 Release:        1%{?dist}
 Summary:        Desktop full text search tool with a qt gui
 
 Group:          Applications/Databases
 License:        GPL
 URL:            http://www.recoll.org/
-Source0:        http://www.recoll.org/recoll-1.7.5.tar.gz 
+Source0:        http://www.recoll.org/recoll-1.8.1.tar.gz 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Not sure how easy it is to find a xapian-core rpm. Will be easier to
@@ -40,14 +40,16 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_bindir}/*
 %{_datadir}/%{name}
-%{_datadir}/applications/recoll.desktop
+%{_datadir}/applications/recoll-searchgui.desktop
-%{_datadir}/icons/hicolor/48x48/apps/recoll.png
+%{_datadir}/icons/hicolor/48x48/apps/recoll-searchgui.png
 %{_mandir}/man1/recoll*
 %{_mandir}/man5/recoll*
 %doc
 
 
 %changelog
+* Tue Mar 6 2007 Jean-Francois Dockes <jean-francois.dockes@wanadoo.fr> 1.8.1-1
+- Update to release 1.8.1
 * Mon Jan 15 2007 Jean-Francois Dockes <jean-francois.dockes@wanadoo.fr> 1.7.5-1
 - Update to release 1.7.5
 * Mon Jan 08 2007 Jean-Francois Dockes <jean-francois.dockes@wanadoo.fr> 1.7.3-1

packaging/rpm/recollmdk.spec

@@ -1,5 +1,5 @@
 %define name recoll
-%define version 1.7.5
+%define version 1.8.1
 %define release  %mkrel 1
 
 Name:           %{name}
@@ -50,16 +50,17 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %{_bindir}/*
-%{_datadir}/applications/recoll.desktop
+%{_datadir}/applications/recoll-searchgui.desktop
-%{_datadir}/icons/hicolor/48x48/apps/recoll.png
+%{_datadir}/icons/hicolor/48x48/apps/recoll-searchgui.png
 %{_datadir}/%{name}
 %{_mandir}/man1/recoll*
 %{_mandir}/man5/recoll*
-%{_datadir}/applications/recoll.desktop
 
 # ---------------------------------------------------------------------------
 
 %changelog
+* Tue Mar 6 2007 Jean-Francois Dockes <jean-francois.dockes@wanadoo.fr> 1.8.1-1
+- Update to release 1.8.1
 * Mon Jan 15 2007 Jean-Francois Dockes <jean-francois.dockes@wanadoo.fr> 1.7.5-1
 - Update to release 1.7.5
 * Mon Jan 08 2007 Jean-Francois Dockes <jean-francois.dockes@wanadoo.fr> 1.7.3-1

src/VERSION

@@ -1 +1 @@
-1.8.0
+1.8.1

src/makestaticdist.sh

@@ -35,10 +35,11 @@ rm -f index/recollindex qtgui/recoll
 make static || exit 1
 strip index/recollindex qtgui/recoll
 
-files="COPYING README INSTALL VERSION Makefile recoll.desktop recollinstall
+files="COPYING README INSTALL VERSION Makefile recollinstall
 filters desktop sampleconf doc/user doc/man
 index/recollindex index/rclmon.sh qtgui/recoll qtgui/i18n/*.qm 
-qtgui/mtpics/*.png recoll.png"
+qtgui/mtpics/*.png 
+desktop/recoll-searchgui.png desktop/recoll-searchgui.desktop"
 
 $TAR chf - $files  | (cd $topdir; $TAR xf -)
 

website/BUGS.txt

@@ -4,36 +4,27 @@ Bugs that are listed in an older version section are supposedly fixed in
 later versions. Bugs listed in the topmost section may also exist in older
 versions. 
 
-Latest (1.7.5):
+Latest (1.8.1):
-- Debian and Ubuntu: the rclsoff Openoffice filter doesn't work,
-  because of an incorrect shell syntax (understood by bash but not sh). To
-  fix, you edit /usr[/local]/share/recoll/filters/rclsoff and can change
-  the line:
-trap cleanup EXIT SIGHUP SIGQUIT SIGINT SIGTERM
-  into:
-trap cleanup EXIT HUP QUIT INT TERM
-  or download the updated filter from the filters page: 
-  http://www.recoll.org/filters/filters.html
-
 - NEAR crashes: 1.6 has added NEAR searches. Unlike what recoll did
   with PHRASES, stemming expansion is performed on terms inside NEAR
   clauses (except if prevented by a capitalized entry of course). There is
-  a bug in Xapian at least up to 0.9.9, where NEAR does not support
+  a bug in Xapian at least up to 0.9.10, where NEAR does not support
   multiple OR subclauses, as would result from a multiple expansion. This
   manifests itself by a 'not implemented' Xapian exception. Workarounds:
 
       - Prevent expansion of NEAR terms (possibly except one) by
         capitalizing them.
 
-      - Or apply the following patch to xapian 0.9.9, inside the "api/"
+      - Or apply the following patch to xapian 0.9.9 or 0.9.10, inside the
-        directory: 
+        "api/" directory: 
          http://www.recoll.org/xapian/xapNearDistrib.patch
         or fetch the already patched source:
-	 http://www.recoll.org/xapian/xapian-core-0.9.9-recollNEARpatch.tar.gz
+	 http://www.recoll.org/xapian/xapian-core-0.9.10-recollNEARpatch.tar.gz
 
         then recompile, and install.
 
-  I hope that the fix will make it into xapian at some point.
+  I hope that an equivalent fix will make it into xapian at some point (the
+  current fix is not completely correct but still handles most useful cases).
 
 - If you are seeing a delay of a few seconds before the result list
   displays for the first query of a recoll instance, try changing the
@@ -63,6 +54,17 @@ trap cleanup EXIT HUP QUIT INT TERM
   yest inexistant db).
 
 ***************************************************************************
+1.7.5
+- Debian and Ubuntu: the rclsoff Openoffice filter doesn't work,
+  because of an incorrect shell syntax (understood by bash but not sh). To
+  fix, you edit /usr[/local]/share/recoll/filters/rclsoff and can change
+  the line:
+trap cleanup EXIT SIGHUP SIGQUIT SIGINT SIGTERM
+  into:
+trap cleanup EXIT HUP QUIT INT TERM
+  or download the updated filter from the filters page: 
+  http://www.recoll.org/filters/filters.html
+
 1.7.3
 - Processing will stop on first error while indexing an mbox file. This
   could happen just because an attachment could not be decoded, and can

website/CHANGES.txt

@@ -14,8 +14,7 @@ CHANGES
   advanced search file, type filter, display more clearly missing helper
   errors, etc. 
 - Option to use the desktop defaults (with xdg-open) to choose the native
-  viewer for files (instead of recoll's mimeview). Also xdg scripts to
+  viewer for files (instead of recoll's mimeview). 
-  install desktop file and icon. 
 
 1.7.6 2007-01-30
  - Fixes an issue with the openoffice filter on debian systems. 

website/download.html

@@ -34,10 +34,18 @@
 
       <h1>Recoll downloads</h1>
 
-      <p><a href="#filters">filters</a> <a href="#source">source</a>
+      <p>
-	<a href="#rpms">rpms</a> <a href="#otherbinary">other binary</a>
+	<table width=100%><tbody><tr>
-	<a href="#ports">Bsd port</a>
+         <td><a href="#rpms">Rpms and Ubuntu packages</a></td>
-	<a href=#translations>translations</a></p>
+	 <td><a href="#otherbinary">Other binary packages</a></td>
+	 <td><a href="#source">Source</a></td>
+	 <td><a href="#ports">Bsd port</a></td>
+	 <td><a href="#filters">Filters</a> </td>
+	 <td><a href="#translations">Translations</a></td>
+	  </tr>
+	</tbody>
+      </table>
+      </p>
 
       <p>You will probably need to have a look at the
 	<a href="usermanual/rcl.install.html">installation manual</a> for
@@ -45,13 +53,15 @@
 
       <p><i>For building from source</i>, you will need a xapian-core
 	installation. You will find source and binary packages on  the 
-	<a href="http://www.xapian.org/download.php">xapian download
+	<a href="http://www.xapian.org/download.php">Xapian download
-	  page</a></p>
+	  page</a>. Recoll should build with any 0.9.x Xapian version
+	  (the current one is 0.9.10).</p>
 
-      <p>You need qt 3.3 (or qt 4) in all cases</p>
+      <p>You need Qt 3.3 (or qt 4) in all cases (configure Recoll with
+      <em>configure --enable-qt4</em> to build with qt4).</p>
 
       <p>Recoll relies on external packages for some
-	of its functionality (ie: for many of the non text file
+	of its functionality (ie: for many of the non-text file
 	types). These are not listed as strict dependencies, because
 	the base application can be sufficient in some cases, but you
 	should have a look at the 
@@ -92,6 +102,11 @@
 
       <h2><a name="source">Source</a></h2>
 
+      <p><a href="recoll-1.8.0.tar.gz">Recoll 1.8.0</a> is out. This
+      mainly brings wildcard suppport, a small query language with
+      some field-based capabilities, and bug fixes. See the
+	  <a href="CHANGES.txt">changes</a> file for more detail.</p> 
+
       <p><b>Current version:</b> 
 
 	<p>1.7.5: <a href="recoll-1.7.5.tar.gz">recoll-1.7.5.tar.gz</a>
@@ -111,7 +126,7 @@
 	<a href="recoll-1.0.16.tar.gz">1.0.16</a>.
       </p>	
 
-      <h2><a name="rpms">RPMS</a></h2>
+      <h2><a name="rpms">Rpms and Ubuntu packages</a></h2>
       <p>The executables inside the binary rpms have a static link to
 	xapian, there is no dependency except Qt 3.3. Of course you need
 	xapian-core installed to use the source rpm. </p>
@@ -155,39 +170,39 @@
 	<a href="debian/edgy/">debian/edgy</a></p>
     </p>
 
-
       <h2><a name="otherbinary">Binary bundles</a></h2>
 
       <p>These are just prebuilt trees (without the source files).
-	The executables were built with xapian 0.9.9 (patched for the
+      The executables were built with xapian 0.9.9 (patched for the
-	NEAR bug) and libiconv
+      NEAR bug) and libiconv
-	1.9.2 (where relevant) as static libraries. They depend on qt
+      1.9.2 (where relevant) as static libraries. They depend on qt
-	3.3. For Solaris, you should be able to find a qt package <a
+      3.3. For Solaris, you should be able to find a qt package <a
-	  href="http://www.sunfreeware.com/">here</a>.</p> 
+        href="http://www.sunfreeware.com/">here</a>.</p> 
 
       <p>The installation instructions are <a
-	  href="usermanual/rcl.install.binary.html"> there</a>.</p>
+        href="usermanual/rcl.install.binary.html"> there</a>.</p>
 
       <p><span class="application">FreeBSD</span> 5.5 i386: 
-	<a href="recoll-1.7.3-FreeBSD-5.5-RELEASE.tgz">
+      <a href="recoll-1.7.5-FreeBSD-5.5-RELEASE.tgz">
-	  recoll-1.7.3-FreeBSD-5.5-RELEASE.tgz</a>
+        recoll-1.7.5-FreeBSD-5.5-RELEASE.tgz</a>
       </p>
 
       <p><span class="application">Solaris 8</span> sparc. 
-	Note to Solaris users: you need to perform the initial
+      Note to Solaris users: you need to perform the initial
-	indexing pass with "recollindex", not the recoll GUI indexing
+      indexing pass with "recollindex", not the recoll GUI indexing
-	thread. See <a href="BUGS.txt">errata</a>.
+      thread. See <a href="BUGS.txt">errata</a>.
-	<a href="recoll-1.7.3-SunOS-5.8.tgz">
+      <a href="recoll-1.7.5-SunOS-5.8.tgz">
-	  recoll-1.7.3-SunOS-5.8.tgz</a>. Source: 
+        recoll-1.7.5-SunOS-5.8.tgz</a>. Source: 
-	<a href="recoll-1.7.3.tar.gz">recoll-1.7.3.tar.gz</a>
+      <a href="recoll-1.7.3.tar.gz">recoll-1.7.5.tar.gz</a>
       </p> 
 
+
       <h2><a name="ports">FreeBSD ports</a></h2> 
 
       <p>There are ports for both xapian-core
 	and recoll in the standard tree, you may just need to update
 	your ports (cvsup, portsnap), or you can get the ports from
-	the FreeBSD site. The ports are not yet updated for the xapian
+	the FreeBSD site. The ports are not updated for the xapian
 	NEAR problem though.
 	<a href="http://cvsweb.freebsd.org/ports/databases/xapian-core">
 	  xapian port</a> 
@@ -195,7 +210,7 @@
 	  recoll port</a>.</p>
 
       <p>Local copies of ports for <a href="port-recoll.tgz">recoll-1.7</a> and
-	<a href="port-xapian-core.tgz">xapian-0.9.9</a> (without the
+	<a href="port-xapian-core.tgz">xapian-0.9.10</a> (without the
 	NEAR patch).</p>