From a0ddc3c8db0f670016d8a747e6bcec9e3c39a0c3 Mon Sep 17 00:00:00 2001 From: dockes Date: Wed, 10 Jan 2007 16:03:24 +0000 Subject: [PATCH] *** empty log message *** --- packaging/debian/changelog | 6 ++ packaging/debian/compat | 1 + packaging/debian/control | 33 +++++++++++ packaging/debian/copyright | 13 +++++ packaging/debian/dirs | 2 + packaging/debian/docs | 1 + packaging/debian/manpages | 3 + packaging/debian/menu | 2 + packaging/debian/rules | 113 +++++++++++++++++++++++++++++++++++++ packaging/debian/watch | 12 ++++ src/Makefile.in | 18 ++++-- src/VERSION | 2 +- 12 files changed, 201 insertions(+), 5 deletions(-) create mode 100644 packaging/debian/changelog create mode 100644 packaging/debian/compat create mode 100644 packaging/debian/control create mode 100644 packaging/debian/copyright create mode 100644 packaging/debian/dirs create mode 100644 packaging/debian/docs create mode 100644 packaging/debian/manpages create mode 100644 packaging/debian/menu create mode 100755 packaging/debian/rules create mode 100644 packaging/debian/watch diff --git a/packaging/debian/changelog b/packaging/debian/changelog new file mode 100644 index 00000000..d782598b --- /dev/null +++ b/packaging/debian/changelog @@ -0,0 +1,6 @@ +recoll (1.7.4-1) unstable; 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 new file mode 100644 index 00000000..7ed6ff82 --- /dev/null +++ b/packaging/debian/compat @@ -0,0 +1 @@ +5 diff --git a/packaging/debian/control b/packaging/debian/control new file mode 100644 index 00000000..dd042bcc --- /dev/null +++ b/packaging/debian/control @@ -0,0 +1,33 @@ +Source: recoll +Section: x11 +Priority: optional +Maintainer: Jean-Francois Dockes +Build-Depends: debhelper (>= 5), autotools-dev, libqt3-mt-dev, qt3-dev-tools, libqt3-headers, libxapian-dev +Standards-Version: 3.7.2 + +Package: recoll +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +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. + diff --git a/packaging/debian/copyright b/packaging/debian/copyright new file mode 100644 index 00000000..d6f9b046 --- /dev/null +++ b/packaging/debian/copyright @@ -0,0 +1,13 @@ +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: GPL +On Debian systems, the full text of the GPL can be found in +/usr/share/common-licenses/GPL + diff --git a/packaging/debian/dirs b/packaging/debian/dirs new file mode 100644 index 00000000..ca882bbb --- /dev/null +++ b/packaging/debian/dirs @@ -0,0 +1,2 @@ +usr/bin +usr/sbin diff --git a/packaging/debian/docs b/packaging/debian/docs new file mode 100644 index 00000000..e845566c --- /dev/null +++ b/packaging/debian/docs @@ -0,0 +1 @@ +README diff --git a/packaging/debian/manpages b/packaging/debian/manpages new file mode 100644 index 00000000..12e7a4b9 --- /dev/null +++ b/packaging/debian/manpages @@ -0,0 +1,3 @@ +doc/man/recoll.1 +doc/man/recoll.conf.5 +doc/man/recollindex.1 diff --git a/packaging/debian/menu b/packaging/debian/menu new file mode 100644 index 00000000..97648567 --- /dev/null +++ b/packaging/debian/menu @@ -0,0 +1,2 @@ +?package(recoll):needs="X11" section="Apps/Databases"\ + title="recoll" command="/usr/bin/recoll" diff --git a/packaging/debian/rules b/packaging/debian/rules new file mode 100755 index 00000000..b3e6c8e8 --- /dev/null +++ b/packaging/debian/rules @@ -0,0 +1,113 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. +# +# Modified to make a template file for a multi-binary package with separated +# build-arch and build-indep targets by Bill Allombert 2001 + +# 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 + # Add here commands to configure the package. + ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" + + +#Architecture +build: build-arch build-indep + +build-arch: build-arch-stamp +build-arch-stamp: config.status + $(MAKE) static + touch $@ + +build-indep: build-indep-stamp +build-indep-stamp: config.status + touch $@ + +clean: + dh_testdir + dh_testroot + rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP# + + # Add here commands to clean up after the build process. + -$(MAKE) distclean +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp -f /usr/share/misc/config.guess config.guess +endif + + + dh_clean + +install: install-indep install-arch +install-indep: + dh_testdir + dh_testroot + dh_clean -k -i + dh_installdirs -i + dh_install -i + +install-arch: + dh_testdir + dh_testroot + dh_clean -k -s + dh_installdirs -s + $(MAKE) install prefix=$(CURDIR)/debian/recoll/usr + + dh_install -s +# Must not depend on anything. This is to be called by +# binary-arch/binary-indep +# in another 'make' thread. +binary-common: + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_installexamples + dh_installmenu + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb +# Build architecture independant packages using the common target. +binary-indep: build-indep install-indep + $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common + +# Build architecture dependant packages using the common target. +binary-arch: build-arch install-arch + $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common + +binary: binary-arch binary-indep +.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch diff --git a/packaging/debian/watch b/packaging/debian/watch new file mode 100644 index 00000000..8b5064a9 --- /dev/null +++ b/packaging/debian/watch @@ -0,0 +1,12 @@ +# 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/Makefile.in b/src/Makefile.in index 63be4baa..b0f826ca 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,4 +1,4 @@ -# @(#$Id: Makefile.in,v 1.9 2006-12-24 08:07:15 dockes Exp $ (C) 2005 J.F.Dockes +# @(#$Id: Makefile.in,v 1.10 2007-01-10 16:03:24 dockes Exp $ (C) 2005 J.F.Dockes prefix = @prefix@ exec_prefix = @exec_prefix@ @@ -45,13 +45,23 @@ clean: @-cd qt4gui; ${MAKE} clean rm -f qtgui/Makefile qtgui/preview/Makefile qtgui/recoll rm -f qt4gui/Makefile qt4gui/preview/Makefile qt4gui/recoll + rm -f common/rclversion.h + rm -rf qtgui/.moc qtgui/.ui + rm -rf qt4gui/.moc qt4gui/.ui distclean: clean rm -f mk/sysconf mk/localdefs sampleconf/recoll.conf \ - $(QTGUI)/recoll.pro Makefile config.log config.status \ + qtgui/recoll.pro qt4gui/recoll.pro \ + Makefile config.log config.status \ recollinstall \ - doc/user/*.html* doc/user/*.txt doc/user/HTML.manifest \ - lib/*.dep + lib/*.dep common/autoconfig.h \ + wasabi/Makefile wasabi/client/Makefile wasabi/server/Makefile + rm -rf autom4te.cache + +maintainer-clean: distclean + rm -f doc/user/*.html* doc/user/*.txt doc/user/HTML.manifest + rm -f qtgui/i18n/*.qm + rm -f qt4gui/i18n/*.qm # recollinstall can be executed by the user and will compute 'normal' # values for bindir etc., relative to the prefix argument. When executed diff --git a/src/VERSION b/src/VERSION index 661e7aea..27f9cd32 100644 --- a/src/VERSION +++ b/src/VERSION @@ -1 +1 @@ -1.7.3 +1.8.0