[Pkg-mono-svn-commits] rev 3115 - in beagle/trunk/debian: . patches
Jose Carlos Garcia Sogo
jsogo at alioth.debian.org
Tue May 8 21:56:21 UTC 2007
Author: jsogo
Date: 2007-05-08 21:56:20 +0000 (Tue, 08 May 2007)
New Revision: 3115
Added:
beagle/trunk/debian/patches/fix-typos.dpatch
beagle/trunk/debian/patches/name-iceweasel.dpatch
Modified:
beagle/trunk/debian/changelog
beagle/trunk/debian/patches/beagle-crawl-safely.dpatch
beagle/trunk/debian/patches/crawl-rules.dpatch
beagle/trunk/debian/patches/usebash.dpatch
Log:
beagl 0.2.17-1
+ New uptream release
+ patches:
- use Iceweasel name beside Firefox/Mozilla
- add new --disable-on-battery in beagle-build-index, and use it
by default in sytem-crawl
- fix different typos in manpages
- fix bashism in beagle-contactviwer
Modified: beagle/trunk/debian/changelog
===================================================================
--- beagle/trunk/debian/changelog 2007-05-08 20:04:29 UTC (rev 3114)
+++ beagle/trunk/debian/changelog 2007-05-08 21:56:20 UTC (rev 3115)
@@ -1,3 +1,21 @@
+beagle (0.2.17-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ + Disable on battery works also in beage-build-index and
+ beagle-crawl-system.
+ * Search properties no longer appear in Applications menu (Closes: #398197)
+ * Recompile with latest evolution-sharp (Closes: #414343)
+ * Patch from OS Systems were applied in 0.2.16-4 (Closes: #417527)
+ * debian/patches:
+ + beagle-crawl-safely: add new --disable-on-battery option
+ + crawl-rules: add DISABLE_ON_BATTERY option to all system wide rules
+ + filter_xhtml: disable; applied upstream
+ + usebash: add beagle-contactviewer (Closes: #421687)
+ + name-iceweasel: new; change mozilla for iceweasel brand. (Closes: #413396)
+ + typos: new; fix different typos in the package (Closes: #409139)
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Tue, 08 May 2007 23:17:25 +0200
+
beagle (0.2.16.3-3) unstable; urgency=low
* Bump build dependency on libevolution2.0-cil
Modified: beagle/trunk/debian/patches/beagle-crawl-safely.dpatch
===================================================================
--- beagle/trunk/debian/patches/beagle-crawl-safely.dpatch 2007-05-08 20:04:29 UTC (rev 3114)
+++ beagle/trunk/debian/patches/beagle-crawl-safely.dpatch 2007-05-08 21:56:20 UTC (rev 3115)
@@ -6,9 +6,9 @@
## DP: (set -e) and redo option-adding to work with "set -e".
@DPATCH@
-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
+diff -urNad beagle-0.2.17~/tools/beagle-crawl-system.in beagle-0.2.17/tools/beagle-crawl-system.in
+--- beagle-0.2.17~/tools/beagle-crawl-system.in 2007-05-08 19:57:40.000000000 +0200
++++ beagle-0.2.17/tools/beagle-crawl-system.in 2007-05-08 23:35:21.000000000 +0200
@@ -1,4 +1,5 @@
#!/bin/sh
+set -e
@@ -25,8 +25,8 @@
+
umask 022
- CRAWL_USER=beagleindex
-@@ -37,38 +42,41 @@
+ if [ ! -x @sbindir@/beagle-build-index ] ; then
+@@ -41,38 +46,45 @@
chown $CRAWL_USER $MONO_SHARED_DIR
for crawl_file in @sysconfdir@/beagle/crawl-*; do
@@ -53,10 +53,22 @@
-
- OPTIONS="$OPTIONS `test -n "$CRAWL_CACHE_TEXT" -a "$CRAWL_CACHE_TEXT" = "yes" && \
- echo --enable-text-cache`"
--
++ 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
+
- OPTIONS="$OPTIONS `test -n "$CRAWL_ALLOW_PATTERNS" && \
- echo --allow-pattern $CRAWL_ALLOW_PATTERNS`"
--
++ if [ "$CRAWL_DISABLE_ON_BATTERY" = "yes" ] ; then
++ OPTIONS="$OPTIONS --disable-on-battery"
++ fi
+
- OPTIONS="$OPTIONS `test -n "$CRAWL_DENY_PATTERNS" && \
- echo --deny-pattern $CRAWL_DENY_PATTERNS`"
-
@@ -64,16 +76,6 @@
- if [ -n "$IONICE" ]; then
- IONICE="$IONICE -c 3"
- 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
Modified: beagle/trunk/debian/patches/crawl-rules.dpatch
===================================================================
--- beagle/trunk/debian/patches/crawl-rules.dpatch 2007-05-08 20:04:29 UTC (rev 3114)
+++ beagle/trunk/debian/patches/crawl-rules.dpatch 2007-05-08 21:56:20 UTC (rev 3115)
@@ -5,12 +5,27 @@
## DP: No description.
@DPATCH@
-diff -urNad beagle-0.2.7.obsolete.0.117002416941435~/tools/crawl-rules/crawl-windows beagle-0.2.7.obsolete.0.117002416941435/tools/crawl-rules/crawl-windows
---- beagle-0.2.7.obsolete.0.117002416941435~/tools/crawl-rules/crawl-windows 2005-07-15 21:58:42.000000000 +0200
-+++ beagle-0.2.7.obsolete.0.117002416941435/tools/crawl-rules/crawl-windows 2006-07-30 13:12:24.000000000 +0200
+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"
+
+ CRAWL_CACHE_TEXT="no"
++
++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
@@ -1,4 +1,4 @@
-CRAWL_ENABLED="yes"
+CRAWL_ENABLED="no"
CRAWL_INDEX_NAME="windows"
+@@ -9,3 +9,5 @@
+ CRAWL_DISABLE_FILTERING="no"
+
+ CRAWL_CACHE_TEXT="yes"
++
++CRAWL_DISABLE_ON_BATTERY="yes"
Added: beagle/trunk/debian/patches/fix-typos.dpatch
===================================================================
--- beagle/trunk/debian/patches/fix-typos.dpatch 2007-05-08 20:04:29 UTC (rev 3114)
+++ beagle/trunk/debian/patches/fix-typos.dpatch 2007-05-08 21:56:20 UTC (rev 3115)
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-typos.dpatch by Jose Carlos Garcia Sogo <jsogo at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad beagle-0.2.17~/beagled/beagle-build-index.8 beagle-0.2.17/beagled/beagle-build-index.8
+--- beagle-0.2.17~/beagled/beagle-build-index.8 2007-02-07 20:04:14.000000000 +0100
++++ beagle-0.2.17/beagled/beagle-build-index.8 2007-05-08 23:52:13.000000000 +0200
+@@ -27,7 +27,7 @@
+ .BR beagle-build-index
+ will index the data specified by the \fIpath\fR arguments and create an index
+ in the \fIindex_path\fR directory. If a suitable index is found in the index
+-directory, if will automatically append data to the index if the file at hand
++directory, it will automatically append data to the index if the file at hand
+ has been modified since it was last indexed. If it can't find a suitable index
+ (non-existant or version-mismatch) is will purge the directory recursively.
+ .PP
+diff -urNad beagle-0.2.17~/beagled/beagled.1 beagle-0.2.17/beagled/beagled.1
+--- beagle-0.2.17~/beagled/beagled.1 2007-02-07 20:04:14.000000000 +0100
++++ beagle-0.2.17/beagled/beagled.1 2007-05-08 23:50:27.000000000 +0200
+@@ -60,7 +60,7 @@
+ Disable backend 'name'
+ .TP
+ .B \-\-allow\-backend \flbackend
+-(DEPRECIATED) Constrain the Beagle daemon to only use specified backends. This argument can
++(DEPRECATED) Constrain the Beagle daemon to only use specified backends. This argument can
+ be used multiple times.
+ .TP
+ .B \-\-deny\-backend \flbackend
Property changes on: beagle/trunk/debian/patches/fix-typos.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: beagle/trunk/debian/patches/name-iceweasel.dpatch
===================================================================
--- beagle/trunk/debian/patches/name-iceweasel.dpatch 2007-05-08 20:04:29 UTC (rev 3114)
+++ beagle/trunk/debian/patches/name-iceweasel.dpatch 2007-05-08 21:56:20 UTC (rev 3115)
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## name-iceweasel.dpatch by Jose Carlos Garcia Sogo <jsogo at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad beagle-0.2.17~/mozilla-extension/README beagle-0.2.17/mozilla-extension/README
+--- beagle-0.2.17~/mozilla-extension/README 2007-02-07 20:04:10.000000000 +0100
++++ beagle-0.2.17/mozilla-extension/README 2007-05-08 23:48:17.000000000 +0200
+@@ -1,9 +1,9 @@
+
+ Beagle Extension: Index webpages you visit using the Beagle Indexing Engine.
+-An Extension for the Firefox Browser.
++An Extension for the Firefox/Mozilla/Iceweasel Browser.
+
+ Installing:
+- Open the generated beagle.xsi in Firefox or Mozilla.
++ Open the generated beagle.xpi in Firefox/Mozilla/Iceweasel.
+ This will fire the Extension Manager.
+
+ Notes:
Property changes on: beagle/trunk/debian/patches/name-iceweasel.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: beagle/trunk/debian/patches/usebash.dpatch
===================================================================
--- beagle/trunk/debian/patches/usebash.dpatch 2007-05-08 20:04:29 UTC (rev 3114)
+++ beagle/trunk/debian/patches/usebash.dpatch 2007-05-08 21:56:20 UTC (rev 3115)
@@ -7,99 +7,108 @@
## need a build dependency in bash to just get that variable set to /bin/bash
@DPATCH@
-diff -urNad beagle-0.2.13~/ImLogViewer/beagle-imlogviewer.in beagle-0.2.13/ImLogViewer/beagle-imlogviewer.in
---- beagle-0.2.13~/ImLogViewer/beagle-imlogviewer.in 2006-11-21 23:19:14.000000000 +0100
-+++ beagle-0.2.13/ImLogViewer/beagle-imlogviewer.in 2006-11-21 23:19:14.000000000 +0100
+diff -urNad beagle-0.2.17~/ContactViewer/beagle-contactviewer.in beagle-0.2.17/ContactViewer/beagle-contactviewer.in
+--- beagle-0.2.17~/ContactViewer/beagle-contactviewer.in 2007-05-08 23:41:57.000000000 +0200
++++ beagle-0.2.17/ContactViewer/beagle-contactviewer.in 2007-05-08 23:42:41.000000000 +0200
@@ -1,4 +1,4 @@
-#!@bash@
+#! /bin/bash
# This line will be automatically uncommented when you "make install"
#installed=1
-diff -urNad beagle-0.2.13~/beagled/beagled-index-helper.in beagle-0.2.13/beagled/beagled-index-helper.in
---- beagle-0.2.13~/beagled/beagled-index-helper.in 2006-11-21 23:19:14.000000000 +0100
-+++ beagle-0.2.13/beagled/beagled-index-helper.in 2006-11-21 23:19:14.000000000 +0100
+diff -urNad beagle-0.2.17~/ImLogViewer/beagle-imlogviewer.in beagle-0.2.17/ImLogViewer/beagle-imlogviewer.in
+--- beagle-0.2.17~/ImLogViewer/beagle-imlogviewer.in 2007-05-08 23:41:57.000000000 +0200
++++ beagle-0.2.17/ImLogViewer/beagle-imlogviewer.in 2007-05-08 23:41:57.000000000 +0200
@@ -1,4 +1,4 @@
-#!@bash@
+#! /bin/bash
# This line will be automatically uncommented when you "make install"
#installed=1
-diff -urNad beagle-0.2.13~/beagled/beagled.in beagle-0.2.13/beagled/beagled.in
---- beagle-0.2.13~/beagled/beagled.in 2006-11-21 23:19:14.000000000 +0100
-+++ beagle-0.2.13/beagled/beagled.in 2006-11-21 23:19:14.000000000 +0100
+diff -urNad beagle-0.2.17~/beagled/beagled-index-helper.in beagle-0.2.17/beagled/beagled-index-helper.in
+--- beagle-0.2.17~/beagled/beagled-index-helper.in 2007-05-08 23:41:57.000000000 +0200
++++ beagle-0.2.17/beagled/beagled-index-helper.in 2007-05-08 23:41:58.000000000 +0200
@@ -1,4 +1,4 @@
-#!@bash@
++#! /bin/bash
+
+ # This line will be automatically uncommented when you "make install"
+ #installed=1
+diff -urNad beagle-0.2.17~/beagled/beagled.in beagle-0.2.17/beagled/beagled.in
+--- beagle-0.2.17~/beagled/beagled.in 2007-05-08 23:41:57.000000000 +0200
++++ beagle-0.2.17/beagled/beagled.in 2007-05-08 23:41:58.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!@bash@
+#!/bin/bash
# This line will be automatically uncommented when you "make install"
#installed=1
-diff -urNad beagle-0.2.13~/beagled/wrapper.in beagle-0.2.13/beagled/wrapper.in
---- beagle-0.2.13~/beagled/wrapper.in 2006-11-21 23:19:14.000000000 +0100
-+++ beagle-0.2.13/beagled/wrapper.in 2006-11-21 23:19:14.000000000 +0100
+diff -urNad beagle-0.2.17~/beagled/wrapper.in beagle-0.2.17/beagled/wrapper.in
+--- beagle-0.2.17~/beagled/wrapper.in 2007-05-08 23:41:57.000000000 +0200
++++ beagle-0.2.17/beagled/wrapper.in 2007-05-08 23:41:58.000000000 +0200
@@ -1,4 +1,4 @@
-#!@bash@
+#!/bin/bash
# This line will be automatically uncommented when you "make install"
#installed=1
-diff -urNad beagle-0.2.13~/bludgeon/bludgeon.in beagle-0.2.13/bludgeon/bludgeon.in
---- beagle-0.2.13~/bludgeon/bludgeon.in 2006-07-07 20:54:07.000000000 +0200
-+++ beagle-0.2.13/bludgeon/bludgeon.in 2006-11-21 23:19:14.000000000 +0100
+diff -urNad beagle-0.2.17~/bludgeon/bludgeon.in beagle-0.2.17/bludgeon/bludgeon.in
+--- beagle-0.2.17~/bludgeon/bludgeon.in 2007-02-07 20:04:15.000000000 +0100
++++ beagle-0.2.17/bludgeon/bludgeon.in 2007-05-08 23:41:58.000000000 +0200
@@ -1,4 +1,4 @@
-#!@bash@
+#!/bin/bash
if [ -e ./@target@ ] && [ -e ./Makefile.am ] ; then
echo "*** Running uninstalled @target@ ***"
-diff -urNad beagle-0.2.13~/search/beagle-search.in beagle-0.2.13/search/beagle-search.in
---- beagle-0.2.13~/search/beagle-search.in 2006-11-21 23:19:14.000000000 +0100
-+++ beagle-0.2.13/search/beagle-search.in 2006-11-21 23:19:14.000000000 +0100
+diff -urNad beagle-0.2.17~/search/beagle-search.in beagle-0.2.17/search/beagle-search.in
+--- beagle-0.2.17~/search/beagle-search.in 2007-05-08 23:41:57.000000000 +0200
++++ beagle-0.2.17/search/beagle-search.in 2007-05-08 23:41:58.000000000 +0200
@@ -1,4 +1,4 @@
-#!@bash@
+#! /bin/bash
# This line will be automatically uncommented when you "make install"
#installed=1
-diff -urNad beagle-0.2.13~/tools/beagle-crawl-system.in beagle-0.2.13/tools/beagle-crawl-system.in
---- beagle-0.2.13~/tools/beagle-crawl-system.in 2006-11-21 23:19:14.000000000 +0100
-+++ beagle-0.2.13/tools/beagle-crawl-system.in 2006-11-21 23:19:37.000000000 +0100
+diff -urNad beagle-0.2.17~/tools/beagle-crawl-system.in beagle-0.2.17/tools/beagle-crawl-system.in
+--- beagle-0.2.17~/tools/beagle-crawl-system.in 2007-05-08 23:41:57.000000000 +0200
++++ beagle-0.2.17/tools/beagle-crawl-system.in 2007-05-08 23:41:58.000000000 +0200
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
set -e
#
-diff -urNad beagle-0.2.13~/tools/beagle-index-info beagle-0.2.13/tools/beagle-index-info
---- beagle-0.2.13~/tools/beagle-index-info 2006-11-21 23:19:14.000000000 +0100
-+++ beagle-0.2.13/tools/beagle-index-info 2006-11-21 23:19:14.000000000 +0100
+diff -urNad beagle-0.2.17~/tools/beagle-index-info beagle-0.2.17/tools/beagle-index-info
+--- beagle-0.2.17~/tools/beagle-index-info 2007-05-08 23:41:57.000000000 +0200
++++ beagle-0.2.17/tools/beagle-index-info 2007-05-08 23:41:58.000000000 +0200
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# This line will be automatically uncommented when you "make install"
#installed=1
-diff -urNad beagle-0.2.13~/tools/beagle-ping beagle-0.2.13/tools/beagle-ping
---- beagle-0.2.13~/tools/beagle-ping 2006-11-21 23:19:14.000000000 +0100
-+++ beagle-0.2.13/tools/beagle-ping 2006-11-21 23:19:14.000000000 +0100
+diff -urNad beagle-0.2.17~/tools/beagle-ping beagle-0.2.17/tools/beagle-ping
+--- beagle-0.2.17~/tools/beagle-ping 2007-05-08 23:41:57.000000000 +0200
++++ beagle-0.2.17/tools/beagle-ping 2007-05-08 23:41:58.000000000 +0200
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# This line will be automatically uncommented when you "make install"
#installed=1
-diff -urNad beagle-0.2.13~/tools/beagle-status beagle-0.2.13/tools/beagle-status
---- beagle-0.2.13~/tools/beagle-status 2006-11-21 23:19:14.000000000 +0100
-+++ beagle-0.2.13/tools/beagle-status 2006-11-21 23:19:14.000000000 +0100
+diff -urNad beagle-0.2.17~/tools/beagle-status beagle-0.2.17/tools/beagle-status
+--- beagle-0.2.17~/tools/beagle-status 2007-05-08 23:41:57.000000000 +0200
++++ beagle-0.2.17/tools/beagle-status 2007-05-08 23:41:58.000000000 +0200
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# This line will be automatically uncommented when you "make install"
#installed=1
-diff -urNad beagle-0.2.13~/tools/wrapper.in beagle-0.2.13/tools/wrapper.in
---- beagle-0.2.13~/tools/wrapper.in 2006-07-07 20:54:07.000000000 +0200
-+++ beagle-0.2.13/tools/wrapper.in 2006-11-21 23:19:14.000000000 +0100
+diff -urNad beagle-0.2.17~/tools/wrapper.in beagle-0.2.17/tools/wrapper.in
+--- beagle-0.2.17~/tools/wrapper.in 2007-05-08 19:57:40.000000000 +0200
++++ beagle-0.2.17/tools/wrapper.in 2007-05-08 23:41:58.000000000 +0200
@@ -1,4 +1,4 @@
-#!@bash@
+#!/bin/bash
More information about the Pkg-mono-svn-commits
mailing list