[Pkg-mono-svn-commits] rev 2854 - in beagle/trunk/debian: . patches

Jose Carlos Garcia Sogo jsogo at alioth.debian.org
Sun Nov 5 02:46:34 CET 2006


Author: jsogo
Date: 2006-11-05 02:46:33 +0100 (Sun, 05 Nov 2006)
New Revision: 2854

Modified:
   beagle/trunk/debian/changelog
   beagle/trunk/debian/control
   beagle/trunk/debian/patches/beagle-crawl-safely.dpatch
   beagle/trunk/debian/rules
Log:
beagle 0.2.12-1
 + New upstream version
   - reduces memory usage
   - do not hardcode mcs
   - do not start with --debug
   - actually suspend when on battery
 + update beagle-crawl-safely.dpatch to include --disable-directories option
 + call dh_clideps with -d to try to avoid duplicate dependencies


Modified: beagle/trunk/debian/changelog
===================================================================
--- beagle/trunk/debian/changelog	2006-11-04 19:27:08 UTC (rev 2853)
+++ beagle/trunk/debian/changelog	2006-11-05 01:46:33 UTC (rev 2854)
@@ -1,3 +1,19 @@
+beagle (0.2.12-1) unstable; urgency=low
+
+  * New upstream version.
+    + Reduces memory usage
+    + Do not start with --debug (Closes: #357511)
+    + Do not hardcode mcs name (Closes: #394856)
+    + Actually suspend when on battery (Closes: #396926)
+    + Fix an exception on non-notes files in Tomboy dir
+
+  * debian/patches:
+     + beagle-crawl-safely: update; include new --disable-directories option
+  * debian/rules:
+     + call dh_clideps with -d option, trying to avoid duplicate dependencies.
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org>  Sun,  5 Nov 2006 02:41:59 +0100
+
 beagle (0.2.11-1) unstable; urgency=low
 
   * New upstream release.

Modified: beagle/trunk/debian/control
===================================================================
--- beagle/trunk/debian/control	2006-11-04 19:27:08 UTC (rev 2853)
+++ beagle/trunk/debian/control	2006-11-05 01:46:33 UTC (rev 2854)
@@ -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.0), 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-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)
 Standards-Version: 3.7.2
 XS-X-Vcs-Svn: svn://svn.debian.org/svn/pkg-mono/beagle/trunk
 

Modified: beagle/trunk/debian/patches/beagle-crawl-safely.dpatch
===================================================================
--- beagle/trunk/debian/patches/beagle-crawl-safely.dpatch	2006-11-04 19:27:08 UTC (rev 2853)
+++ beagle/trunk/debian/patches/beagle-crawl-safely.dpatch	2006-11-05 01:46:33 UTC (rev 2854)
@@ -6,9 +6,9 @@
 ## DP: (set -e) and redo option-adding to work with "set -e".
 
 @DPATCH@
-diff -urNad beagle-0.2.10~/tools/beagle-crawl-system.in beagle-0.2.10/tools/beagle-crawl-system.in
---- beagle-0.2.10~/tools/beagle-crawl-system.in	2006-09-24 12:43:34.000000000 +0200
-+++ beagle-0.2.10/tools/beagle-crawl-system.in	2006-09-24 12:48:46.000000000 +0200
+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
 @@ -1,4 +1,5 @@
  #!/bin/bash
 +set -e
@@ -26,7 +26,7 @@
  umask 022
  
  CRAWL_USER=beagleindex
-@@ -37,33 +42,37 @@
+@@ -37,36 +42,41 @@
  chown $CRAWL_USER $MONO_SHARED_DIR
  
  for crawl_file in @sysconfdir@/beagle/crawl-*; do 
@@ -37,30 +37,27 @@
  	. $crawl_file
  
 -	if [ -n "$CRAWL_ENABLED" -a "$CRAWL_ENABLED" = "yes" ] ; then
-+	if [ "$CRAWL_ENABLED" = "yes" ] ; then
- 
+-
 -	    OPTIONS="`test -n "$CRAWL_DISABLE_FILTERING" -a "$CRAWL_DISABLE_FILTERING" = "yes" && \
 -                     echo --disable-filtering`"
-+	    if [ "$CRAWL_DISABLE_FILTERING" = "yes" ] ; then
-+		OPTIONS="$OPTIONS --disable-filtering"
-+	    fi
- 
+-
+-	    OPTIONS="`test -n "$CRAWL_DISABLE_DIRECTORIES" -a "$CRAWL_DISABLE_DIRECTORIES" = "yes" && \
+-                     echo --disable-directories`"
+-
 -	    OPTIONS="$OPTIONS `test -n "$CRAWL_RECURSIVE" -a "$CRAWL_RECURSIVE" = "yes" && \
 -                     echo --recursive`"
-+	    if [ "$CRAWL_RECURSIVE" = "yes" ] ; then
-+		OPTIONS="$OPTIONS --recursive"
-+	    fi
++	if [ "$CRAWL_ENABLED" = "yes" ]; then
  
 -	    OPTIONS="$OPTIONS `test -n "$CRAWL_CACHE_TEXT" -a "$CRAWL_CACHE_TEXT" = "yes" && \
 -                     echo --enable-text-cache`"
-+	    if [ "$CRAWL_CACHE_TEXT" = "yes" ] ; then
-+		OPTIONS="$OPTIONS --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 [ -n "$CRAWL_ALLOW_PATTERNS" ] ; then
-+		OPTIONS="$OPTIONS --allow-pattern $CRAWL_ALLOW_PATTERNS"
++	    if [ "$CRAWL_DISABLE_DIRECTORIES" = "yes" ] ; then
++	    	OPTIONS="$OPTIONS --disable-directories"
 +	    fi
  
 -	    OPTIONS="$OPTIONS `test -n "$CRAWL_DENY_PATTERNS" && \
@@ -70,14 +67,26 @@
 -            if [ -n "$IONICE" ]; then
 -                IONICE="$IONICE -c 3"
 -            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 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
  	fi
      fi

Modified: beagle/trunk/debian/rules
===================================================================
--- beagle/trunk/debian/rules	2006-11-04 19:27:08 UTC (rev 2853)
+++ beagle/trunk/debian/rules	2006-11-05 01:46:33 UTC (rev 2854)
@@ -108,7 +108,7 @@
 	dh_fixperms -i
 	dh_installdeb -i
 	dh_shlibdeps -i
-	dh_clideps -i
+	dh_clideps -i -d
 	dh_gencontrol -i
 	dh_md5sums -i
 	dh_builddeb -i
@@ -129,7 +129,7 @@
 	dh_fixperms -a
 	dh_installdeb -a
 	dh_shlibdeps -a
-	dh_clideps -a 
+	dh_clideps -a -d
 	dh_gencontrol -a
 	dh_md5sums -a
 	dh_builddeb -a




More information about the Pkg-mono-svn-commits mailing list