[Pkg-cli-apps-commits] r3641 - in /packages/beagle/trunk/debian: beagle.postrm changelog control patches/00list patches/beagle_secure_scripts.dpatch patches/crawl-rules.dpatch patches/enhanced_logging_support.dpatch rules
meebey at users.alioth.debian.org
meebey at users.alioth.debian.org
Fri Dec 28 19:15:52 UTC 2007
Author: meebey
Date: Fri Dec 28 19:15:52 2007
New Revision: 3641
URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=3641
Log:
beagle 0.3.2 update
Modified:
packages/beagle/trunk/debian/beagle.postrm
packages/beagle/trunk/debian/changelog
packages/beagle/trunk/debian/control
packages/beagle/trunk/debian/patches/00list
packages/beagle/trunk/debian/patches/beagle_secure_scripts.dpatch
packages/beagle/trunk/debian/patches/crawl-rules.dpatch
packages/beagle/trunk/debian/patches/enhanced_logging_support.dpatch
packages/beagle/trunk/debian/rules
Modified: packages/beagle/trunk/debian/beagle.postrm
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle/trunk/debian/beagle.postrm?rev=3641&op=diff
==============================================================================
--- packages/beagle/trunk/debian/beagle.postrm (original)
+++ packages/beagle/trunk/debian/beagle.postrm Fri Dec 28 19:15:52 2007
@@ -10,14 +10,14 @@
deluser --system --remove-home beagleindex >/dev/null 1>&2 || true ;
fi
- rm -rf /var/cache/beagle/indexes
+ rm -rf /var/cache/beagle
;;
remove)
# as these are index files generated from data in the computer, it doesn't
# has any sense to keep it once package has been removed.
- rm -rf /var/cache/beagle/indexes/*
+ rm -rf /var/cache/beagle
;;
esac
Modified: packages/beagle/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle/trunk/debian/changelog?rev=3641&op=diff
==============================================================================
--- packages/beagle/trunk/debian/changelog (original)
+++ packages/beagle/trunk/debian/changelog Fri Dec 28 19:15:52 2007
@@ -6,6 +6,24 @@
* debian/control:
+ Added libgalago1.0-cil back to build-dependencies.
(it's not actively developed but not abandoned)
+ + Added libavahi1.0-cil top build-dependencies.
+ + Changed recommends to depends of icedove-beagle. (Closes: #457924)
+ + Changed recommends to depends of iceweasel-beagle.
+ + Added icedove-beagle and iceweasel-beagle to suggests of beagle.
+ * debian/rules:
+ + Enabled avahi support in configure call.
+ * debian/patches/beagle-crawl-safely.dpatch:
+ + Dropped, fixed upstream but differently.
+ * debian/patches/beagle_secure_scripts.dpatch:
+ + Updated and replaced /bin/sh with /bin/bash were needed (exec -a).
+ (Closes: #457902)
+ * debian/patches/enhanced_logging_support.dpatch
+ debian/patches/crawl-rules.dpatch:
+ + Updated
+ * debian/beagle.postrm:
+ + Delete the complete cache directory not only the index directory of it,
+ caused incorrect owner/group after reinstall when a different uid/gid was
+ assigned. (Closes: #457926)
[ Jose Carlos Garcia Sogo ]
* New upstream version
@@ -16,7 +34,7 @@
* debian/patches:
+ compile_fix_mono_1.2.6: disabled, applied upstream
- -- Jose Carlos Garcia Sogo <jsogo at debian.org> Fri, 28 Dec 2007 11:23:59 +0100
+ -- Mirco Bauer <meebey at debian.org> Fri, 28 Dec 2007 19:14:34 +0100
beagle (0.3.1-2) unstable; urgency=low
Modified: packages/beagle/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle/trunk/debian/control?rev=3641&op=diff
==============================================================================
--- packages/beagle/trunk/debian/control (original)
+++ packages/beagle/trunk/debian/control Fri Dec 28 19:15:52 2007
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
Uploaders: Jose Carlos Garcia Sogo <jsogo at debian.org>, Mirco Bauer <meebey at debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), cli-common-dev (>= 0.4.4), dpatch, intltool, mono-gmcs (>= 1.2.4) | c-sharp-2.0-compiler, libmono-dev (>= 1.2.4), libmono-cairo2.0-cil, libgtk2.0-cil (>= 2.4), libgnome2.0-cil, libglade2.0-cil, libgconf2.0-cil, libgmime2.2-cil, libevolution3.0-cil (>= 0.13.3), libgalago1.0-cil (>= 0.5), libgtk2.0-dev (>= 2.6), libexif-dev, libsqlite3-dev, libmono-sqlite2.0-cil, libxss-dev, zip, libgnomevfs2-dev (>= 2.6), libgnome2-dev (>= 2.6), autotools-dev, librsvg2-dev, libxml2-dev (>= 2.6.19), libmono-sharpzip0.6-cil, libmono-system-runtime2.0-cil, libwv-dev, libgsf0.0-cil (>= 0.6), unzip, gtk-doc-tools, xdg-utils, monodoc-base, libndesk-dbus-glib1.0-cil
+Build-Depends: debhelper (>= 5.0.37.2), cli-common-dev (>= 0.4.4), dpatch, intltool, mono-gmcs (>= 1.2.4) | c-sharp-2.0-compiler, libmono-dev (>= 1.2.4), libmono-cairo2.0-cil, libgtk2.0-cil (>= 2.4), libgnome2.0-cil, libglade2.0-cil, libgconf2.0-cil, libgmime2.2-cil, libevolution3.0-cil (>= 0.13.3), libgalago1.0-cil (>= 0.5), libgtk2.0-dev (>= 2.6), libexif-dev, libsqlite3-dev, libmono-sqlite2.0-cil, libxss-dev, zip, libgnomevfs2-dev (>= 2.6), libgnome2-dev (>= 2.6), autotools-dev, librsvg2-dev, libxml2-dev (>= 2.6.19), libmono-sharpzip0.6-cil, libmono-system-runtime2.0-cil, libwv-dev, libgsf0.0-cil (>= 0.6), unzip, gtk-doc-tools, xdg-utils, monodoc-base, libndesk-dbus-glib1.0-cil, libavahi1.0-cil (>= 0.6.10)
Standards-Version: 3.7.3
Vcs-Svn: svn://svn.debian.org/svn/pkg-cli-apps/packages/beagle/trunk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle/trunk/
@@ -13,7 +13,7 @@
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, bash (>= 3.0), adduser, dbus, xdg-utils
Recommends: poppler-utils, mono-gmcs
-Suggests: gnumeric, beagle-backend-evolution
+Suggests: gnumeric, beagle-backend-evolution, iceweasel-beagle, icedove-beagle
Description: indexing and search tool for your personal data
A desktop search util for indexing and searching user's data. At the moment,
it can index filesystems, Pidgin logs, Evolution mail and data, RSS and other.
@@ -33,7 +33,7 @@
Package: iceweasel-beagle
Architecture: all
-Recommends: beagle, iceweasel
+Depends: beagle (>= ${source:Version}), beagle (<< ${source:Version}.1~), iceweasel
Description: Beagle extension for Iceweasel
Extension that allows Beagle indexing webpages visited by the user.
.
@@ -43,7 +43,7 @@
Package: icedove-beagle
Architecture: all
-Recommends: beagle, icedove
+Depends: beagle (>= ${source:Version}), beagle (<< ${source:Version}.1~), icedove
Description: Beagle extension for Icedove
Extension that allows Beagle indexing mails read by the user.
.
@@ -54,7 +54,7 @@
Package: beagle-dev
Architecture: any
Section: gnome
-Depends: beagle (>= ${source:Version}), beagle (<< ${source:Version}.1~)
+Depends: beagle (= ${binary:Version})
Description: library for accessing beagle (C# development files)
This library allow programmers accessing Beagle daemon and performing searches,
and this package contains needed files for developing with it using C#.
Modified: packages/beagle/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle/trunk/debian/patches/00list?rev=3641&op=diff
==============================================================================
--- packages/beagle/trunk/debian/patches/00list (original)
+++ packages/beagle/trunk/debian/patches/00list Fri Dec 28 19:15:52 2007
@@ -1,4 +1,3 @@
-beagle-crawl-safely
beagle_secure_scripts
crawl-rules
icedove
@@ -6,4 +5,3 @@
fix_GMime.StreamFs.Seek_usage
fix_UiUtil.dll.config
fix_Util.dll.config
-#compile_fix_mono_1.2.6
Modified: packages/beagle/trunk/debian/patches/beagle_secure_scripts.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle/trunk/debian/patches/beagle_secure_scripts.dpatch?rev=3641&op=diff
==============================================================================
--- packages/beagle/trunk/debian/patches/beagle_secure_scripts.dpatch (original)
+++ packages/beagle/trunk/debian/patches/beagle_secure_scripts.dpatch Fri Dec 28 19:15:52 2007
@@ -5,10 +5,13 @@
## DP: No description.
@DPATCH@
-diff -urNad beagle-0.3.0~/ImLogViewer/beagle-imlogviewer.in beagle-0.3.0/ImLogViewer/beagle-imlogviewer.in
---- beagle-0.3.0~/ImLogViewer/beagle-imlogviewer.in 2007-11-02 11:03:38.000000000 +0100
-+++ beagle-0.3.0/ImLogViewer/beagle-imlogviewer.in 2007-11-24 23:33:25.000000000 +0100
-@@ -3,16 +3,9 @@
+diff -urNad beagle-0.3.2~/ImLogViewer/beagle-imlogviewer.in beagle-0.3.2/ImLogViewer/beagle-imlogviewer.in
+--- beagle-0.3.2~/ImLogViewer/beagle-imlogviewer.in 2007-12-28 19:41:34.000000000 +0100
++++ beagle-0.3.2/ImLogViewer/beagle-imlogviewer.in 2007-12-28 19:42:35.000000000 +0100
+@@ -1,18 +1,11 @@
+-#!@bash@
++#!/bin/bash
+
# This line will be automatically uncommented when you "make install"
#installed=1
@@ -25,10 +28,13 @@
MONO_PATH="$THIS_PATH${MONO_PATH+:$MONO_PATH}" exec -a beagle-imlogviewer mono $MONO_EXTRA_ARGS --debug $THIS_EXE "$@"
-diff -urNad beagle-0.3.0~/beagled/beagled-index-helper.in beagle-0.3.0/beagled/beagled-index-helper.in
---- beagle-0.3.0~/beagled/beagled-index-helper.in 2007-11-02 11:03:46.000000000 +0100
-+++ beagle-0.3.0/beagled/beagled-index-helper.in 2007-11-24 23:33:25.000000000 +0100
-@@ -3,20 +3,8 @@
+diff -urNad beagle-0.3.2~/beagled/beagled-index-helper.in beagle-0.3.2/beagled/beagled-index-helper.in
+--- beagle-0.3.2~/beagled/beagled-index-helper.in 2007-12-28 19:41:34.000000000 +0100
++++ beagle-0.3.2/beagled/beagled-index-helper.in 2007-12-28 19:42:26.000000000 +0100
+@@ -1,22 +1,10 @@
+-#!@bash@
++#!/bin/bash
+
# This line will be automatically uncommented when you "make install"
#installed=1
@@ -49,10 +55,10 @@
if [ -n "$_GET_ON_THE_HEAP_BUDDY_BANDWAGON" ]; then
n=1
-diff -urNad beagle-0.3.0~/beagled/beagled.in beagle-0.3.0/beagled/beagled.in
---- beagle-0.3.0~/beagled/beagled.in 2007-11-02 11:03:46.000000000 +0100
-+++ beagle-0.3.0/beagled/beagled.in 2007-11-24 23:34:36.000000000 +0100
-@@ -3,29 +3,6 @@
+diff -urNad beagle-0.3.2~/beagled/beagled.in beagle-0.3.2/beagled/beagled.in
+--- beagle-0.3.2~/beagled/beagled.in 2007-12-28 19:41:34.000000000 +0100
++++ beagle-0.3.2/beagled/beagled.in 2007-12-28 19:41:43.000000000 +0100
+@@ -3,56 +3,6 @@
# This line will be automatically uncommented when you "make install"
#installed=1
@@ -77,12 +83,39 @@
- export BEAGLE_WEBSERVER_DIR="./webinterface"
- fi
-
+- if [ -z $BEAGLE_CONF_DIR ]; then
+- export BEAGLE_CONF_DIR="../tools/config-files"
+- fi
+-
+-else
+-
+-if [ -z $installed ] ; then
+- echo "*** Running uninstalled @target@ ***"
+-
+- # When we run uninstalled, run in the foreground by default.
+- fg_default=1
+-
+- TARGET_EXE="./@target@"
+-
+- export _BEAGLED_INDEX_HELPER_PATH="."
+-
+- export MONO_PATH="../Util:../BeagleClient${MONO_PATH+:$MONO_PATH}"
+-
+- export LD_LIBRARY_PATH="../glue/.libs${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
+-
+- export BEAGLE_FILTER_PATH="../Filters${BEAGLE_FILTER_PATH+:$BEAGLE_FILTER_PATH}"
+- export BEAGLE_BACKEND_PATH=".${BEAGLE_BACKEND_PATH+:$BEAGLE_BACKEND_PATH}"
+-
+- if [ -z $BEAGLE_WEBSERVER_DIR ] ; then
+- export BEAGLE_WEBSERVER_DIR="./webinterface"
+- fi
+-
-else
-
# Otherwise default to running in the background
fg_default=0
-@@ -34,7 +11,6 @@
+@@ -61,7 +11,6 @@
export _BEAGLED_INDEX_HELPER_PATH="@pkglibdir@"
export MONO_PATH="@pkglibdir@${MONO_PATH+:$MONO_PATH}"
export LD_LIBRARY_PATH="@pkglibdir@${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
@@ -90,10 +123,27 @@
EVO_LIBDIR="@evolibdir@"
if [ -n "$EVO_LIBDIR" ]; then
-diff -urNad beagle-0.3.0~/beagled/wrapper.in beagle-0.3.0/beagled/wrapper.in
---- beagle-0.3.0~/beagled/wrapper.in 2007-11-02 11:03:46.000000000 +0100
-+++ beagle-0.3.0/beagled/wrapper.in 2007-11-24 23:33:25.000000000 +0100
-@@ -3,22 +3,11 @@
+@@ -127,13 +76,7 @@
+ MONO_EXTRA_ARGS="--debug $MONO_EXTRA_ARGS"
+ fi
+
+-# The BEAGLE_MONO_RUNTIME variable can be used to specify the path
+-# to an alternative runtime.
+-if [ -z "$BEAGLE_MONO_RUNTIME" ]; then
+ export BEAGLE_MONO_RUNTIME="mono"
+-else
+- echo "*** Using mono runtime at $BEAGLE_MONO_RUNTIME ***"
+-fi
+
+ if [ $monogrind -eq 1 ]; then
+ export GC_DONT_GC=1
+diff -urNad beagle-0.3.2~/beagled/wrapper.in beagle-0.3.2/beagled/wrapper.in
+--- beagle-0.3.2~/beagled/wrapper.in 2007-12-28 19:41:34.000000000 +0100
++++ beagle-0.3.2/beagled/wrapper.in 2007-12-28 19:42:53.000000000 +0100
+@@ -1,29 +1,13 @@
+-#!@bash@
++#!/bin/bash
+
# This line will be automatically uncommented when you "make install"
#installed=1
@@ -106,6 +156,11 @@
- export MONO_PATH="../Util:../BeagleClient${MONO_PATH+:$MONO_PATH}"
- export LD_LIBRARY_PATH="../glue/.libs${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
- export BEAGLE_FILTER_PATH="../Filters${BEAGLE_FILTER_PATH+:$BEAGLE_FILTER_PATH}"
+-
+- if [ -z $BEAGLE_CONF_DIR ]; then
+- export BEAGLE_CONF_DIR="../tools/config-files"
+- fi
+-
-else
THIS_PATH="@pkglibdir@"
THIS_EXE="@pkglibdir@/@target@"
@@ -116,10 +171,13 @@
MONO_PATH="$THIS_PATH${MONO_PATH+:$MONO_PATH}" exec -a @wrapper@ mono $MONO_EXTRA_ARGS $THIS_EXE "$@"
-diff -urNad beagle-0.3.0~/search/beagle-search.in beagle-0.3.0/search/beagle-search.in
---- beagle-0.3.0~/search/beagle-search.in 2007-11-02 11:03:39.000000000 +0100
-+++ beagle-0.3.0/search/beagle-search.in 2007-11-24 23:33:25.000000000 +0100
-@@ -3,17 +3,9 @@
+diff -urNad beagle-0.3.2~/search/beagle-search.in beagle-0.3.2/search/beagle-search.in
+--- beagle-0.3.2~/search/beagle-search.in 2007-12-28 19:41:34.000000000 +0100
++++ beagle-0.3.2/search/beagle-search.in 2007-12-28 19:43:07.000000000 +0100
+@@ -1,24 +1,12 @@
+-#!@bash@
++#!/bin/bash
+
# This line will be automatically uncommented when you "make install"
#installed=1
@@ -128,18 +186,23 @@
- THIS_EXE="./Search.exe"
-
- export LD_LIBRARY_PATH="../glue/.libs${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
-- export MONO_PATH="../BeagleClient:../images:../Util${MONO_PATH+:MONO_PATH}"
+- export MONO_PATH="../Util:../BeagleClient${MONO_PATH+:MONO_PATH}"
-else
THIS_EXE="@pkglibdir@/Search.exe"
export LD_LIBRARY_PATH="@pkglibdir@${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
-fi
- if [ -z "$BEAGLE_MONO_RUNTIME" ]; then
+-if [ -z "$BEAGLE_MONO_RUNTIME" ]; then
export BEAGLE_MONO_RUNTIME="mono"
-diff -urNad beagle-0.3.0~/tools/beagle-index-info beagle-0.3.0/tools/beagle-index-info
---- beagle-0.3.0~/tools/beagle-index-info 2007-11-02 11:03:39.000000000 +0100
-+++ beagle-0.3.0/tools/beagle-index-info 2007-11-24 23:33:25.000000000 +0100
+-else
+- echo "*** Using mono runtime at $BEAGLE_MONO_RUNTIME ***"
+-fi
+
+ exec -a beagle-search $BEAGLE_MONO_RUNTIME $MONO_EXTRA_ARGS $THIS_EXE "$@"
+diff -urNad beagle-0.3.2~/tools/beagle-index-info beagle-0.3.2/tools/beagle-index-info
+--- beagle-0.3.2~/tools/beagle-index-info 2007-12-28 19:41:34.000000000 +0100
++++ beagle-0.3.2/tools/beagle-index-info 2007-12-28 19:41:43.000000000 +0100
@@ -3,10 +3,4 @@
# This line will be automatically uncommented when you "make install"
#installed=1
@@ -152,9 +215,9 @@
-
-exec -a beagle-index-info $CMD --index-info
+exec -a beagle-index-info beagle-info --index-info
-diff -urNad beagle-0.3.0~/tools/beagle-ping beagle-0.3.0/tools/beagle-ping
---- beagle-0.3.0~/tools/beagle-ping 2007-11-02 11:03:39.000000000 +0100
-+++ beagle-0.3.0/tools/beagle-ping 2007-11-24 23:33:25.000000000 +0100
+diff -urNad beagle-0.3.2~/tools/beagle-ping beagle-0.3.2/tools/beagle-ping
+--- beagle-0.3.2~/tools/beagle-ping 2007-12-28 19:41:34.000000000 +0100
++++ beagle-0.3.2/tools/beagle-ping 2007-12-28 19:41:43.000000000 +0100
@@ -3,10 +3,4 @@
# This line will be automatically uncommented when you "make install"
#installed=1
@@ -167,9 +230,9 @@
-
-exec -a beagle-ping $CMD --daemon-version
+exec -a beagle-ping beagle-info --daemon-version
-diff -urNad beagle-0.3.0~/tools/beagle-status beagle-0.3.0/tools/beagle-status
---- beagle-0.3.0~/tools/beagle-status 2007-11-02 11:03:39.000000000 +0100
-+++ beagle-0.3.0/tools/beagle-status 2007-11-24 23:33:25.000000000 +0100
+diff -urNad beagle-0.3.2~/tools/beagle-status beagle-0.3.2/tools/beagle-status
+--- beagle-0.3.2~/tools/beagle-status 2007-12-28 19:41:34.000000000 +0100
++++ beagle-0.3.2/tools/beagle-status 2007-12-28 19:41:43.000000000 +0100
@@ -3,10 +3,4 @@
# This line will be automatically uncommented when you "make install"
#installed=1
@@ -182,3 +245,43 @@
-
-watch -n 5 $CMD --status
+watch -n 5 beagle-info --status
+diff -urNad beagle-0.3.2~/tools/wrapper.in beagle-0.3.2/tools/wrapper.in
+--- beagle-0.3.2~/tools/wrapper.in 2007-12-28 19:41:34.000000000 +0100
++++ beagle-0.3.2/tools/wrapper.in 2007-12-28 19:41:43.000000000 +0100
+@@ -3,36 +3,11 @@
+ # This line will be automatically uncommented when you "make install"
+ #installed=1
+
+-if [ -z $installed ] ; then
+- echo "*** Running uninstalled @target@ ***" >&2
+-
+- if [ -n "$BEAGLE_TOOL_PATH" ]; then
+- TOOLDIR="$PWD/$BEAGLE_TOOL_PATH"
+- else
+- TOOLDIR="."
+- fi
+-
+- THIS_LIB_DIR="$TOOLDIR/../glue/.libs"
+- THIS_PATH="$TOOLDIR/../Util:$TOOLDIR/../BeagleClient:$TOOLDIR/../beagled:$TOOLDIR/../images"
+- THIS_EXE="$TOOLDIR/@target@"
+- THIS_FILTERS="$TOOLDIR/../Filters"
+- THIS_BACKENDS="$TOOLDIR/../beagled"
+-
+- if [ -z $BEAGLE_CONF_DIR ]; then
+- export BEAGLE_CONF_DIR="../tools/config-files"
+- fi
+-
+-else
+ THIS_LIB_DIR="@pkglibdir@:@libdir@"
+ THIS_PATH="@pkglibdir@:@libdir@"
+ THIS_EXE="@pkglibdir@/@target@"
+-fi
+
+-if [ -z "$BEAGLE_MONO_RUNTIME" ]; then
+ export BEAGLE_MONO_RUNTIME="mono"
+-else
+- echo "*** Using mono runtime at $BEAGLE_MONO_RUNTIME ***" >&2
+-fi
+
+ LD_LIBRARY_PATH="$THIS_LIB_DIR${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}" MONO_PATH="$THIS_PATH${MONO_PATH+:$MONO_PATH}" BEAGLE_FILTER_PATH="$BEAGLE_FILTER_PATH${THIS_FILTERS+:$THIS_FILTERS}" BEAGLE_BACKEND_PATH="$BEAGLE_BACKEND_PATH${THIS_BACKENDS+:$THIS_BACKENDS}" exec $BEAGLE_MONO_RUNTIME --debug $MONO_EXTRA_ARGS $THIS_EXE "$@"
+
Modified: packages/beagle/trunk/debian/patches/crawl-rules.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle/trunk/debian/patches/crawl-rules.dpatch?rev=3641&op=diff
==============================================================================
--- packages/beagle/trunk/debian/patches/crawl-rules.dpatch (original)
+++ packages/beagle/trunk/debian/patches/crawl-rules.dpatch Fri Dec 28 19:15:52 2007
@@ -5,27 +5,27 @@
## DP: No description.
@DPATCH@
-diff -urNad beagle-0.2.17~/tools/crawl-rules/crawl-applications beagle-0.2.17/tools/crawl-rules/crawl-applications
---- beagle-0.2.17~/tools/crawl-rules/crawl-applications 2007-02-07 20:04:11.000000000 +0100
-+++ beagle-0.2.17/tools/crawl-rules/crawl-applications 2007-05-08 23:36:47.000000000 +0200
-@@ -11,3 +11,5 @@
- CRAWL_DISABLE_DIRECTORIES="yes"
+diff -urNad beagle-0.3.2~/tools/crawl-rules/crawl-applications beagle-0.3.2/tools/crawl-rules/crawl-applications
+--- beagle-0.3.2~/tools/crawl-rules/crawl-applications 2007-12-28 19:27:25.000000000 +0100
++++ beagle-0.3.2/tools/crawl-rules/crawl-applications 2007-12-28 19:27:49.000000000 +0100
+@@ -13,3 +13,5 @@
+ CRAWL_CACHE_TEXT="no"
- CRAWL_CACHE_TEXT="no"
+ CRAWL_REMOVE_DELETED_FILES="yes"
+
+CRAWL_DISABLE_ON_BATTERY="yes"
-diff -urNad beagle-0.2.17~/tools/crawl-rules/crawl-windows beagle-0.2.17/tools/crawl-rules/crawl-windows
---- beagle-0.2.17~/tools/crawl-rules/crawl-windows 2007-02-07 20:04:11.000000000 +0100
-+++ beagle-0.2.17/tools/crawl-rules/crawl-windows 2007-05-08 23:37:14.000000000 +0200
+diff -urNad beagle-0.3.2~/tools/crawl-rules/crawl-windows beagle-0.3.2/tools/crawl-rules/crawl-windows
+--- beagle-0.3.2~/tools/crawl-rules/crawl-windows 2007-12-28 19:27:25.000000000 +0100
++++ beagle-0.3.2/tools/crawl-rules/crawl-windows 2007-12-28 19:28:12.000000000 +0100
@@ -1,4 +1,4 @@
-CRAWL_ENABLED="yes"
+CRAWL_ENABLED="no"
CRAWL_INDEX_NAME="windows"
-@@ -9,3 +9,5 @@
- CRAWL_DISABLE_FILTERING="no"
+@@ -11,3 +11,5 @@
+ CRAWL_CACHE_TEXT="yes"
- CRAWL_CACHE_TEXT="yes"
+ CRAWL_REMOVE_DELETED_FILES="yes"
+
+CRAWL_DISABLE_ON_BATTERY="yes"
Modified: packages/beagle/trunk/debian/patches/enhanced_logging_support.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle/trunk/debian/patches/enhanced_logging_support.dpatch?rev=3641&op=diff
==============================================================================
--- packages/beagle/trunk/debian/patches/enhanced_logging_support.dpatch (original)
+++ packages/beagle/trunk/debian/patches/enhanced_logging_support.dpatch Fri Dec 28 19:15:52 2007
@@ -5,25 +5,26 @@
## DP: No description.
@DPATCH@
-diff -urNad beagle-0.2.18~/beagled/BeagleDaemon.cs beagle-0.2.18/beagled/BeagleDaemon.cs
---- beagle-0.2.18~/beagled/BeagleDaemon.cs 2007-05-08 19:57:42.000000000 +0200
-+++ beagle-0.2.18/beagled/BeagleDaemon.cs 2007-09-21 19:48:28.000000000 +0200
-@@ -457,10 +457,7 @@
+diff -urNad beagle-0.3.2~/beagled/BeagleDaemon.cs beagle-0.3.2/beagled/BeagleDaemon.cs
+--- beagle-0.3.2~/beagled/BeagleDaemon.cs 2007-12-28 19:29:15.000000000 +0100
++++ beagle-0.3.2/beagled/BeagleDaemon.cs 2007-12-28 19:31:04.000000000 +0100
+@@ -451,11 +451,7 @@
- Log.Initialize (PathFinder.LogDir,
- "Beagle",
-- // FIXME: We always turn on full debugging output! We are still
-- // debugging this code, after all...
-- //arg_debug ? LogLevel.Debug : LogLevel.Warn,
-- LogLevel.Debug,
-+ arg_debug ? LogLevel.Debug : LogLevel.Warn,
- arg_fg);
+ MainLoopThread = Thread.CurrentThread;
+- // FIXME: We always turn on full debugging output! We are still
+- // debugging this code, after all...
+- // arg_debug ? LogLevel.Debug : LogLevel.Warn
+-
+- Log.Initialize (PathFinder.LogDir, "Beagle", LogLevel.Debug, arg_fg);
++ Log.Initialize (PathFinder.LogDir, "Beagle", arg_debug ? LogLevel.Debug : LogLevel.Warn, arg_fg);
Log.Always ("Starting Beagle Daemon (version {0})", ExternalStringsHack.Version);
-diff -urNad beagle-0.2.18~/beagled/IndexHelper/IndexHelper.cs beagle-0.2.18/beagled/IndexHelper/IndexHelper.cs
---- beagle-0.2.18~/beagled/IndexHelper/IndexHelper.cs 2007-02-13 20:10:41.000000000 +0100
-+++ beagle-0.2.18/beagled/IndexHelper/IndexHelper.cs 2007-09-21 19:48:28.000000000 +0200
-@@ -80,22 +80,18 @@
+ Log.Always ("Running on {0}", SystemInformation.MonoRuntimeVersion);
+ Log.Always ("Command Line: {0}",
+diff -urNad beagle-0.3.2~/beagled/IndexHelper/IndexHelper.cs beagle-0.3.2/beagled/IndexHelper/IndexHelper.cs
+--- beagle-0.3.2~/beagled/IndexHelper/IndexHelper.cs 2007-12-28 19:29:15.000000000 +0100
++++ beagle-0.3.2/beagled/IndexHelper/IndexHelper.cs 2007-12-28 19:29:19.000000000 +0100
+@@ -84,22 +84,18 @@
bool run_by_hand = (Environment.GetEnvironmentVariable ("BEAGLE_RUN_HELPER_BY_HAND") != null);
bool log_in_fg = (Environment.GetEnvironmentVariable ("BEAGLE_LOG_IN_THE_FOREGROUND_PLEASE") != null);
@@ -48,9 +49,9 @@
run_by_hand || log_in_fg);
Log.Always ("Starting Index Helper process (version {0})", ExternalStringsHack.Version);
-diff -urNad beagle-0.2.18~/beagled/beagled.in beagle-0.2.18/beagled/beagled.in
---- beagle-0.2.18~/beagled/beagled.in 2007-09-21 19:48:28.000000000 +0200
-+++ beagle-0.2.18/beagled/beagled.in 2007-09-21 19:48:38.000000000 +0200
+diff -urNad beagle-0.3.2~/beagled/beagled.in beagle-0.3.2/beagled/beagled.in
+--- beagle-0.3.2~/beagled/beagled.in 2007-12-28 19:29:19.000000000 +0100
++++ beagle-0.3.2/beagled/beagled.in 2007-12-28 19:29:19.000000000 +0100
@@ -21,6 +21,7 @@
heap_buddy=0
heap_shot=0
Modified: packages/beagle/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle/trunk/debian/rules?rev=3641&op=diff
==============================================================================
--- packages/beagle/trunk/debian/rules (original)
+++ packages/beagle/trunk/debian/rules Fri Dec 28 19:15:52 2007
@@ -30,10 +30,9 @@
--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man \
--sysconfdir=/etc --localstatedir=/var \
--infodir=\$${prefix}/share/info \
- --enable-thunderbird --enable-gtk-doc
-
-# broken/missing in beagle 0.3.1
-# --enable-avahi
+ --enable-thunderbird \
+ --enable-avahi \
+ --enable-gtk-doc
touch configure-stamp
More information about the Pkg-cli-apps-commits
mailing list