[Pkg-mono-svn-commits] rev 3025 - in beagle/trunk/debian: . patches
Jose Carlos Garcia Sogo
jsogo at alioth.debian.org
Sun Apr 8 00:25:55 UTC 2007
Author: jsogo
Date: 2007-04-08 00:25:55 +0000 (Sun, 08 Apr 2007)
New Revision: 3025
Added:
beagle/trunk/debian/iceweasel-beagle.dirs
beagle/trunk/debian/patches/fix_desktop_files.dpatch
Removed:
beagle/trunk/debian/beagled-kde.desktop
beagle/trunk/debian/beagled.desktop
Modified:
beagle/trunk/debian/beagle.install
beagle/trunk/debian/changelog
beagle/trunk/debian/control
beagle/trunk/debian/libbeagle-dev.install
beagle/trunk/debian/patches/00list
beagle/trunk/debian/patches/beagle-crawl-safely.dpatch
beagle/trunk/debian/rules
Log:
Beagle
+ Merged with experimental branch at revision 3023
Modified: beagle/trunk/debian/beagle.install
===================================================================
--- beagle/trunk/debian/beagle.install 2007-04-05 22:13:22 UTC (rev 3024)
+++ beagle/trunk/debian/beagle.install 2007-04-08 00:25:55 UTC (rev 3025)
@@ -1,5 +1,9 @@
usr/lib/beagle
usr/bin
usr/sbin
-usr/share
+usr/share/applications
+usr/share/beagle
+usr/share/locale
+usr/share/man
+usr/share/pixmaps
etc
Deleted: beagle/trunk/debian/beagled-kde.desktop
===================================================================
--- beagle/trunk/debian/beagled-kde.desktop 2007-04-05 22:13:22 UTC (rev 3024)
+++ beagle/trunk/debian/beagled-kde.desktop 2007-04-08 00:25:55 UTC (rev 3025)
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Beagle Search Tool
-Comment=Index files on your desktop
-Icon=system-search
-Exec=beagled
-Terminal=false
-Type=Application
-Categories=
-X-KDE-autostart-after=panel
-X-KDE-StartupNotify=false
-X-KDE-UniqueApplet=true
-NoDisplay=true
Deleted: beagle/trunk/debian/beagled.desktop
===================================================================
--- beagle/trunk/debian/beagled.desktop 2007-04-05 22:13:22 UTC (rev 3024)
+++ beagle/trunk/debian/beagled.desktop 2007-04-08 00:25:55 UTC (rev 3025)
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Beagle Search Tool
-Comment=Index files on your desktop
-Icon=system-search
-Exec=beagled
-Terminal=false
-Type=Application
-Categories=
-OnlyShowIn=GNOME;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=beagle
-X-GNOME-Bugzilla-Component=general
-X-GNOME-Autostart-enabled=true
Modified: beagle/trunk/debian/changelog
===================================================================
--- beagle/trunk/debian/changelog 2007-04-05 22:13:22 UTC (rev 3024)
+++ beagle/trunk/debian/changelog 2007-04-08 00:25:55 UTC (rev 3025)
@@ -1,3 +1,95 @@
+beagle (0.2.16.3-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Thu, 05 Apr 2007 19:42:02 +0200
+
+beagle (0.2.16-4) experimental; urgency=low
+
+ * Apply patch from O.S. Systems (Closes: #417257)
+ + Do not show beagle-search icon on KDE;
+ + Do not run beagle-search on KDE starting;
+ + Remove beagle-settings icon from the menu;
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Thu, 05 Apr 2007 13:37:15 +0200
+
+beagle (0.2.16-3) experimental; urgency=low
+
+ * The latest releases were rejected from NEW queue.
+ Change mozilla- package to iceweasel- as requested my Joerg Jaspert.
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Sun, 25 Feb 2007 12:03:09 +0100
+
+beagle (0.2.16-2) experimental; urgency=low
+
+ * Build against new libvw-1.2-3 version in experimental.
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Fri, 9 Feb 2007 00:39:50 +0100
+
+beagle (0.2.16-1) experimental; urgency=low
+
+ * New upstream release.
+ + Evolution mail backend doesn't report that it is doing the initial
+ crawl when it is only reprocessing a changed mail box (Closes: #402469)
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Thu, 8 Feb 2007 23:33:55 +0100
+
+beagle (0.2.15.1-2) experimental; urgency=low
+
+ * Actually delete *.desktop files.
+ * Add unzip to Build-Depends
+ * Update sqlite mono bindings build dependency to libmono-sqlite2.0-cil
+ * Generate libbeagle documentation and install within libbeagle-dev package.
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Mon, 29 Jan 2007 23:37:42 +0100
+
+beagle (0.2.15.1-1) experimental; urgency=low
+
+ * New upstream release.
+ + Use gmcs to compile beagle.
+ + Detect incomopatible evolution-sharp libraries (Closes: #407168)
+ * debian/control:
+ + Change build dependencies to accomodate to above change.
+ * debian/rules:
+ + Enable Thunderbird filter. It is disabled by default upstream as it is
+ considered buggy, but as this is a version targeted to experimental, it is
+ best to test it.
+ + set where are mono libraries when calling dh_clideps
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Sat, 27 Jan 2007 14:39:37 +0100
+
+beagle (0.2.14-1) UNRELEASED; urgency=low
+
+ [ Otavio Salvador ]
+ * New upstream release
+ * debian/patches:
+ + relibtoolize: update.
+ + beagle-crawl-safely: update.
+ * debian/beagled.desktop: remove; included upstream.
+ * debian/control:
+ + Include the mozilla-beagle package.
+ + Build-Depends of unzip.
+ * debian/rules: Change to install the mozilla extension.
+
+ [ Jose Carlos Garcia Sogo ]
+ * Integrate changes made by Otavio Salvador. Thanks (Closes: #406988)
+ * Fixed upstream keyboard shortcut overlap in German (Closes: #397175)
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Thu, 25 Jan 2007 00:19:40 +0100
+
+beagle (0.2.13-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ + More improvements in memory usage.
+ + Use watch command in beagle-status command.
+
+ * debian/patches:
+ + beagle-status_watch: dropped, applied upstream.
+ + beagle_secure_scripts: new; do not try to run any local beagle command.
+ + relibtoolize: update.
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Tue, 21 Nov 2006 23:22:18 +0100
+
beagle (0.2.12-1) unstable; urgency=low
* New upstream version.
Modified: beagle/trunk/debian/control
===================================================================
--- beagle/trunk/debian/control 2007-04-05 22:13:22 UTC (rev 3024)
+++ beagle/trunk/debian/control 2007-04-08 00:25:55 UTC (rev 3025)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
Uploaders: Jose Carlos Garcia Sogo <jsogo at debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), intltool, mono-mcs (>= 1.1.13.5) | c-sharp-compiler, libmono-dev (>= 1.0), libgnome2.0-cil, libgmime2.2-cil, libevolution2.0-cil, libgtk2.0-dev, libexif-dev, libsqlite3-dev, libmono-sqlite1.0-cil, libxss-dev, zip, libgnomevfs2-dev (>= 2.6), libgnome2-dev (>= 2.6), libgalago1.0-cil, cli-common-dev (>= 0.4.4), dpatch, autotools-dev, python-all-dev (>= 2.3.5-11), python2.4-gtk2, python-gtk2-dev, librsvg2-dev, libxml2-dev (>= 2.6.19), libxss-dev, libmono-sharpzip0.6-cil, libwv-dev, libgsf0.0-cil, python-support (>= 0.4)
+Build-Depends: debhelper (>= 5.0.37.2), intltool, mono-gmcs | c-sharp-2.0-compiler, libmono-dev (>= 1.0), libgnome2.0-cil, libgmime2.2-cil, libevolution2.0-cil, libgtk2.0-dev, libexif-dev, libsqlite3-dev, libmono-sqlite2.0-cil, libxss-dev, zip, libgnomevfs2-dev (>= 2.6), libgnome2-dev (>= 2.6), libgalago1.0-cil, cli-common-dev (>= 0.4.4), dpatch, autotools-dev, python-all-dev (>= 2.3.5-11), python2.4-gtk2, python-gtk2-dev, librsvg2-dev, libxml2-dev (>= 2.6.19), libxss-dev, libmono-sharpzip0.6-cil, libmono-system-runtime2.0-cil, libwv-dev, libgsf0.0-cil, python-support (>= 0.4), unzip, gtk-doc-tools
Standards-Version: 3.7.2
XS-X-Vcs-Svn: svn://svn.debian.org/svn/pkg-mono/beagle/trunk
@@ -29,6 +29,16 @@
At the moment, it can index filesystems, Gaim logs, Evolution mail
and data, RSS and other.
+Package: iceweasel-beagle
+Architecture: all
+Depends: iceweasel
+Description: Beagle extension for Iceweasel
+ Extension that allows Beagle indexing webpages visited by the user.
+ .
+ Beagle is a desktop search util for indexing and searching user's data.
+ At the moment, it can index filesystems, Gaim logs, Evolution mail
+ and data, RSS and other.
+
Package: libbeagle0
Architecture: any
Section: gnome
Copied: beagle/trunk/debian/iceweasel-beagle.dirs (from rev 3024, beagle/branches/experimental/debian/iceweasel-beagle.dirs)
Modified: beagle/trunk/debian/libbeagle-dev.install
===================================================================
--- beagle/trunk/debian/libbeagle-dev.install 2007-04-05 22:13:22 UTC (rev 3024)
+++ beagle/trunk/debian/libbeagle-dev.install 2007-04-08 00:25:55 UTC (rev 3025)
@@ -3,3 +3,4 @@
usr/lib/libbeagle*.la
usr/lib/pkgconfig/libbeagle*
usr/include/
+usr/share/gtk-doc
Modified: beagle/trunk/debian/patches/00list
===================================================================
--- beagle/trunk/debian/patches/00list 2007-04-05 22:13:22 UTC (rev 3024)
+++ beagle/trunk/debian/patches/00list 2007-04-08 00:25:55 UTC (rev 3025)
@@ -1,7 +1,8 @@
+beagle-crawl-safely.dpatch
+beagle_secure_scripts.dpatch
beagle-settings.dpatch
-beagle-status_watch.dpatch
+crawl-rules.dpatch
usebash.dpatch
use-python2.4.dpatch
relibtoolize.dpatch
-beagle-crawl-safely.dpatch
-crawl-rules.dpatch
+fix_desktop_files.dpatch
Modified: beagle/trunk/debian/patches/beagle-crawl-safely.dpatch
===================================================================
--- beagle/trunk/debian/patches/beagle-crawl-safely.dpatch 2007-04-05 22:13:22 UTC (rev 3024)
+++ beagle/trunk/debian/patches/beagle-crawl-safely.dpatch 2007-04-08 00:25:55 UTC (rev 3025)
@@ -6,11 +6,11 @@
## DP: (set -e) and redo option-adding to work with "set -e".
@DPATCH@
-diff -urNad beagle-0.2.12~/tools/beagle-crawl-system.in beagle-0.2.12/tools/beagle-crawl-system.in
---- beagle-0.2.12~/tools/beagle-crawl-system.in 2006-11-04 20:31:48.000000000 +0100
-+++ beagle-0.2.12/tools/beagle-crawl-system.in 2006-11-04 20:42:00.000000000 +0100
+diff -urNad beagle-0.2.16.3~/tools/beagle-crawl-system.in beagle-0.2.16.3/tools/beagle-crawl-system.in
+--- beagle-0.2.16.3~/tools/beagle-crawl-system.in 2007-02-22 18:52:48.000000000 +0100
++++ beagle-0.2.16.3/tools/beagle-crawl-system.in 2007-04-05 19:40:30.000000000 +0200
@@ -1,4 +1,5 @@
- #!/bin/bash
+ #!/bin/sh
+set -e
#
@@ -26,12 +26,13 @@
umask 022
CRAWL_USER=beagleindex
-@@ -37,36 +42,41 @@
+@@ -37,38 +42,41 @@
chown $CRAWL_USER $MONO_SHARED_DIR
for crawl_file in @sysconfdir@/beagle/crawl-*; do
- unset CRAWL_ENABLED CRAWL_DISABLE_FILTERING CRAWL_RECURSIVE CRAWL_CACHE_TEXT CRAWL_ALLOW_PATTERNS CRAWL_DENY_PATTERNS CRAWL_PATHS CRAWL_INDEX_NAME
-+ unset CRAWL_ENABLED CRAWL_DISABLE_FILTERING CRAWL_RECURSIVE CRAWL_CACHE_TEXT CRAWL_ALLOW_PATTERNS CRAWL_DENY_PATTERNS CRAWL_PATHS CRAWL_INDEX_NAME OPTIONS
++
++ unset CRAWL_ENABLED CRAWL_DISABLE_FILTERING CRAWL_RECURSIVE CRAWL_CACHE_TEXT CRAWL_ALLOW_PATTERNS CRAWL_DENY_PATTERNS CRAWL_PATHS CRAWL_INDEX_NAME OPTIONS
if [ -f $crawl_file ] ; then
. $crawl_file
@@ -41,25 +42,21 @@
- OPTIONS="`test -n "$CRAWL_DISABLE_FILTERING" -a "$CRAWL_DISABLE_FILTERING" = "yes" && \
- echo --disable-filtering`"
-
-- OPTIONS="`test -n "$CRAWL_DISABLE_DIRECTORIES" -a "$CRAWL_DISABLE_DIRECTORIES" = "yes" && \
+- OPTIONS="$OPTIONS `test -n "$CRAWL_DISABLE_DIRECTORIES" -a "$CRAWL_DISABLE_DIRECTORIES" = "yes" && \
- echo --disable-directories`"
-
+- OPTIONS="$OPTIONS `test -n "$CRAWL_DISABLE_ON_BATTERY" -a "$CRAWL_DISABLE_ON_BATTERY" = "yes" && \
+- echo --disable-on-battery`"
+-
- OPTIONS="$OPTIONS `test -n "$CRAWL_RECURSIVE" -a "$CRAWL_RECURSIVE" = "yes" && \
- echo --recursive`"
-+ if [ "$CRAWL_ENABLED" = "yes" ]; then
-
+-
- OPTIONS="$OPTIONS `test -n "$CRAWL_CACHE_TEXT" -a "$CRAWL_CACHE_TEXT" = "yes" && \
- echo --enable-text-cache`"
-+ if [ "$CRAWL_DISABLE_FILTERING" = "yes" ] ; then
-+ OPTIONS="$OPTIONS --disable-filtering"
-+ fi
-
+-
- OPTIONS="$OPTIONS `test -n "$CRAWL_ALLOW_PATTERNS" && \
- echo --allow-pattern $CRAWL_ALLOW_PATTERNS`"
-+ if [ "$CRAWL_DISABLE_DIRECTORIES" = "yes" ] ; then
-+ OPTIONS="$OPTIONS --disable-directories"
-+ fi
-
+-
- OPTIONS="$OPTIONS `test -n "$CRAWL_DENY_PATTERNS" && \
- echo --deny-pattern $CRAWL_DENY_PATTERNS`"
-
@@ -67,26 +64,35 @@
- if [ -n "$IONICE" ]; then
- IONICE="$IONICE -c 3"
- fi
-+ if [ "$CRAWL_RECURSIVE" = "yes" ] ; then
-+ OPTIONS="$OPTIONS --recursive"
-+ fi
++ if [ "$CRAWL_ENABLED" = "yes" ]; then
++
++ if [ "$CRAWL_DISABLE_FILTERING" = "yes" ] ; then
++ OPTIONS="$OPTIONS --disable-filtering"
++ fi
++
++ if [ "$CRAWL_DISABLE_DIRECTORIES" = "yes" ] ; then
++ OPTIONS="$OPTIONS --disable-directories"
++ fi
++
++ if [ "$CRAWL_RECURSIVE" = "yes" ] ; then
++ OPTIONS="$OPTIONS --recursive"
++ fi
++
++ if [ "$CRAWL_CACHE_TEXT" = "yes" ] ; then
++ OPTIONS="$OPTIONS --enable-text-cache"
++ fi
++
++ if [ -n "$CRAWL_ALLOW_PATTERNS" ] ; then
++ OPTIONS="$OPTIONS --allow-pattern $CRAWL_ALLOW_PATTERNS"
++ fi
++
++ if [ -n "$CRAWL_DENY_PATTERNS" ] ; then
++ OPTIONS="$OPTIONS --deny-pattern $CRAWL_DENY_PATTERNS"
++ fi
++
++ if IONICE=`which ionice 2>/dev/null`; then
++ IONICE="$IONICE -c 3"
++ fi
-+ if [ "$CRAWL_CACHE_TEXT" = "yes" ] ; then
-+ OPTIONS="$OPTIONS --enable-text-cache"
-+ fi
-+
-+ if [ -n "$CRAWL_ALLOW_PATTERNS" ] ; then
-+ OPTIONS="$OPTIONS --allow-pattern $CRAWL_ALLOW_PATTERNS"
-+ fi
-+
-+ if [ -n "$CRAWL_DENY_PATTERNS" ] ; then
-+ OPTIONS="$OPTIONS --deny-pattern $CRAWL_DENY_PATTERNS"
-+ fi
-+
-+ if IONICE=`which ionice 2>/dev/null`; then
-+ IONICE="$IONICE -c 3"
-+ fi
-+
- eval nice -n 19 $IONICE su -s /bin/bash $CRAWL_USER -c \"MONO_SHARED_DIR=$MONO_SHARED_DIR @sbindir@/beagle-build-index --target @localstatedir@/cache/beagle/indexes/$CRAWL_INDEX_NAME $OPTIONS $CRAWL_PATHS\" > /dev/null 2>&1
+ eval $IONICE su -s /bin/bash $CRAWL_USER -c \"MONO_SHARED_DIR=$MONO_SHARED_DIR @sbindir@/beagle-build-index --target @localstatedir@/cache/beagle/indexes/$CRAWL_INDEX_NAME $OPTIONS $CRAWL_PATHS\" > /dev/null 2>&1
fi
- fi
Copied: beagle/trunk/debian/patches/fix_desktop_files.dpatch (from rev 3024, beagle/branches/experimental/debian/patches/fix_desktop_files.dpatch)
Modified: beagle/trunk/debian/rules
===================================================================
--- beagle/trunk/debian/rules 2007-04-05 22:13:22 UTC (rev 3024)
+++ beagle/trunk/debian/rules 2007-04-08 00:25:55 UTC (rev 3025)
@@ -30,7 +30,8 @@
CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man \
--sysconfdir=/etc --localstatedir=/var \
- --infodir=\$${prefix}/share/info --enable-libbeagle --enable-python --enable-webservices=no
+ --infodir=\$${prefix}/share/info --enable-libbeagle --enable-python \
+ --enable-webservices=no --enable-thunderbird --enable-gtk-doc
touch configure-stamp
@@ -68,7 +69,7 @@
# Install autostart desktop file for beagled
cp $(CURDIR)/debian/beagled.desktop $(CURDIR)/debian/beagle/etc/xdg/autostart
- cp $(CURDIR)/debian/beagled-kde.desktop $(CURDIR)/debian/beagle/usr/share/autostart
+# cp $(CURDIR)/debian/beagled-kde.desktop $(CURDIR)/debian/beagle/usr/share/autostart
find debian/beagle debian/python-beagle -name '*.a' -delete
@@ -86,6 +87,9 @@
find debian/ -type f -name "*.dll" -or -name "*.mdb" -or -name "*.cs" -or -name "*.config" | xargs chmod -x
find debian/ -type f -name "*.exe" | xargs chmod +x
+# Remove settings menu item.
+ rm $(CURDIR)/debian/beagle/usr/share/applications/beagle-settings.desktop
+
install-indep:
dh_testdir
dh_testroot
@@ -94,6 +98,8 @@
mv debian/beagle/usr/lib/beagle/Backends/Evolution* debian/beagle-backend-evolution/usr/lib/beagle/Backends/
+# Install mozilla extension
+ unzip mozilla-extension/beagle.xpi -d $(CURDIR)/debian/iceweasel-beagle/usr/lib/iceweasel/extensions/{fda00e13-8c62-4f63-9d19-d168115b11ca}/
binary-indep: build install
dh_testdir
More information about the Pkg-mono-svn-commits
mailing list