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

Mirco Bauer meebey-guest at alioth.debian.org
Fri Sep 21 17:38:45 UTC 2007 

Author: meebey-guest
Date: 2007-09-21 17:38:45 +0000 (Fri, 21 Sep 2007)
New Revision: 3363

Added:
   beagle/trunk/debian/patches/enhanced_logging_support.dpatch
   beagle/trunk/debian/patches/fix_GMime.StreamFs.Seek_usage.dpatch
Modified:
   beagle/trunk/debian/changelog
   beagle/trunk/debian/patches/00list
   beagle/trunk/debian/rules
Log:
- beagle 0.2.18-1 release



Modified: beagle/trunk/debian/changelog
===================================================================
--- beagle/trunk/debian/changelog	2007-09-20 21:12:37 UTC (rev 3362)
+++ beagle/trunk/debian/changelog	2007-09-21 17:38:45 UTC (rev 3363)
@@ -1,5 +1,6 @@
 beagle (0.2.18-1) unstable; urgency=low
 
+  [ Jose Carlos Garcia Sogo ]
   * New upstream version.
      + Fixed problem of not finding icedove mail (Closes: #407242)
      + Index .mp3 files using v2.3 ID3 correctly (Closes: #419993)
@@ -13,8 +14,17 @@
        lintian clean.
      + beagle-settings: disabled
 
- -- Jose Carlos Garcia Sogo <jsogo at debian.org>  Sun, 16 Sep 2007 02:50:23 +0200
+  [ Mirco Bauer ]
+  * debian/patches/fix_GMime.StreamFs.Seek_usage.dpatch:
+    + Don't try to seek 0 bytes, which triggers an assert in GMime. (Closes: #442173)
+  * debian/patches/enhanced_logging_support.dpatch:
+    + Logger uses warning now as log level instead of debug. (Closes: #363703)
+      (Debug level still can be activated using beagled --debug)
+  * debian/rules:
+    + Call unpatch after clean, else it will reconfigure on "make clean"
 
+ -- Mirco Bauer <meebey at debian.org>  Fri, 21 Sep 2007 15:47:06 +0200
+
 beagle (0.2.17-2) unstable; urgency=medium
 
   [ Jose Carlos Garcia Sogo ]

Modified: beagle/trunk/debian/patches/00list
===================================================================
--- beagle/trunk/debian/patches/00list	2007-09-20 21:12:37 UTC (rev 3362)
+++ beagle/trunk/debian/patches/00list	2007-09-21 17:38:45 UTC (rev 3363)
@@ -1,9 +1,10 @@
-beagle-crawl-safely.dpatch
-beagle_secure_scripts.dpatch
-#beagle-settings.dpatch
-fix_desktop_files.dpatch
-crawl-rules.dpatch
-usebash.dpatch
-use-python2.4.dpatch
-relibtoolize.dpatch
-icedove.dpatch
+beagle-crawl-safely
+beagle_secure_scripts
+fix_desktop_files
+crawl-rules
+usebash
+use-python2.4
+relibtoolize
+icedove
+enhanced_logging_support
+fix_GMime.StreamFs.Seek_usage

Added: beagle/trunk/debian/patches/enhanced_logging_support.dpatch
===================================================================
--- beagle/trunk/debian/patches/enhanced_logging_support.dpatch	                        (rev 0)
+++ beagle/trunk/debian/patches/enhanced_logging_support.dpatch	2007-09-21 17:38:45 UTC (rev 3363)
@@ -0,0 +1,72 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## set_log_level_to_warn.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at 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-09-21 19:02:43.000000000 +0200
++++ beagle-0.2.18/beagled/BeagleDaemon.cs	2007-09-21 19:04:13.000000000 +0200
+@@ -457,10 +457,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.Warn,
++					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-09-21 19:02:43.000000000 +0200
++++ beagle-0.2.18/beagled/IndexHelper/IndexHelper.cs	2007-09-21 19:04:13.000000000 +0200
+@@ -80,22 +80,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);
++			bool debug = (Environment.GetEnvironmentVariable ("BEAGLE_DEBUG_FLAG_IS_SET") != null);
+ 
+ 			if (args.Length == 1 && args [0] == "--disable-text-cache")
+ 				disable_textcache = true;
+ 			else
+ 				disable_textcache = false;
+-			
+-			// FIXME: We always turn on full debugging output!  We are still
+-			// debugging this code, after all...
+-			//bool debug = (Environment.GetEnvironmentVariable ("BEAGLE_DEBUG_FLAG_IS_SET") != null);
+ 
+ 			last_activity = DateTime.Now;
+ 
+ 			Log.Initialize (PathFinder.LogDir,
+ 					"IndexHelper",
+-					//debug ? LogLevel.Debug : LogLevel.Warn,
+-					LogLevel.Warn,
++					debug ? LogLevel.Debug : LogLevel.Warn,
+ 					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:04:12.000000000 +0200
++++ beagle-0.2.18/beagled/beagled.in	2007-09-21 19:04:13.000000000 +0200
+@@ -33,6 +33,7 @@
+     --heap-shot ) heap_shot=1 ;;
+     --mdb ) mdb=1 ;;
+     --mono-debug ) mono_debug=1 ;;
++    --debug ) debug=1 ;;
+     esac
+ done
+ 
+@@ -53,6 +54,10 @@
+     unset BEAGLE_LOG_IN_THE_FOREGROUND_PLEASE
+ fi
+ 
++if [ $debug -eq 1 ]; then
++   export BEAGLE_DEBUG_FLAG_IS_SET=1
++fi
++   
+ if [ $heap_buddy -eq 1 ]; then
+    export _GET_ON_THE_HEAP_BUDDY_BANDWAGON=1
+    if [ -z "$BEAGLE_HEAP_BUDDY_DIR" ]; then


