[Pkg-cli-apps-commits] [SCM] monodevelop branch, master, updated. debian/2.4+dfsg-3-2-gf185c8a

[Jo Shields]

The following commit has been merged in the master branch:
commit 5028b8c1cc8dca01d884c650ab212ac69eef6269
Author: Jo Shields <directhex at apebox.org>
Date:   Wed Jun 9 15:30:22 2010 +0100

    refreshed debian/patches/use_libsvn1.patch

diff --git a/debian/changelog b/debian/changelog
index 9171668..cf7c69a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ monodevelop (2.3.1+dfsg-1) UNRELEASED; urgency=low
     + src/addins/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft/Mono.Debugger.Soft.dll
   * debian/control:
     + Bump mono build-deps to 2.6.1, to reflect configure.in
+  * debian/patches/use_libsvn1.patch:
+    + Refreshed
 
  -- Jo Shields <directhex at apebox.org>  Wed, 09 Jun 2010 15:17:58 +0100
 
diff --git a/debian/patches/use_libsvn1.patch b/debian/patches/use_libsvn1.patch
old mode 100755
new mode 100644
index be34337..39a231b
--- a/debian/patches/use_libsvn1.patch
+++ b/debian/patches/use_libsvn1.patch
@@ -1,10 +1,7 @@
-Index: monodevelop-2.1.0/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs
-Description: Only make use of libsvnclien1 so removing libsvnclient0 code
-Patch created by Mirco Bauer <meebey at debian.org>
+Index: monodevelop.git/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs
 ===================================================================
-diff -urNad monodevelop-2.1.0~/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs monodevelop-2.1.0/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs
---- monodevelop-2.1.0~/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs	2009-09-11 09:43:09.807796091 +0100
-+++ monodevelop-2.1.0/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs	2009-09-11 09:44:56.076602736 +0100
+--- monodevelop.git.orig/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs	2010-06-09 15:22:48.000000000 +0100
++++ monodevelop.git/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs	2010-06-09 15:29:35.000000000 +0100
 @@ -22,10 +22,6 @@
  		public static LibSvnClient GetLib ()
  		{
@@ -16,7 +13,7 @@ diff -urNad monodevelop-2.1.0~/src/addins/VersionControl/MonoDevelop.VersionCont
  				return new LibSvnClient1 ();
  			} catch {}
  			
-@@ -578,366 +574,6 @@
+@@ -580,374 +576,6 @@
  		public delegate IntPtr svn_client_blame_receiver_t (IntPtr baton, long line_no, int revision, string author, string date, string line, IntPtr pool);
  	}
  	
@@ -269,6 +266,12 @@ diff -urNad monodevelop-2.1.0~/src/addins/VersionControl/MonoDevelop.VersionCont
 -		{
 -			return svn_client_blame (path, ref rev_start, ref rev_end, receiver, baton, ctx, pool);
 -		}
+-		
+-		public override void strerror (int statcode, byte[] buf, int bufsize)
+-		{
+-			svn_strerror (statcode, buf, bufsize);
+-		}
+-		
 -
 -		
 -		[DllImport(svnclientlib)] static extern void svn_config_ensure (string config_dir, IntPtr pool);
@@ -378,6 +381,8 @@ diff -urNad monodevelop-2.1.0~/src/addins/VersionControl/MonoDevelop.VersionCont
 -		[DllImport(svnclientlib)] static extern IntPtr svn_client_prop_get (out IntPtr value, string name, string target, ref Rev revision, int recurse, IntPtr ctx, IntPtr pool);
 -
 -		[DllImport(svnclientlib)] static extern IntPtr svn_client_blame (string path, ref Rev rev_start, ref Rev rev_end, svn_client_blame_receiver_t receiver, IntPtr baton, IntPtr ctx, IntPtr pool);
+-		
+-		[DllImport(svnclientlib)] static extern void svn_strerror (int statcode, byte[] buf, int bufsize);
 -	}
 -	
  	public class LibSvnClient1 : LibSvnClient {

-- 
monodevelop