[Pkg-cli-apps-commits] r3930 - in /packages/beagle/trunk/debian: changelog patches/00list patches/fix_evolution_namespace.dpatch rules
jsogo at users.alioth.debian.org
jsogo at users.alioth.debian.org
Sat May 3 15:04:28 UTC 2008
Author: jsogo
Date: Sat May 3 15:04:28 2008
New Revision: 3930
URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=3930
Log:
- Add patch to fix evolution-sharp namespace, and get beagle compile again
Added:
packages/beagle/trunk/debian/patches/fix_evolution_namespace.dpatch (with props)
Modified:
packages/beagle/trunk/debian/changelog
packages/beagle/trunk/debian/patches/00list
packages/beagle/trunk/debian/rules
Modified: packages/beagle/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle/trunk/debian/changelog?rev=3930&op=diff
==============================================================================
--- packages/beagle/trunk/debian/changelog (original)
+++ packages/beagle/trunk/debian/changelog Sat May 3 15:04:28 2008
@@ -1,3 +1,11 @@
+beagle (0.3.7-2) unstable; urgency=low
+
+ * debian/patches:
+ + fix_evolution_namespace: from SVN rev 4738; fix change in
+ evolution-sharp that made Beagle FTBFS
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Sat, 03 May 2008 17:04:10 +0200
+
beagle (0.3.7-1) unstable; urgency=low
[ Mirco Bauer ]
Modified: packages/beagle/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle/trunk/debian/patches/00list?rev=3930&op=diff
==============================================================================
--- packages/beagle/trunk/debian/patches/00list (original)
+++ packages/beagle/trunk/debian/patches/00list Sat May 3 15:04:28 2008
@@ -6,3 +6,4 @@
fix_Util.dll.config
fix_beagle-build-index-manpage
fix_system-scripts
+fix_evolution_namespace
Added: packages/beagle/trunk/debian/patches/fix_evolution_namespace.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle/trunk/debian/patches/fix_evolution_namespace.dpatch?rev=3930&op=file
==============================================================================
--- packages/beagle/trunk/debian/patches/fix_evolution_namespace.dpatch (added)
+++ packages/beagle/trunk/debian/patches/fix_evolution_namespace.dpatch Sat May 3 15:04:28 2008
@@ -1,0 +1,122 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_evolution_namespace.dpatch by <jose at gimli.tribulaciones.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes change in Evolution namespace. SVn rev 4738
+
+ at DPATCH@
+diff -urNad beagle-0.3.7~/beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs beagle-0.3.7/beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs
+--- beagle-0.3.7~/beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs 2008-01-02 04:00:23.000000000 +0100
++++ beagle-0.3.7/beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs 2008-05-03 16:12:21.000000000 +0200
+@@ -36,7 +36,7 @@
+ using Beagle.Util;
+ using Beagle.Daemon;
+
+-using Camel = Beagle.Util.Camel;
++using B_U_Camel = Beagle.Util.Camel;
+
+ namespace Beagle.Daemon.EvolutionMailQueryable {
+
+@@ -309,7 +309,7 @@
+ }
+ }
+
+- private static bool CheckFlags (uint flags, Camel.CamelFlags test)
++ private static bool CheckFlags (uint flags, B_U_Camel.CamelFlags test)
+ {
+ return (flags & (uint) test) == (uint) test;
+ }
+@@ -317,7 +317,7 @@
+ private Indexable GMimeMessageToIndexable (string uid, GMime.Message message, uint flags)
+ {
+ // Don't index messages flagged as junk
+- if (CheckFlags (flags, Camel.CamelFlags.Junk))
++ if (CheckFlags (flags, B_U_Camel.CamelFlags.Junk))
+ return null;
+
+ System.Uri uri = EvolutionMailQueryable.EmailUri (this.account_name, this.folder_name, uid);
+@@ -362,22 +362,22 @@
+ flag_prop.IsMutable = true;
+ indexable.AddProperty (flag_prop);
+
+- if (CheckFlags (flags, Camel.CamelFlags.Answered))
++ if (CheckFlags (flags, B_U_Camel.CamelFlags.Answered))
+ indexable.AddProperty (Property.NewFlag ("fixme:isAnswered"));
+
+- if (CheckFlags (flags, Camel.CamelFlags.Deleted))
++ if (CheckFlags (flags, B_U_Camel.CamelFlags.Deleted))
+ indexable.AddProperty (Property.NewFlag ("fixme:isDeleted"));
+
+- if (CheckFlags (flags, Camel.CamelFlags.Draft))
++ if (CheckFlags (flags, B_U_Camel.CamelFlags.Draft))
+ indexable.AddProperty (Property.NewFlag ("fixme:isDraft"));
+
+- if (CheckFlags (flags, Camel.CamelFlags.Flagged))
++ if (CheckFlags (flags, B_U_Camel.CamelFlags.Flagged))
+ indexable.AddProperty (Property.NewFlag ("fixme:isFlagged"));
+
+- if (CheckFlags (flags, Camel.CamelFlags.Seen))
++ if (CheckFlags (flags, B_U_Camel.CamelFlags.Seen))
+ indexable.AddProperty (Property.NewFlag ("fixme:isSeen"));
+
+- if (CheckFlags (flags, Camel.CamelFlags.AnsweredAll))
++ if (CheckFlags (flags, B_U_Camel.CamelFlags.AnsweredAll))
+ indexable.AddProperty (Property.NewFlag ("fixme:isAnsweredAll"));
+
+ indexable.SetBinaryStream (message.Stream);
+@@ -427,7 +427,7 @@
+ private FileInfo summary_info;
+ private string imap_name;
+ private ImapBackendType backend_type;
+- private Camel.Summary summary;
++ private B_U_Camel.Summary summary;
+ private IEnumerator summary_enumerator;
+ private EvolutionSummaryTracker tracker;
+ private DateTime start_crawl_time;
+@@ -593,9 +593,9 @@
+ if (this.summary == null) {
+ try {
+ if (this.backend_type == ImapBackendType.Imap)
+- this.summary = Camel.Summary.LoadImapSummary (this.summary_info.FullName);
++ this.summary = B_U_Camel.Summary.LoadImapSummary (this.summary_info.FullName);
+ else
+- this.summary = Camel.Summary.LoadImap4Summary (this.summary_info.FullName);
++ this.summary = B_U_Camel.Summary.LoadImap4Summary (this.summary_info.FullName);
+ } catch (Exception e) {
+ Logger.Log.Warn (e, "Unable to index {0}:", this.folder_name);
+ this.queryable.RemoveGenerator (this);
+@@ -660,7 +660,7 @@
+ return indexable;
+ }
+
+- Camel.MessageInfo mi = (Camel.MessageInfo) this.summary_enumerator.Current;
++ B_U_Camel.MessageInfo mi = (B_U_Camel.MessageInfo) this.summary_enumerator.Current;
+
+ ++this.count;
+
+@@ -717,12 +717,12 @@
+ return indexable;
+ }
+
+- private Uri CamelMessageUri (Camel.MessageInfo message_info)
++ private Uri CamelMessageUri (B_U_Camel.MessageInfo message_info)
+ {
+ return EvolutionMailQueryable.EmailUri (this.account_name, this.folder_name, message_info.uid);
+ }
+
+- private Indexable CamelMessageToIndexable (Camel.MessageInfo messageInfo, string msg_file)
++ private Indexable CamelMessageToIndexable (B_U_Camel.MessageInfo messageInfo, string msg_file)
+ {
+ // Don't index messages flagged as junk
+ if (messageInfo.IsJunk)
+diff -urNad beagle-0.3.7~/beagled/EvolutionMailQueryable/EvolutionMailQueryable.cs beagle-0.3.7/beagled/EvolutionMailQueryable/EvolutionMailQueryable.cs
+--- beagle-0.3.7~/beagled/EvolutionMailQueryable/EvolutionMailQueryable.cs 2008-02-11 13:07:01.000000000 +0100
++++ beagle-0.3.7/beagled/EvolutionMailQueryable/EvolutionMailQueryable.cs 2008-05-03 16:12:21.000000000 +0200
+@@ -31,7 +31,6 @@
+ using System.Threading;
+
+ using Beagle.Util;
+-using Camel = Beagle.Util.Camel;
+
+ namespace Beagle.Daemon.EvolutionMailQueryable {
+
Propchange: packages/beagle/trunk/debian/patches/fix_evolution_namespace.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: packages/beagle/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/beagle/trunk/debian/rules?rev=3930&op=diff
==============================================================================
--- packages/beagle/trunk/debian/rules (original)
+++ packages/beagle/trunk/debian/rules Sat May 3 15:04:28 2008
@@ -12,6 +12,7 @@
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
CFLAGS = -Wall -g
+#LDFLAGS += -Wl,-z,defs -Wl,--as-needed
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
@@ -22,7 +23,7 @@
configure: configure-stamp
configure-stamp: patch-stamp
dh_testdir
- CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \
+ CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./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 \
More information about the Pkg-cli-apps-commits
mailing list