[Pkg-cli-apps-commits] [SCM] monodevelop branch, master-experimental, updated. debian/2.4.1+dfsg-1-11-g28a6814

[Jo Shields]

The following commit has been merged in the master-experimental branch:
commit 24aac286cf52c99465afd6fc59d34fedcd3e16c2
Author: Jo Shields <directhex at apebox.org>
Date:   Fri Jun 24 00:07:54 2011 +0100

    Update use_libsvn1.patch for altered path in source tree

diff --git a/debian/patches/use_libsvn1.patch b/debian/patches/use_libsvn1.patch
index 39a231b..dcd5996 100644
--- a/debian/patches/use_libsvn1.patch
+++ b/debian/patches/use_libsvn1.patch
@@ -1,7 +1,7 @@
-Index: monodevelop.git/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibSvnClient.cs
+Index: monodevelop.git/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibSvnClient.cs
 ===================================================================
---- 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
+--- monodevelop.git.orig/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibSvnClient.cs	2011-06-24 00:05:54.000000000 +0100
++++ monodevelop.git/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibSvnClient.cs	2011-06-24 00:06:29.000000000 +0100
 @@ -22,10 +22,6 @@
  		public static LibSvnClient GetLib ()
  		{
@@ -13,7 +13,7 @@ Index: monodevelop.git/src/addins/VersionControl/MonoDevelop.VersionControl.Subv
  				return new LibSvnClient1 ();
  			} catch {}
  			
-@@ -580,374 +576,6 @@
+@@ -582,381 +578,6 @@
  		public delegate IntPtr svn_client_blame_receiver_t (IntPtr baton, long line_no, int revision, string author, string date, string line, IntPtr pool);
  	}
  	
@@ -272,6 +272,11 @@ Index: monodevelop.git/src/addins/VersionControl/MonoDevelop.VersionControl.Subv
 -			svn_strerror (statcode, buf, bufsize);
 -		}
 -		
+-		public override IntPtr path_internal_style (string path, IntPtr pool)
+-		{
+-			return svn_path_internal_style (path, pool);
+-		}
+-		
 -
 -		
 -		[DllImport(svnclientlib)] static extern void svn_config_ensure (string config_dir, IntPtr pool);
@@ -383,6 +388,8 @@ Index: monodevelop.git/src/addins/VersionControl/MonoDevelop.VersionControl.Subv
 -		[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);
+-		
+-		[DllImport(svnclientlib)] static extern IntPtr svn_path_internal_style (string path, IntPtr pool);
 -	}
 -	
  	public class LibSvnClient1 : LibSvnClient {

-- 
monodevelop