[Pkg-cli-apps-commits] [SCM] monodevelop branch, master, updated. debian/3.0.3.2+dfsg-1-13-g4bfbce8

[Jo Shields]

The following commit has been merged in the master branch:
commit ec61152b86e12ecdc8d6a8d789b2ae70e0d7efc5
Author: Jo Shields <directhex at apebox.org>
Date:   Sun Feb 24 18:30:02 2013 +0000

    Remove obsolete patch use_libapr1.patch - we don't need this, since we can --exclude-moduleref these days when never-used libs are referenced in platform-specific code.

diff --git a/debian/patches/series b/debian/patches/series
index a743ead..55c0c22 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-use_libapr1.patch
 update_templates_for_gtk-sharp_2.12.patch
 boo_mimetype.patch
 no_appmenu
diff --git a/debian/patches/use_libapr1.patch b/debian/patches/use_libapr1.patch
deleted file mode 100644
index 8278bc0..0000000
--- a/debian/patches/use_libapr1.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibApr.cs
-+++ b/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix/LibApr.cs
-@@ -14,15 +14,6 @@
- 		public static LibApr GetLib (int ver)
- 		{
- 			try {
--				if (ver == 0)
--					return new LibApr0 ();
--				else if (ver == 1)
--					return new LibApr1 ();
--				
--				try {
--					return new LibApr0 ();
--				} catch {}
--				
- 				return new LibApr1 ();
- 			}
- 			catch {
-@@ -63,37 +54,6 @@
- 		public const int APR_OS_START_USEERR = APR_OS_START_USERERR;
- 	}
- 
--	public class LibApr0: LibApr
--	{
--		private const string aprlib = "libapr-0.so.0";
--		
--		public override void initialize() { apr_initialize (); }
--		public override IntPtr pool_create_ex (out IntPtr pool, IntPtr parent, IntPtr abort, IntPtr allocator) { return apr_pool_create_ex(out pool, parent, abort, allocator); }
--		public override void pool_destroy(IntPtr pool) { apr_pool_destroy (pool); }
--		public override IntPtr hash_first(IntPtr pool, IntPtr hash) { return apr_hash_first (pool, hash); }
--		public override IntPtr hash_next(IntPtr hashindex) { return apr_hash_next(hashindex); }
--		public override void hash_this(IntPtr hashindex, out IntPtr key, out int keylen, out IntPtr val) { apr_hash_this(hashindex, out key, out keylen, out val); }
--		public override IntPtr array_make(IntPtr pool, int nelts, int elt_size) { return apr_array_make(pool, nelts, elt_size); }
--		public override IntPtr array_push(IntPtr arr) { return apr_array_push (arr); }
--		public override IntPtr pstrdup(IntPtr pool, string s) { return apr_pstrdup(pool, s); }
--		public override IntPtr pcalloc (IntPtr pool, [MarshalAs (UnmanagedType.SysInt)] int size) { return apr_pcalloc (pool, size); }
--		public override int file_open(ref IntPtr newf, string fname, int flag, int perm, IntPtr pool) { return apr_file_open(ref newf, fname, flag, perm, pool); } 
--		public override int file_close (IntPtr file) { return apr_file_close (file); } 	
--
--		[DllImport(aprlib)] static extern void apr_initialize();
--		[DllImport(aprlib)] static extern IntPtr apr_pool_create_ex(out IntPtr pool, IntPtr parent, IntPtr abort, IntPtr allocator);
--		[DllImport(aprlib)] static extern void apr_pool_destroy(IntPtr pool);
--		[DllImport(aprlib)] static extern IntPtr apr_hash_first(IntPtr pool, IntPtr hash);
--		[DllImport(aprlib)] static extern IntPtr apr_hash_next(IntPtr hashindex);
--		[DllImport(aprlib)] static extern void apr_hash_this(IntPtr hashindex, out IntPtr key, out int keylen, out IntPtr val);
--		[DllImport(aprlib)] static extern IntPtr apr_array_make(IntPtr pool, int nelts, int elt_size);
--		[DllImport(aprlib)] static extern IntPtr apr_array_push(IntPtr arr);
--		[DllImport(aprlib)] static extern IntPtr apr_pstrdup(IntPtr pool, string s);
--		[DllImport(aprlib)] static extern IntPtr apr_pcalloc(IntPtr pool, [MarshalAs (UnmanagedType.SysInt)] int size);
--		[DllImport(aprlib)] static extern int apr_file_open(ref IntPtr newf, string fname, int flag, int perm, IntPtr pool); 
--		[DllImport(aprlib)] static extern int apr_file_close (IntPtr file); 	
--	}
--
- 	public class LibApr1: LibApr
- 	{
- 		private const string aprlib = "libapr-1.so.0";

-- 
monodevelop