Property changes on: beagle/trunk/debian/patches/enhanced_logging_support.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: beagle/trunk/debian/patches/fix_GMime.StreamFs.Seek_usage.dpatch
===================================================================
--- beagle/trunk/debian/patches/fix_GMime.StreamFs.Seek_usage.dpatch	                        (rev 0)
+++ beagle/trunk/debian/patches/fix_GMime.StreamFs.Seek_usage.dpatch	2007-09-21 17:38:45 UTC (rev 3363)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_GMime.StreamFs.Seek_usage.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad beagle-0.2.18~/beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs beagle-0.2.18/beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs
+--- beagle-0.2.18~/beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs	2007-09-21 19:05:01.000000000 +0200
++++ beagle-0.2.18/beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs	2007-09-21 19:07:56.000000000 +0200
+@@ -225,7 +225,9 @@
+ 				}
+ 
+ 				this.mbox_stream = new GMime.StreamFs (this.mbox_fd);
+-				this.mbox_stream.Seek ((int) this.MboxLastOffset);
++				if (this.MboxLastOffset > 0) {
++					this.mbox_stream.Seek ((int) this.MboxLastOffset);
++				}
+ 				this.mbox_parser = new GMime.Parser (this.mbox_stream);
+ 				this.mbox_parser.ScanFrom = true;
+ 


Property changes on: beagle/trunk/debian/patches/fix_GMime.StreamFs.Seek_usage.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: beagle/trunk/debian/rules
===================================================================
--- beagle/trunk/debian/rules	2007-09-20 21:12:37 UTC (rev 3362)
+++ beagle/trunk/debian/rules	2007-09-21 17:38:45 UTC (rev 3363)
@@ -42,7 +42,8 @@
 	$(MAKE)
 	touch build-stamp
 
-clean: unpatch
+clean: clean-patched unpatch
+clean-patched:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
@@ -51,8 +52,6 @@
 	
 	rm -rf $(MONO_SHARED_DIR)/.wapi
 
-	rm -rf debian/patched
-
 	dh_clean 
 
 install: build-stamp install-arch install-indep
@@ -71,7 +70,6 @@
 #	cp $(CURDIR)/debian/beagled.desktop $(CURDIR)/debian/beagle/etc/xdg/autostart
 #	cp $(CURDIR)/debian/beagled-kde.desktop $(CURDIR)/debian/beagle/usr/share/autostart
 
-
 	find debian/beagle debian/python-beagle -name '*.a' -delete
 	find debian/beagle debian/python-beagle debian/libbeagle-dev -name '*.la' -delete
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
@@ -131,7 +129,7 @@
 	dh_installman -a
 	dh_makeshlibs -plibbeagle0 -V
 	dh_pysupport -ppython-beagle
-	dh_makeclilibs -a -V
+#	dh_makeclilibs -a -V
 	dh_link -a
 	dh_strip -a
 	dh_compress -a -X.xpi

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