[Pkg-cli-libs-commits] [SCM] db4o branch, master, updated. upstream/7.4.120.14002+dfsg-29-g366f9aa

[Iain Lane]

The following commit has been merged in the master branch:
commit 366f9aa91c619d135e11a1c26ba2b203d7bccea8
Author: Iain Lane <laney at ubuntu.com>
Date:   Tue Jan 26 12:07:02 2010 +0000

    Add patch to remove Optimize() call
    
    debian/patches/05-cecil-api: Add new patch to remove call to method that
    isn't in the API of the version of cecil we have

diff --git a/debian/changelog b/debian/changelog
index 757aea3..1e9238d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -76,8 +76,10 @@ db4o (7.4.121.14026+dfsg-1) UNRELEASED; urgency=low
     packaging improvements
   * debian/libdb4o6.0-cil.installcligac: GAC the new libraries that we build
     now 
+  * debian/patches/05-cecil-api: Add new patch to remove call to method that
+    isn't in the API of the version of cecil we have 
 
- -- Iain Lane <laney at ubuntu.com>  Tue, 26 Jan 2010 11:31:49 +0000
+ -- Iain Lane <laney at ubuntu.com>  Tue, 26 Jan 2010 12:06:17 +0000
 
 db4o (6.1.604+dfsg-3) unstable; urgency=low
 
diff --git a/debian/patches/05-cecil-api b/debian/patches/05-cecil-api
new file mode 100644
index 0000000..6dadab3
--- /dev/null
+++ b/debian/patches/05-cecil-api
@@ -0,0 +1,12 @@
+Index: db4o.git/src/Db4oTool/Db4oTool/TA/TAInstrumentation.cs
+===================================================================
+--- db4o.git.orig/src/Db4oTool/Db4oTool/TA/TAInstrumentation.cs	2010-01-26 12:06:02.256817281 +0000
++++ db4o.git/src/Db4oTool/Db4oTool/TA/TAInstrumentation.cs	2010-01-26 12:06:06.416817369 +0000
+@@ -199,7 +199,6 @@
+ 
+ 			InstrumentFieldAccesses(method);
+ 
+-			method.Body.Optimize();
+ 		}
+ 
+ 		private bool HasFieldAccesses(MethodDefinition method)
diff --git a/debian/patches/series b/debian/patches/series
index 3a8a7d7..54cf394 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 02-link_system_libs.patch
 03-generate_xml_doc.patch
 04-update-relative-paths
+05-cecil-api

-- 
db4o