Your message dated Mon, 03 May 2010 06:02:12 +0000
with message-id <[email protected]>
and subject line Bug#579929: fixed in recoll 1.13.04-3
has caused the Debian Bug report #579929,
regarding Xapian 1.2 compatibility
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
579929: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=579929
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: recoll
Version: 1.13.04-2
Tags: upstream
User: [email protected]
Usertags: xapian1.2
I'm aiming to get Xapian 1.2 into the next Debian stable release, so I've
been checking all the Debian packages which depend on Xapian.
Recoll includes some sub-headers (e.g. xapian/sorter.h) which applications
aren't meant to do as the sub-headers names, contents, and even existence are
an internal implementation detail. Applications should just include xapian.h.
In Xapian 1.2, sorter.h got renamed. I've attached a patch which just changes
such uses to xapian.h (or drops them when redundant). This allows the code to
work both with Xapian 1.0.x and with 1.2.x, and I've tested building the recoll
package with these changes. So this fix can be uploaded without waiting for
Xapian 1.2.
I sent this patch upstream already. JF said he was unlike to make a new
upstream release in the timeframe needed and that he would forward the patch to
the Debian maintainer, so you may already have it. But I couldn't see a bug in
the BTS for it, so I've filed one to make sure you have the patch and to help
me keep track of the status of the packages needing patching.
Let me know if you want me to just NMU this fix myself.
Cheers,
Olly
--- recoll-1.13.04.orig/rcldb/stemdb.cpp
+++ recoll-1.13.04/rcldb/stemdb.cpp
@@ -12,7 +12,6 @@ static char rcsid[] = "@(#$Id: stemdb.cp
#include <map>
#include <xapian.h>
-#include <xapian/stem.h>
#include "stemdb.h"
#include "wipedir.h"
--- recoll-1.13.04.orig/rcldb/rclquery.cpp
+++ recoll-1.13.04/rcldb/rclquery.cpp
@@ -8,7 +8,7 @@ static char rcsid[] = "@(#$Id: rclquery.
#include <list>
#include <vector>
-#include "xapian/sorter.h"
+#include <xapian.h>
#include "rcldb.h"
#include "rcldb_p.h"
--- recoll-1.13.04.orig/rcldb/rcldb.cpp
+++ recoll-1.13.04/rcldb/rcldb.cpp
@@ -33,7 +33,7 @@ static char rcsid[] = "@(#$Id: rcldb.cpp
using namespace std;
#endif /* NO_NAMESPACES */
-#include "xapian/version.h"
+#include <xapian.h>
#include "rclconfig.h"
#include "rcldb.h"
signature.asc
Description: Digital signature
--- End Message ---
--- Begin Message ---
Source: recoll
Source-Version: 1.13.04-3
We believe that the bug you reported is fixed in the latest version of
recoll, which is due to be installed in the Debian FTP archive:
recoll_1.13.04-3.debian.tar.gz
to main/r/recoll/recoll_1.13.04-3.debian.tar.gz
recoll_1.13.04-3.dsc
to main/r/recoll/recoll_1.13.04-3.dsc
recoll_1.13.04-3_amd64.deb
to main/r/recoll/recoll_1.13.04-3_amd64.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Kartik Mistry <[email protected]> (supplier of updated recoll package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Mon, 03 May 2010 09:47:16 +0530
Source: recoll
Binary: recoll
Architecture: source amd64
Version: 1.13.04-3
Distribution: unstable
Urgency: low
Maintainer: Kartik Mistry <[email protected]>
Changed-By: Kartik Mistry <[email protected]>
Description:
recoll - Personal full text search package with a Qt GUI
Closes: 579929
Changes:
recoll (1.13.04-3) unstable; urgency=low
.
* Added patch for xapian 1.2 compatibility from Olly Betts <[email protected]>
(Closes: #579929)
Checksums-Sha1:
e6edf159c61563debac6ca7d92fc277dc5174d2d 1100 recoll_1.13.04-3.dsc
96042cee085324c1085eb8861a3d71c2812ab3d3 8425 recoll_1.13.04-3.debian.tar.gz
4cace26fb09a9541c54b07b4779154b072b96b7a 1283198 recoll_1.13.04-3_amd64.deb
Checksums-Sha256:
58b12d41668bcf687a635c7dc24bf45c247b99ba858ca8839b43d006f64ad715 1100
recoll_1.13.04-3.dsc
8315e8bdbccc753329ac834b96878ecb958d0723b15cef0e2ef0dfa93b021db7 8425
recoll_1.13.04-3.debian.tar.gz
727a5a4b91b83f3d37e5364f8a06044d4dfabec81fbce3232605920522db563f 1283198
recoll_1.13.04-3_amd64.deb
Files:
66498a322f8c041c43067acffe010f31 1100 x11 optional recoll_1.13.04-3.dsc
f4f02d1568c986db2ac5cbe3f969e2db 8425 x11 optional
recoll_1.13.04-3.debian.tar.gz
ebd1b6d48ff0b34433e4cf7c5f81b080 1283198 x11 optional
recoll_1.13.04-3_amd64.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
iEYEARECAAYFAkveYw8ACgkQoRg/jtECjI05RQCgo/OfR5agei47CMpq0SDtATyy
qocAn2QDpwCkUk5ey96QGq5zOXFvCGg8
=+bpG
-----END PGP SIGNATURE-----
--- End Message ---
