--- doodle-0.6.6.orig/config.sub +++ doodle-0.6.6/config.sub @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2006-07-02' +timestamp='2006-09-20' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -276,6 +276,7 @@ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ + | score \ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ @@ -284,7 +285,7 @@ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; @@ -367,7 +368,7 @@ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) @@ -909,6 +910,10 @@ sb1el) basic_machine=mipsisa64sb1el-unknown ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; sei) basic_machine=mips-sei os=-seiux @@ -1366,6 +1371,9 @@ # system, and we'll never get to this point. case $basic_machine in + score-*) + os=-elf + ;; spu-*) os=-elf ;; --- doodle-0.6.6.orig/debian/doodle.dirs +++ doodle-0.6.6/debian/doodle.dirs @@ -0,0 +1 @@ +/var/lib/doodle --- doodle-0.6.6.orig/debian/changelog +++ doodle-0.6.6/debian/changelog @@ -0,0 +1,189 @@ +doodle (0.6.6-4ubuntu1) feisty; urgency=low + + * Merge from Debian unstable. Ubuntu change: + - debian/doodled.init.d: "set -e" removed + * Set Maintainer to Ubuntu MOTU Developers + + -- Adrien Cunin Mon, 9 Apr 2007 14:13:21 +0200 + +doodle (0.6.6-4) unstable; urgency=low + + * Check for existence of delgroup in doodle.postrm (Closes: #416741). + + -- Daniel Baumann Fri, 30 Mar 2007 08:42:00 +0200 + +doodle (0.6.6-3ubuntu1) feisty; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu change: + - debian/doodled.init.d: "set -e" removed + + -- Adrien Cunin Sat, 10 Feb 2007 13:54:43 +0100 + +doodle (0.6.6-3) unstable; urgency=low + + * Rebuild against gamin. + + -- Daniel Baumann Thu, 8 Feb 2007 12:19:00 +0100 + +doodle (0.6.6-2ubuntu1) feisty; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/control: fam replaced with gamin + - debian/doodled.init.d: "set -e" removed + + -- Cody A.W. Somerville Fri, 26 Jan 2007 02:28:39 -0400 + +doodle (0.6.6-2) unstable; urgency=low + + * Minor cleanups. + * Adjusted libdoodle-dev dependencies. + * Added lsb header and status target to init script. + + -- Daniel Baumann Fri, 19 Jan 2007 12:30:00 +0100 + +doodle (0.6.6-1ubuntu1) feisty; urgency=low + + * debian/control: replaced fam with gamin (Closes: Malone #78497) + * debian/doodled.init.d: removed "set -e" to avoid failure when removing the + package + + -- Adrien Cunin Sat, 13 Jan 2007 16:13:22 +0100 + +doodle (0.6.6-1) unstable; urgency=low + + * New upstream release. + + -- Daniel Baumann Wed, 3 Jan 2007 14:03:00 +0200 + +doodle (0.6.5-5) unstable; urgency=medium + + * Adjusted defaults which fixes the cronjob (Closes: #379729). + * Adjusted depends to the splitted libextractor. + + -- Daniel Baumann Sun, 29 Oct 2006 12:36:00 +0200 + +doodle (0.6.5-4) unstable; urgency=low + + * New email address. + + -- Daniel Baumann Sun, 10 Sep 2006 11:49:00 +0200 + +doodle (0.6.5-3) unstable; urgency=low + + * Adjusted chown call in cronjob again (Closes: #369499). + + -- Daniel Baumann Thu, 22 Jun 2006 20:11:00 +0200 + +doodle (0.6.5-2) unstable; urgency=low + + * Adjusted cronjob (Closes: #368598). + + -- Daniel Baumann Thu, 25 May 2006 18:34:00 +0200 + +doodle (0.6.5-1) unstable; urgency=low + + * New upstream release. + + -- Daniel Baumann Wed, 3 May 2006 00:00:00 +0100 + +doodle (0.6.3+2496-2) unstable; urgency=low + + * Fixed descriptions' spelling (Closes: #363262). + + -- Daniel Baumann Tue, 18 Apr 2006 09:16:00 +0100 + +doodle (0.6.3+2496-1) unstable; urgency=low + + * New snapshot: + - improves documentation about full-text indexing (Closes: #348885). + + -- Daniel Baumann Sun, 12 Mar 2006 09:05:00 +0100 + +doodle (0.6.3-1) unstable; urgency=low + + * New upstream release (Closes: #323370). + * Updated depends to latest transition of libextractor (Closes: #334515). + * Corrected cron-script (Closes: #324603, #324957). + * Updating config.{sub,guess} now via diff.gz. + * Using now dpatch to set the doodle database name. + + -- Daniel Baumann Thu, 10 Nov 2005 20:21:00 +0100 + +doodle (0.6.2-4) unstable; urgency=high + + * fixed doodle.postinst exception for non existing doodledb (Closes: #309120). + * improved doodle.cron.dail (Closes: #305003). + * changed from *.files to *.install. + * corrected depency informations. + * renamed libdoodle1-dev package to libdoodle-dev. + * bumped policy to 3.6.2. + + -- Daniel Baumann Fri, 8 Jul 2005 14:11:00 +0200 + +doodle (0.6.2-3) unstable; urgency=high + + * debian/doodle.postinst: fixed permission (Closes: #305595). + * debian/rules: added start/stop number for initscript (Closes: #305661). + + -- Daniel Baumann Wed, 11 May 2005 20:42:00 +0200 + +doodle (0.6.2-2) unstable; urgency=high + + * debian/control: added conflict to old version (Closes: #296052). + * debian/control: changed priority to optional. + * debian/control: updated descriptions (Closes: #296129). + * debian/doodle.cron.daily: fixed typo (Closes: #298655). + * debian/doodled.init.d: fixed wrong doodled-path (Closes: #296402). + * debian/README.Debian: renamed to doodle.README.Debian, fixed typo (Closes: + #296081). + * debian/doodled.post{inst,rm}: fixed lintian errors, using only + dh_installinit. + + -- Daniel Baumann Sat, 19 Mar 2005 18:15:00 +0100 + +doodle (0.6.2-1) unstable; urgency=high + + * New upstream release, fixes: + - broken png handling (Closes: #278905). + - broken doodle.db on doodle crash (Closes: #279057). + * documentation updated with new project urls. + * src/doodle/doodle{,d}.c: added /sys to the prunepath. + * debian/* redone, splitted package into individual binary-packages. + + -- Daniel Baumann Tue, 1 Feb 2005 20:14:00 +0100 + +doodle (0.5.0-1) unstable; urgency=low + + * New upstream release. + + -- Daniel Baumann Sun, 10 Oct 2004 06:10:00 +0200 + +doodle (0.4.0-1) unstable; urgency=high + + * New upstream release (Closes #267960). + * debian/README.Debian: fixed text width. + * debian/control: start description lowercase. + * debian/control: updated policy. + * debian/control: set dependency version for libextractor (Closes #268296 and #266945). + * src/doodle/doodle.c: add search-string-size fix from cvs. + + -- Daniel Baumann Tue, 15 Sep 2004 15:56:00 +0200 + +doodle (0.3.0-1) unstable; urgency=low + + * New upstream realease. + * debian/README.debian: documented changes. + * debian/control: added dependency to adduser. + * debian/cron.daily: added cron file. + * debian/postinst: adds doodle group and directory. + * debian/postrm: removes doodle group. + * src/doodle/doodle.c: changed dbName from '~/.doodle' to '/var/lib/doodle/doodle.db' + + -- Daniel Baumann Sun, 15 Aug 2004 21:50:04 +0200 + +doodle (0.2.1-1) unstable; urgency=low + + * Initial Release. + + -- Daniel Baumann Wed, 11 Aug 2004 15:11:23 +0200 + --- doodle-0.6.6.orig/debian/libdoodle1.install +++ doodle-0.6.6/debian/libdoodle1.install @@ -0,0 +1 @@ +/usr/lib/doodle/*.so.* --- doodle-0.6.6.orig/debian/control +++ doodle-0.6.6/debian/control @@ -0,0 +1,73 @@ +Source: doodle +Section: utils +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Daniel Baumann +Build-Depends: debhelper (>= 5), dpatch, autotools-dev, libextractor-dev, libgamin-dev +Standards-Version: 3.7.2 + +Package: doodle +Section: utils +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, adduser +Description: Desktop Search Engine (client) + It searches your hard drive for files using pattern matching on meta-data. It + extracts file-format specific meta-data using libextractor and builds a suffix + tree to index the files. The index can then be searched rapidly. It is similar + to locate, but can take advantage of information such as ID3 tags. It is + possible to do full-text indexing using the appropriate libextractor plugins. + It also supports using FAM to keep the database up-to-date. + . + Homepage: + . + You can use doodled (separate package) to keep the doodle database + automagically updated. + +Package: doodled +Section: utils +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, doodle (= ${binary:Version}), gamin, portmap +Description: Desktop Search Engine (daemon) + It searches your hard drive for files using pattern matching on meta-data. It + extracts file-format specific meta-data using libextractor and builds a suffix + tree to index the files. The index can then be searched rapidly. It is similar + to locate, but can take advantage of information such as ID3 tags. It is + possible to do full-text indexing using the appropriate libextractor plugins. + It also supports using FAM to keep the database up-to-date. + . + Homepage: + . + This is the daemon to keep the doodle database automagically up-to-date. + +Package: libdoodle1 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, libextractor1c2a, libextractor-plugins +Description: Desktop Search Engine (library) + It searches your hard drive for files using pattern matching on meta-data. It + extracts file-format specific meta-data using libextractor and builds a suffix + tree to index the files. The index can then be searched rapidly. It is similar + to locate, but can take advantage of information such as ID3 tags. It is + possible to do full-text indexing using the appropriate libextractor plugins. + It also supports using FAM to keep the database up-to-date. + . + Homepage: + . + This is the library to access the doodle database from other applications. + +Package: libdoodle-dev +Section: libdevel +Architecture: any +Depends: libdoodle1 (= ${binary:Version}), libextractor-dev, libgamin-dev +Description: Desktop Search Engine (development) + It searches your hard drive for files using pattern matching on meta-data. It + extracts file-format specific meta-data using libextractor and builds a suffix + tree to index the files. The index can then be searched rapidly. It is similar + to locate, but can take advantage of information such as ID3 tags. It is + possible to do full-text indexing using the appropriate libextractor plugins. + It also supports using FAM to keep the database up-to-date. + . + Homepage: + . + This is the library to access the doodle database from other applications + (development files). --- doodle-0.6.6.orig/debian/doodled.install +++ doodle-0.6.6/debian/doodled.install @@ -0,0 +1 @@ +/usr/bin/doodled --- doodle-0.6.6.orig/debian/doodle.manpages +++ doodle-0.6.6/debian/doodle.manpages @@ -0,0 +1 @@ +doc/man/doodle.1 --- doodle-0.6.6.orig/debian/doodle.install +++ doodle-0.6.6/debian/doodle.install @@ -0,0 +1,2 @@ +/usr/bin/doodle +/usr/share/locale --- doodle-0.6.6.orig/debian/doodle.docs +++ doodle-0.6.6/debian/doodle.docs @@ -0,0 +1,4 @@ +AUTHORS +NEWS +PLATFORMS +README --- doodle-0.6.6.orig/debian/libdoodle1.shlibs +++ doodle-0.6.6/debian/libdoodle1.shlibs @@ -0,0 +1 @@ +libdoodle 1 libdoodle1 (>= 0.6.6) --- doodle-0.6.6.orig/debian/copyright +++ doodle-0.6.6/debian/copyright @@ -0,0 +1,30 @@ +This package was debianized by Daniel Baumann on +Wed, 11 Aug 2004 15:11:23 +0200. + +It was downloaded from . + +Upstream Author: Christian Grothoff + +License: + + Copyright (C) 2004-2007 Christian Grothoff + + This program 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 program 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 program; 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 file. + +The Debian packaging is (C) 2004-2007, Daniel Baumann and +is licensed under the GPL, see `/usr/share/common-licenses/GPL'. --- doodle-0.6.6.orig/debian/doodle.default +++ doodle-0.6.6/debian/doodle.default @@ -0,0 +1,13 @@ +# Defaults for doodle +# sourced by /etc/cron.daily/doodle + +# Directories which doodle is going to index +DOODLE_PATH="/home" + +# Default location of the doodle database +# Note: do not change - it is hardcoded into the binary +DOODLE_DBPATH="/var/lib/doodle/doodle.db" + +# Additional options that are passed to doodled, +# the doodle daemon (if installed). +DAEMON_OPTS="-d ${DOODLE_DBPATH} -L /var/log/doodle.log -b ${DOODLE_PATH}" --- doodle-0.6.6.orig/debian/libdoodle-dev.install +++ doodle-0.6.6/debian/libdoodle-dev.install @@ -0,0 +1,5 @@ +/usr/include/* +/usr/lib/doodle/*.so +/usr/lib/doodle/*.a +/usr/lib/doodle/*.la +/usr/lib/doodle/pkgconfig --- doodle-0.6.6.orig/debian/doodled.postinst +++ doodle-0.6.6/debian/doodled.postinst @@ -0,0 +1,26 @@ +#!/bin/sh + +DOODLED_GROUP=doodle +PROG=/usr/bin/doodled + +set -e + +case "$1" in + configure) + chown root.$DOODLED_GROUP $PROG + chmod g+s $PROG + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 --- doodle-0.6.6.orig/debian/doodle.postrm +++ doodle-0.6.6/debian/doodle.postrm @@ -0,0 +1,26 @@ +#!/bin/sh + +DOODLE_GROUP=doodle + +set -e + +case "$1" in + purge) + if [ -x /usr/sbin/delgroup ] + then + delgroup $DOODLE_GROUP + fi + ;; + + remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 +esac + +#DEBHELPER# + +exit 0 --- doodle-0.6.6.orig/debian/doodled.manpages +++ doodle-0.6.6/debian/doodled.manpages @@ -0,0 +1 @@ +doc/man/doodled.1 --- doodle-0.6.6.orig/debian/rules +++ doodle-0.6.6/debian/rules @@ -0,0 +1,85 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/dpatch/dpatch.make + +# 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 patch-stamp + dh_testdir + + # Configuring package + CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --libdir=\$${prefix}/lib/doodle --includedir=\$${prefix}/include/doodle --disable-rpath + +build: build-stamp +build-stamp: config.status + dh_testdir + + # Building package + $(MAKE) + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp + + # Cleaning package + -$(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: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Installing package + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + +binary-indep: build install + +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_installexamples + dh_install --sourcedir=debian/tmp + dh_installinit --update-rcd-params='defaults 22' + dh_installcron + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms + dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- doodle-0.6.6.orig/debian/doodle.cron.daily +++ doodle-0.6.6/debian/doodle.cron.daily @@ -0,0 +1,18 @@ +#!/bin/sh + +if [ -r /etc/default/doodle ] +then + . /etc/default/doodle +else + exit 0 +fi + +if [ -x /usr/bin/doodle ] +then + if [ ! -z ${DOODLE_PATH} ] && [ -d ${DOODLE_PATH} ] + then + /usr/bin/doodle ${DAEMON_OPTS} + + chown root.doodle `dirname ${DOODLE_DBPATH}` -R + fi +fi --- doodle-0.6.6.orig/debian/doodled.default +++ doodle-0.6.6/debian/doodled.default @@ -0,0 +1,13 @@ +# Defaults for doodled +# sourced by /etc/init.d/doodled + +# Directories which doodle is going to index +DOODLE_PATH="/home" + +# Default location of the doodle database +# Note: do not change - it is hardcoded into the binary +DOODLE_DBPATH="/var/lib/doodle/doodle.db" + +# Additional options that are passed to doodled, +# the doodle daemon (if installed). +DAEMON_OPTS="-d ${DOODLE_DBPATH} -L /var/log/doodled.log ${DOODLE_PATH}" --- doodle-0.6.6.orig/debian/doodle.postinst +++ doodle-0.6.6/debian/doodle.postinst @@ -0,0 +1,52 @@ +#!/bin/sh + +DOODLE_GROUP=doodle +PROG=/usr/bin/doodle +DOODLE_DBPATH=/var/lib/doodle +PKG_NAME=doodle +DOODLE_UPDATEDB=/etc/cron.daily/doodle + +set -e + +case "$1" in + configure) + sg $DOODLE_GROUP true 2>/dev/null || \ + addgroup --system $DOODLE_GROUP + + chown root.$DOODLE_GROUP $PROG + chmod g+s $PROG + + if [ ! -d $DOODLE_DBPATH ] + then + mkdir -p $DOODLE_DBPATH + fi + + chown root.$DOODLE_GROUP $DOODLE_DBPATH + + chmod 0750 $DOODLE_DBPATH + + if [ -e $DOODLE_DBPATH/doodle.db ] + then + chmod 0660 $DOODLE_DBPATH/doodle.db + else +cat << EOF + +WARNING: You should run '$DOODLE_UPDATEDB' as root. doodle will not work +properly until you do or until it is run by cron (it is daily). +EOF + fi + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 --- doodle-0.6.6.orig/debian/compat +++ doodle-0.6.6/debian/compat @@ -0,0 +1 @@ +5 --- doodle-0.6.6.orig/debian/watch +++ doodle-0.6.6/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://www.gnunet.org/doodle/download/doodle-(.*)\.tar\.gz --- doodle-0.6.6.orig/debian/libdoodle1.manpages +++ doodle-0.6.6/debian/libdoodle1.manpages @@ -0,0 +1 @@ +doc/man/libdoodle.3 --- doodle-0.6.6.orig/debian/doodled.init.d +++ doodle-0.6.6/debian/doodled.init.d @@ -0,0 +1,78 @@ +#!/bin/sh + +### BEGIN INIT INFO +# Provides: doodled +# Required-Start: +# Required-Stop: +# Should-Start: $local_fs +# Should-Stop: $local_fs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: starts doodled +# Description: doodled is a desktop search engine daemon. +### END INIT INFO + +PATH=/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/bin/doodled +NAME=doodled +DESC="doodle daemon" + +test -x $DAEMON || exit 0 + +# Include doodle defaults if available +if [ -f /etc/default/doodled ] +then + . /etc/default/doodled +else + exit 0 +fi + +case "$1" in + start) + echo -n "Starting $DESC: " + if [ -e ${DOODLE_PATH} ] + then + start-stop-daemon --start --quiet \ + --pidfile /var/run/$NAME.pid \ + --exec $DAEMON -- $DAEMON_OPTS + echo "$NAME." + else + echo "halted (you may want to run doodle first)" + fi + ;; + + stop) + echo -n "Stopping $DESC: " + start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \ + --exec $DAEMON + echo "$NAME." + ;; + + restart|force-reload) + echo -n "Restarting $DESC: " + start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \ + --exec $DAEMON + sleep 1 + start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \ + --exec $DAEMON -- $DAEMON_OPTS + echo "$NAME." + ;; + + status) + if [ -f /var/run/$NAME.pid ] + then + echo "doodled is running." + else + echo "doodled is not running." + exit 1 + fi + ;; + + *) + N=/etc/init.d/$NAME + echo "Usage: $N {start|stop|restart|force-reload|status}" >&2 + exit 1 + ;; +esac + +exit 0 --- doodle-0.6.6.orig/debian/patches/01-database-name.dpatch +++ doodle-0.6.6/debian/patches/01-database-name.dpatch @@ -0,0 +1,85 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run +## 01-database-name.dpatch by Daniel Baumann +## +## DP: Sets the doodle database name. + +@DPATCH@ + +diff -Naur doodle-0.6.5.orig/doc/man/doodle.1 doodle-0.6.5/doc/man/doodle.1 +--- doodle-0.6.5.orig/doc/man/doodle.1 2006-03-12 07:25:13.000000000 +0000 ++++ doodle-0.6.5/doc/man/doodle.1 2006-05-03 14:53:22.915910312 +0000 +@@ -36,9 +36,9 @@ + .TP + to search all of your files for keyword. Note that only the meta-data extracted by libextractor is searched. Thus if libextractor does not find any meta-data in the files, you may not get any results. You can use the option \-l to specify non-standard libextractor plugins. For example, doodle could be used to replace the locate tool from the GNU findutils like this: + +-$ alias updatedb="doodle \-bn \-d ~/.doodle\-locate\-db \-l libextractor_filename /" ++$ alias updatedb="doodle \-bn \-d /var/lib/doodle/doodle\-locate\-db \-l libextractor_filename /" + +-$ alias locate="doodle \-d ~/.doodle\-locate\-db" ++$ alias locate="doodle \-d /var/lib/doodle/doodle\-locate\-db" + + + .SH "OPTIONS" +@@ -53,7 +53,7 @@ + Use the generic plaintext extractor for the language with the 2-letter language code LANG. Supported languages are DA (Danish), DE (German), EN (English), ES (Spanish), IT (Italian) and NO (Norwegian). Use this option to enable fulltext indexing (for a particular language). This option only makes sense together with the \-b option. + .TP + \fB\-d \fIFILENAME\fR, \fB\-\-database=\fIFILENAME\fR +-use FILENAME for the location of the database (use when building or searching). This option is particularly useful when doodle is used to search different types of files (or is operated with different extractor options). Using this option doodle can be used to build specialized indices (i.e. one per file system), which can in turn improve search performance. When searching, you can pass a colon-separated list of database file names, in that case all databases are searched. Note that the disk-space consumption of a single database is typically slightly smaller than if the database is split into multiple files. Nevertheless, the space\-savings are likely to be small (a few percent). You can also use the environment variable DOODLE_PATH to set the list of database files to search. The option overrides the environment variable if both are used. If the option is not given and DOODLE_PATH is not set, "~/.doodle" is used. ++use FILENAME for the location of the database (use when building or searching). This option is particularly useful when doodle is used to search different types of files (or is operated with different extractor options). Using this option doodle can be used to build specialized indices (i.e. one per file system), which can in turn improve search performance. When searching, you can pass a colon-separated list of database file names, in that case all databases are searched. Note that the disk-space consumption of a single database is typically slightly smaller than if the database is split into multiple files. Nevertheless, the space\-savings are likely to be small (a few percent). You can also use the environment variable DOODLE_PATH to set the list of database files to search. The option overrides the environment variable if both are used. If the option is not given and DOODLE_PATH is not set, "/var/lib/doodle" is used. + .TP + \fB\-e\fR, \fB\-\-extract\fR + print the extracted keywords for each matching file found. Note that this will slow down the program a lot, especially if there are many matches in the database. Note that if the options given for libextractor are different than the options used for building the index the results may not contain the search string. +@@ -97,7 +97,7 @@ + .SH "ENVIRONMENT" + .TP + .B DOODLE_PATH +-Colon\-separated list of databases to search. Note that when building the database this path must either only contain one filename or the option \fB\-b\fP must be used to specify the database file. Default is "~/.doodle". ++Colon\-separated list of databases to search. Note that when building the database this path must either only contain one filename or the option \fB\-b\fP must be used to specify the database file. Default is "/var/lib/doodle". + .TP + .B PRUNEPATHS + Space\-separated list of paths to exclude. Can be overridden with the \fB\-P\fR option. +diff -Naur doodle-0.6.5.orig/doc/man/doodled.1 doodle-0.6.5/doc/man/doodled.1 +--- doodle-0.6.5.orig/doc/man/doodled.1 2006-05-02 22:07:35.000000000 +0000 ++++ doodle-0.6.5/doc/man/doodled.1 2006-05-03 14:53:58.948432536 +0000 +@@ -17,7 +17,7 @@ + Use the generic plaintext extractor for the language with the 2-letter language code LANG. See extract(1) for a list of supported languages. Use this option to enable fulltext indexing (for a particular language). + .TP + \fB\-d \fIFILENAME\fR, \fB\-\-database=\fIFILENAME\fR +-use FILENAME for the location of the database (use when building or searching). This option is particularly useful when doodle is used to search different types of files (or is operated with different extractor options). Using this option doodle can be used to build specialized indices (i.e. one per file system), which can in turn improve search performance. When searching, you can pass a colon-separated list of database file names, in that case all databases are searched. Note that the disk-space consumption of a single database is typically slightly smaller than if the database is split into multiple files. Nevertheless, the space\-savings are likely to be small (a few percent). You can also use the environment variable DOODLE_PATH to set the list of database files to search. The option overrides the environment variable if both are used. If the option is not given and DOODLE_PATH is not set, "~/.doodle" is used. ++use FILENAME for the location of the database (use when building or searching). This option is particularly useful when doodle is used to search different types of files (or is operated with different extractor options). Using this option doodle can be used to build specialized indices (i.e. one per file system), which can in turn improve search performance. When searching, you can pass a colon-separated list of database file names, in that case all databases are searched. Note that the disk-space consumption of a single database is typically slightly smaller than if the database is split into multiple files. Nevertheless, the space\-savings are likely to be small (a few percent). You can also use the environment variable DOODLE_PATH to set the list of database files to search. The option overrides the environment variable if both are used. If the option is not given and DOODLE_PATH is not set, "/var/lib/doodle" is used. + .TP + \fB\-D\fR, \fB\-\-debug\fR + do not detach from the terminal (do not daemonize). Also will print log messages to stderr if no logfile is specified. +@@ -55,7 +55,7 @@ + .SH "ENVIRONMENT" + .TP + .B DOODLE_PATH +-Colon\-separated list of databases to search. Note that when building the database this path must either only contain one filename or the option \fB\-b\fP must be used to specify the database file. Default is "~/.doodle". ++Colon\-separated list of databases to search. Note that when building the database this path must either only contain one filename or the option \fB\-b\fP must be used to specify the database file. Default is "/var/lib/doodle". + .TP + .B PRUNEPATHS + Space\-separated list of paths to exclude. Can be overridden with the \fB\-P\fR option. +diff -Naur doodle-0.6.5.orig/src/doodle/doodle.c doodle-0.6.5/src/doodle/doodle.c +--- doodle-0.6.5.orig/src/doodle/doodle.c 2006-05-02 23:18:56.000000000 +0000 ++++ doodle-0.6.5/src/doodle/doodle.c 2006-05-03 14:54:49.016820984 +0000 +@@ -503,7 +503,7 @@ + + dbName = getenv("DOODLE_PATH"); + if (NULL == dbName) +- dbName = "~/.doodle"; ++ dbName = "/var/lib/doodle/doodle.db"; + tmp = getenv("PRUNEPATHS"); + if (tmp != NULL) + prunepaths = tmp; +diff -Naur doodle-0.6.5.orig/src/doodle/doodled.c doodle-0.6.5/src/doodle/doodled.c +--- doodle-0.6.5.orig/src/doodle/doodled.c 2006-05-02 23:20:59.000000000 +0000 ++++ doodle-0.6.5/src/doodle/doodled.c 2006-05-03 14:54:40.037186096 +0000 +@@ -807,7 +807,7 @@ + + dbName = getenv("DOODLE_PATH"); + if (NULL == dbName) +- dbName = "~/.doodle"; ++ dbName = "/var/lib/doodle/doodle.db"; + tmp = getenv("PRUNEPATHS"); + if (tmp != NULL) + prunepaths = tmp; --- doodle-0.6.6.orig/debian/patches/00list +++ doodle-0.6.6/debian/patches/00list @@ -0,0 +1 @@ +01-database-name