[Pkg-mono-svn-commits] rev 3022 - in beagle/branches/experimental/debian: . patches

[Jose Carlos Garcia Sogo]

Author: jsogo
Date: 2007-04-05 17:58:18 +0000 (Thu, 05 Apr 2007)
New Revision: 3022

Modified:
   beagle/branches/experimental/debian/changelog
   beagle/branches/experimental/debian/patches/beagle-crawl-safely.dpatch
Log:
beagle
 + Make beagle-crawl-safely patch apply


Modified: beagle/branches/experimental/debian/changelog
===================================================================
--- beagle/branches/experimental/debian/changelog	2007-04-05 11:56:15 UTC (rev 3021)
+++ beagle/branches/experimental/debian/changelog	2007-04-05 17:58:18 UTC (rev 3022)
@@ -1,8 +1,8 @@
 beagle (0.2.16.3-1) unstable; urgency=low
 
-  * New upstream release
+  * New upstream release. 
 
- -- Jose Carlos Garcia Sogo <jsogo at debian.org>  Thu, 05 Apr 2007 13:56:00 +0200
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org>  Thu, 05 Apr 2007 19:42:02 +0200
 
 beagle (0.2.16-4) experimental; urgency=low
 

Modified: beagle/branches/experimental/debian/patches/beagle-crawl-safely.dpatch
===================================================================
--- beagle/branches/experimental/debian/patches/beagle-crawl-safely.dpatch	2007-04-05 11:56:15 UTC (rev 3021)
+++ beagle/branches/experimental/debian/patches/beagle-crawl-safely.dpatch	2007-04-05 17:58:18 UTC (rev 3022)
@@ -6,9 +6,9 @@
 ## DP: (set -e) and redo option-adding to work with "set -e".
 
 @DPATCH@
-diff -urNad beagle-0.2.15.1~/tools/beagle-crawl-system.in beagle-0.2.15.1/tools/beagle-crawl-system.in
---- beagle-0.2.15.1~/tools/beagle-crawl-system.in	2007-01-24 18:52:32.000000000 +0100
-+++ beagle-0.2.15.1/tools/beagle-crawl-system.in	2007-01-27 00:45:33.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/sh
 +set -e
@@ -26,12 +26,13 @@
  umask 022
  
  CRAWL_USER=beagleindex
-@@ -37,36 +42,42 @@
+@@ -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
@@ -44,6 +45,9 @@
 -	    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`"
 -
@@ -60,37 +64,35 @@
 -            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
-+  
-+  	    if [ "$CRAWL_CACHE_TEXT" = "yes" ] ; then
-+  		OPTIONS="$OPTIONS --enable-text-cache"
++  	if [ "$CRAWL_ENABLED" = "yes" ]; then
++   
++  	    if [ "$CRAWL_DISABLE_FILTERING" = "yes" ] ; then
++  	        OPTIONS="$OPTIONS --disable-filtering"
 +  	    fi
 +   
-+  	    if [ -n "$CRAWL_ALLOW_PATTERNS" ] ; then
-+  		OPTIONS="$OPTIONS --allow-pattern $CRAWL_ALLOW_PATTERNS"
++  	    if [ "$CRAWL_DISABLE_DIRECTORIES" = "yes" ] ; then
++  	    	OPTIONS="$OPTIONS --disable-directories"
 +  	    fi
 +   
-+  	    if [ -n "$CRAWL_DENY_PATTERNS" ] ; then
-+  		OPTIONS="$OPTIONS --deny-pattern $CRAWL_DENY_PATTERNS"
++  	    if [ "$CRAWL_RECURSIVE" = "yes" ] ; then
++  	        OPTIONS="$OPTIONS --recursive"
 +  	    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 $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