[Pkg-mono-svn-commits] rev 3017 - in non-group/monodevelop/trunk/debian: . patches

Mirco Bauer meebey-guest at alioth.debian.org
Wed Apr 4 20:01:32 UTC 2007


Author: meebey-guest
Date: 2007-04-04 20:01:32 +0000 (Wed, 04 Apr 2007)
New Revision: 3017

Added:
   non-group/monodevelop/trunk/debian/patches/use_libapr1.dpatch
   non-group/monodevelop/trunk/debian/patches/use_libsvn1.dpatch
Modified:
   non-group/monodevelop/trunk/debian/changelog
   non-group/monodevelop/trunk/debian/patches/00list
Log:
- 0.13.1+dfsg-2 release



Modified: non-group/monodevelop/trunk/debian/changelog
===================================================================
--- non-group/monodevelop/trunk/debian/changelog	2007-04-04 02:24:40 UTC (rev 3016)
+++ non-group/monodevelop/trunk/debian/changelog	2007-04-04 20:01:32 UTC (rev 3017)
@@ -1,3 +1,12 @@
+monodevelop (0.13.1+dfsg-2) unstable; urgency=low
+
+  * debian/patches/use_libsvn1.dpatch:
+    debian/patches/use_libapr1.dpatch:
+    + Remove references in the code that pulls libsvn0 and libapr0 in.
+      (Closes: #417763)
+
+ -- Mirco Bauer <meebey at debian.org>  Wed, 04 Apr 2007 22:00:22 +0200
+
 monodevelop (0.13.1+dfsg-1) unstable; urgency=low
 
    * DFSG version of MonoDevelop 0.13.1

Modified: non-group/monodevelop/trunk/debian/patches/00list
===================================================================
--- non-group/monodevelop/trunk/debian/patches/00list	2007-04-04 02:24:40 UTC (rev 3016)
+++ non-group/monodevelop/trunk/debian/patches/00list	2007-04-04 20:01:32 UTC (rev 3017)
@@ -1,5 +1,7 @@
 use_nunit2.2
 use_real_libs
+use_libsvn1
+use_libapr1
 #use_x-terminal-emulator
 cecil_0.4_backport
 update_templates_for_gtk_sharp_2.8.x

Added: non-group/monodevelop/trunk/debian/patches/use_libapr1.dpatch
===================================================================
--- non-group/monodevelop/trunk/debian/patches/use_libapr1.dpatch	2007-04-04 02:24:40 UTC (rev 3016)
+++ non-group/monodevelop/trunk/debian/patches/use_libapr1.dpatch	2007-04-04 20:01:32 UTC (rev 3017)
@@ -0,0 +1,57 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## use_libapr1.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad monodevelop-0.13.1+dfsg~/Extras/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibApr.cs monodevelop-0.13.1+dfsg/Extras/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibApr.cs
+--- monodevelop-0.13.1+dfsg~/Extras/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibApr.cs	2007-03-08 00:02:18.000000000 +0100
++++ monodevelop-0.13.1+dfsg/Extras/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/LibApr.cs	2007-04-04 21:47:01.000000000 +0200
+@@ -8,10 +8,6 @@
+ 	{
+ 		public static LibApr GetLib ()
+ 		{
+-			try {
+-				return new LibApr0 ();
+-			} catch {}
+-
+ 			return new LibApr1 ();
+ 		}
+ 		
+@@ -33,35 +29,6 @@
+ 		public abstract int file_close (IntPtr file);
+ 	}
+ 
+-	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 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 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";


Property changes on: non-group/monodevelop/trunk/debian/patches/use_libapr1.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: non-group/monodevelop/trunk/debian/patches/use_libsvn1.dpatch
===================================================================
--- non-group/monodevelop/trunk/debian/patches/use_libsvn1.dpatch	2007-04-04 02:24:40 UTC (rev 3016)
+++ non-group/monodevelop/trunk/debian/patches/use_libsvn1.dpatch	2007-04-04 20:01:32 UTC (rev 3017)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## use_libsvn1.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad monodevelop-0.13.1+dfsg~/Extras/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnClient.cs monodevelop-0.13.1+dfsg/Extras/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnClient.cs
+--- monodevelop-0.13.1+dfsg~/Extras/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnClient.cs	2007-03-08 00:02:18.000000000 +0100
++++ monodevelop-0.13.1+dfsg/Extras/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SvnClient.cs	2007-04-04 21:45:27.000000000 +0200
+@@ -752,7 +752,7 @@
+ 		const int APR_CREATE = 4;
+ 		const int APR_TRUNCATE = 16;
+ 
+-		private const string svnclientlib = "libsvn_client-1.so.0";
++		private const string svnclientlib = "libsvn_client-1.so.1";
+ 		
+ 		private struct svn_error_t {
+ 			public int apr_err;


Property changes on: non-group/monodevelop/trunk/debian/patches/use_libsvn1.dpatch
___________________________________________________________________
Name: svn:executable
   + *




More information about the Pkg-mono-svn-commits mailing list