diff --git a/.hgignore b/.hgignore new file mode 100644 index 00000000..99dcdbee --- /dev/null +++ b/.hgignore @@ -0,0 +1,76 @@ +syntax: glob +*.o +*.dep +*.dep.stamp +*~ +\#* + +src/Makefile +src/bincimapmime/alldeps +src/common/autoconfig.h +src/common/rclversion.h +src/config.log +src/config.status +src/doc/user/HTML.manifest +src/doc/user/index.html +src/doc/user/rcl.indexing.beaglequeue.html +src/doc/user/rcl.indexing.config.html +src/doc/user/rcl.indexing.html +src/doc/user/rcl.indexing.monitor.html +src/doc/user/rcl.indexing.periodic.html +src/doc/user/rcl.indexing.storage.html +src/doc/user/rcl.install.building.html +src/doc/user/rcl.install.config.html +src/doc/user/rcl.install.external.html +src/doc/user/rcl.install.html +src/doc/user/rcl.introduction.html +src/doc/user/rcl.introduction.recoll.html +src/doc/user/rcl.introduction.search.html +src/doc/user/rcl.kicker-applet.html +src/doc/user/rcl.program.api.html +src/doc/user/rcl.program.fields.html +src/doc/user/rcl.program.html +src/doc/user/rcl.search.complex.html +src/doc/user/rcl.search.custom.html +src/doc/user/rcl.search.history.html +src/doc/user/rcl.search.html +src/doc/user/rcl.search.lang.html +src/doc/user/rcl.search.multidb.html +src/doc/user/rcl.search.preview.html +src/doc/user/rcl.search.reslist.html +src/doc/user/rcl.search.sort.html +src/doc/user/rcl.search.termexplorer.html +src/doc/user/rcl.search.tips.html +src/doc/user/rcl.search.wildcards.html +src/doc/user/rcl.searchkcl.html +src/doc/user/rcl.searchkio.html +src/doc/user/rcl.searchkio.searchabledocs.html +src/doc/user/usermanual.html +src/doc/user/usermanual.html-text +src/doc/user/usermanual.txt +src/index/alldeps +src/index/recollindex +src/lib/alldeps +src/lib/librcl.a +src/mk/localdefs +src/mk/sysconf +src/qt4gui/.moc/* +src/qt4gui/.ui/* +src/qt4gui/Makefile +src/qt4gui/advsearch.ui +src/qt4gui/images +src/qt4gui/preview.ui +src/qt4gui/qrc_recoll.cpp +src/qt4gui/rclmain.ui +src/qt4gui/recoll +src/qt4gui/recoll.pro +src/qt4gui/sort.ui +src/qt4gui/spell.ui +src/qt4gui/ssearchb.ui +src/qt4gui/uiprefs.ui +src/qt4gui/viewaction.ui +src/qtgui/i18n/*.qm +src/query/alldeps +src/recollinstall +src/sampleconf/recoll.conf +website/usermanual/* diff --git a/packaging/debian/changelog b/packaging/debian/changelog deleted file mode 100644 index a9cd1fae..00000000 --- a/packaging/debian/changelog +++ /dev/null @@ -1,35 +0,0 @@ -recoll (1.12.2-0~ppa3~jaunty1) jaunty; urgency=low - * Updated package to recoll version 1.12.2 - -- Jean-Francois Dockes Mon, 19 Oct 2009 16:17:46 +0200 - -recoll (1.11.0-0ubuntu1) dapper; urgency=low - * Updated package to recoll version 1.11.0 - -- Jean-Francois Dockes Sun, 19 Oct 2008 09:57:13 +0200 - -recoll (1.10.6-0ubuntu1) dapper; urgency=low - * Updated package to recoll version 1.10.6 - -- Jean-Francois Dockes Fri, 12 Sep 2008 10:14:20 +0200 - -recoll (1.10.4-0ubuntu1) hardy; urgency=low - * Updated package to recoll version 1.10.4 - -- Jean-Francois Dockes Fri, 29 Aug 2008 15:39:40 +0200 - -recoll (1.10.1-0ubuntu1) gutsy; urgency=low - * Updated package to recoll version 1.10.1 - -- Jean-Francois Dockes Fri, 01 Feb 2008 11:30:01 +0100 - -recoll (1.10.0-0ubuntu1) gutsy; urgency=low - * Updated package to recoll version 1.10.0 - -- Jean-Francois Dockes Wed, 11 Nov 2007 15:34:51 +0200 - -recoll (1.9.0-0ubuntu1) gutsy; urgency=low - * Updated package to recoll version 1.9.0 - -- Jean-Francois Dockes Fri, 7 Sep 2007 15:34:51 +0200 - -recoll (1.8.1-0ubuntu1) gutsy; urgency=low - * Updated package to recoll version 1.8.1 - -- Jean-Francois Dockes Wed, 7 Mar 2007 09:08:05 +0100 - -recoll (1.7.5-0ubuntu1) feisty; urgency=low - * Initial release - -- Jean-Francois Dockes Wed, 10 Jan 2007 16:04:13 +0100 diff --git a/packaging/debian/compat b/packaging/debian/compat deleted file mode 100644 index 7ed6ff82..00000000 --- a/packaging/debian/compat +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/packaging/debian/control b/packaging/debian/control deleted file mode 100644 index d28cf84d..00000000 --- a/packaging/debian/control +++ /dev/null @@ -1,35 +0,0 @@ -Source: recoll -Section: x11 -Priority: optional -Maintainer: Jean-Francois Dockes -Build-Depends: debhelper (>= 5), libqt3-headers, libqt3-mt-dev, qt3-dev-tools, libxapian-dev -Standards-Version: 3.7.2 - -Package: recoll -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: aspell -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 - interface. - . - Features: - * QT-based GUI. - * Supports the following document types (and their compressed versions): - - Natively: text, html, OpenOffice files, maildir and mailbox - (Mozilla and Thunderbird mail ok) with attachments, gaim log files. - - With external helpers: pdf (pdftotext), postscript (ghostscript), - msword (antiword), excel, ppt (catdoc), rtf (unrtf), - * Powerful query facilities, with boolean searches, phrases, filter on - file types and directory tree. - * Support for multiple charsets. Internal processing and storage uses - Unicode UTF-8. - * Stemming performed at query time (can switch stemming language after - indexing) - * Easy installation. No database daemon, web server or exotic language - necessary. - * An indexer which runs either as a thread inside the GUI or as an - external, cron'able program. - . - Homepage: diff --git a/packaging/debian/copyright b/packaging/debian/copyright deleted file mode 100644 index 00265702..00000000 --- a/packaging/debian/copyright +++ /dev/null @@ -1,113 +0,0 @@ -This package was debianized by Jean-Francois Dockes on -Wed, 10 Jan 2007 16:04:13 +0100. - -It was downloaded from http://www.recoll.org - -Upstream Author: Jean-Francois Dockes - -Copyright: (C) 2005,2006, Jean-Francois Dockes - -License: - - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this package; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -On Debian systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL'. - -The Debian packaging is (C) 2007, Jean-Francois Dockes and -is licensed under the GPL, see above. - -Portions of the software are: - -Copyright (C) 2001-2002 by Kevin Atkinson under the GNU LGPL: -/* This file is part of The New Aspell - * Copyright (C) 2001-2002 by Kevin Atkinson under the GNU LGPL - * license version 2.0 or 2.1. You should have received a copy of the - * LGPL license along with this library if you did not you can find it - * at http://www.gnu.org/. - -On Debian systems, the complete text of the GNU LGPL -can be found in `/usr/share/common-licenses/LGPL-2'. - - -Copyright 2002-2005 Andreas Aardal Hanssen -Copyright (C) 2000-2004 Mikio Hirabayashi -Copyright 1999,2000,2001 BrightStation PLC -Copyright 2001 Ananova Ltd -Copyright 2002 Olly Betts -Copyright (C) 2000, 2001, 2002 Loic Dachary - - GPL V2 or later, same license text as above - -Copyright (c) 1991-2004 Unicode, Inc. - - COPYRIGHT AND PERMISSION NOTICE - - Copyright © 1991-2006 Unicode, Inc. All rights reserved. Distributed under - the Terms of Use in http://www.unicode.org/copyright.html. - - Permission is hereby granted, free of charge, to any person obtaining a - copy of the Unicode data files and any associated documentation (the "Data - Files") or Unicode software and any associated documentation (the - "Software") to deal in the Data Files or Software without restriction, - including without limitation the rights to use, copy, modify, merge, - publish, distribute, and/or sell copies of the Data Files or Software, and - to permit persons to whom the Data Files or Software are furnished to do - so, provided that (a) the above copyright notice(s) and this permission - notice appear with all copies of the Data Files or Software, (b) both the - above copyright notice(s) and this permission notice appear in associated - documentation, and (c) there is clear notice in each modified Data File or - in the Software as well as in the documentation associated with the Data - File(s) or Software that the data or software has been modified. - - THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY - KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF - THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS - INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR - CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF - USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - PERFORMANCE OF THE DATA FILES OR SOFTWARE. - - Except as contained in this notice, the name of a copyright holder shall - not be used in advertising or otherwise to promote the sale, use or other - dealings in these Data Files or Software without prior written - authorization of the copyright holder. - -Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All -/* - * MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm - * - * Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All - * rights reserved. - * - * License to copy and use this software is granted provided that it - * is identified as the "RSA Data Security, Inc. MD5 Message-Digest - * Algorithm" in all material mentioning or referencing this software - * or this function. - * - * License is also granted to make and use derivative works provided - * that such works are identified as "derived from the RSA Data - * Security, Inc. MD5 Message-Digest Algorithm" in all material - * mentioning or referencing the derived work. - * - * RSA Data Security, Inc. makes no representations concerning either - * the merchantability of this software or the suitability of this - * software for any particular purpose. It is provided "as is" - * without express or implied warranty of any kind. - * - * These notices must be retained in any copies of any part of this - * documentation and/or software. - */ diff --git a/packaging/debian/docs b/packaging/debian/docs deleted file mode 100644 index e845566c..00000000 --- a/packaging/debian/docs +++ /dev/null @@ -1 +0,0 @@ -README diff --git a/packaging/debian/menu b/packaging/debian/menu deleted file mode 100644 index f0abea35..00000000 --- a/packaging/debian/menu +++ /dev/null @@ -1,2 +0,0 @@ -?package(recoll):needs="X11" section="Applications/Data Management" \ - title="Personal Search Tool" command="/usr/bin/recoll" diff --git a/packaging/debian/rules b/packaging/debian/rules deleted file mode 100755 index 829aafa6..00000000 --- a/packaging/debian/rules +++ /dev/null @@ -1,69 +0,0 @@ -#!/usr/bin/make -f - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -# This has to be exported to make some magic below work. -export DH_OPTIONS - -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - -config.status: configure - dh_testdir - ./configure CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" \ - --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ - --prefix=/usr --mandir=\$${prefix}/share/man - -build: build-stamp -build-stamp: config.status - dh_testdir - $(MAKE) - touch $@ - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - -$(MAKE) distclean - dh_clean - -install: - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - $(MAKE) prefix=$(CURDIR)/debian/recoll/usr install - -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs ChangeLog - dh_installdocs - dh_installmenu - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary-indep: build install - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install diff --git a/packaging/debian/watch b/packaging/debian/watch deleted file mode 100644 index 8b5064a9..00000000 --- a/packaging/debian/watch +++ /dev/null @@ -1,12 +0,0 @@ -# Example watch control file for uscan -# Rename this file to "watch" and then you can run the "uscan" command -# to check for upstream updates and more. -# See uscan(1) for format - -# Compulsory line, this is a version 3 file -version=3 - -# Uncomment to examine a Webpage -# -http://www.recoll.org/download.html recoll-(.*)\.tar\.gz - diff --git a/src/makesrcdist.sh b/src/makesrcdist.sh index 1e19614c..ce420790 100644 --- a/src/makesrcdist.sh +++ b/src/makesrcdist.sh @@ -10,19 +10,29 @@ fatal() #set -x TAR=/usr/bin/tar -SVNREPOS=svn+ssh://y/home/subversion/recoll/ + +#VCCMD=svn +#SVNREPOS=svn+ssh://y/home/subversion/recoll/ + +VCCMD=hg version=`cat VERSION` versionforcvs=`echo $version | sed -e 's/\./_/g'` -editedfiles=`svn status | egrep -v '^\?'` +editedfiles=`$VCCMD status . | egrep -v '^\?'` if test ! -z "$editedfiles"; then fatal "Edited files exist: " $editedfiles fi +tagtopsvn() { + (cd ..; svn copy -m "Release $version tagged" . $SVNREPOS/tags/$1) \ + || fatal tag failed +} +tagtophg() { + hg tag -f -m "Release $version tagged" $1 || fatal tag failed +} tagtop() { - (cd ..; svn copy -m "Release $version tagged" . $SVNREPOS/tags/$1) \ - || fatal tag failed + tagtophg $* } targetdir=${targetdir-/tmp} @@ -77,7 +87,7 @@ links -dump ${RECOLLDOC}/rcl.install.external.html >> INSTALL links -dump ${RECOLLDOC}/rcl.install.building.html >> INSTALL links -dump ${RECOLLDOC}/rcl.install.config.html >> INSTALL -svn commit -m '' README INSTALL +$VCCMD commit -m "release $version" README INSTALL # Clean up this dir and copy the dist-specific files make distclean diff --git a/website/usermanual/README-dir.txt b/website/usermanual/README-dir.txt new file mode 100644 index 00000000..4fba138b --- /dev/null +++ b/website/usermanual/README-dir.txt @@ -0,0 +1 @@ +This file is needed because of mercurial neglect of empty directories.