[Pkg-cli-apps-commits] [SCM] docky branch, master, updated. debian/2.1.2-1-6-g5ab8e18

[Rico Tzschichholz]

The following commit has been merged in the master branch:
commit f47d172ed419feb51fec5a0081a0b740fc1d6f7c
Author: Rico Tzschichholz <ricotz at t-online.de>
Date:   Wed Jun 15 14:08:24 2011 +0200

    add upstream-patch to fix dll-maps

diff --git a/debian/patches/00bzr-fix_dll_maps.patch b/debian/patches/00bzr-fix_dll_maps.patch
new file mode 100644
index 0000000..fa62496
--- /dev/null
+++ b/debian/patches/00bzr-fix_dll_maps.patch
@@ -0,0 +1,107 @@
+Description: make native library references more consistent
+Author: Rico Tzschichholz <ricotz at ubuntu.com>
+Origin: upstream
+Last-Update: <2011-06-15>
+
+--- docky-2.1.3.orig/Docky.Services/Docky.Services.dll.config
++++ docky-2.1.3/Docky.Services/Docky.Services.dll.config
+@@ -2,6 +2,6 @@
+ 	<dllmap dll="libgobject-2.0" target="libgobject-2.0.so.0"/>
+ 	<dllmap dll="libgtk-x11-2.0" target="libgtk-x11-2.0.so.0"/>
+         <dllmap dll="libgdk-x11-2.0" target="libgdk-x11-2.0.so.0"/>
+-	<dllmap dll="gio-2.0" target="libgio-2.0.so.0"/>
+-	<dllmap dll="X11" target="libX11.so.6"/>
++	<dllmap dll="libgio-2.0" target="libgio-2.0.so.0"/>
++	<dllmap dll="libX11" target="libX11.so.6"/>
+ </configuration>
+--- docky-2.1.3.orig/Docky.Services/Docky.Services/NativeInterop.cs
++++ docky-2.1.3/Docky.Services/Docky.Services/NativeInterop.cs
+@@ -28,7 +28,7 @@ namespace Docky.Services
+ 	
+ 	internal class NativeInterop
+ 	{		
+-		[DllImport ("gio-2.0")]
++		[DllImport ("libgio-2.0")]
+ 		private static extern IntPtr g_file_get_uri (IntPtr fileHandle);
+ 		
+ 		[DllImport("libc")]
+@@ -36,18 +36,18 @@ namespace Docky.Services
+ 		
+ 		// these next 4 methods are not yet in GIO#.  The methods in GIO# (Unmount, Eject, UnmountFinish, EjectFinish)
+ 		// have been marked as deprecated since 2.22.  Once GIO# gets these methods we can remove these.
+-		[DllImport("gio-2.0")]
++		[DllImport("libgio-2.0")]
+ 		private static extern void g_mount_unmount_with_operation (IntPtr mount, int flags, IntPtr mount_operation, 
+ 			IntPtr cancellable, GLibSharp.AsyncReadyCallbackNative callback, IntPtr user_data);
+ 		
+-		[DllImport("gio-2.0")]
++		[DllImport("libgio-2.0")]
+ 		private static extern void g_mount_eject_with_operation (IntPtr mount, int flags, IntPtr mount_operation, 
+ 			IntPtr cancellable, GLibSharp.AsyncReadyCallbackNative callback, IntPtr user_data);
+ 		
+-		[DllImport("gio-2.0")]
++		[DllImport("libgio-2.0")]
+ 		private static extern bool g_mount_unmount_with_operation_finish (IntPtr mount, IntPtr result, out IntPtr error);
+ 		
+-		[DllImport("gio-2.0")]
++		[DllImport("libgio-2.0")]
+ 		private static extern bool g_mount_eject_with_operation_finish (IntPtr mount, IntPtr result, out IntPtr error);
+ 		
+ 		// GTK# seems not to have lookup_by_gicon... I need it...
+@@ -73,34 +73,34 @@ namespace Docky.Services
+ 		[DllImport("libgobject-2.0")]
+ 		private static extern void g_object_unref (IntPtr @object);
+ 		
+-		[DllImport("gio-2.0")]
++		[DllImport("libgio-2.0")]
+ 		private static extern IntPtr g_file_query_info (IntPtr file, string attributes, int flags, IntPtr cancellable, out IntPtr error);
+ 
+-		[DllImport("gio-2.0")]
++		[DllImport("libgio-2.0")]
+ 		private static extern IntPtr g_file_query_filesystem_info(IntPtr file, string attributes, IntPtr cancellable, out IntPtr error);
+ 		
+-		[DllImport("gio-2.0")]
++		[DllImport("libgio-2.0")]
+ 		private static extern IntPtr g_file_info_get_attribute_string (IntPtr info, string attribute);
+ 		
+-		[DllImport("gio-2.0")]
++		[DllImport("libgio-2.0")]
+ 		private static extern IntPtr g_file_info_get_attribute_stringv (IntPtr info, string attribute);
+ 				
+-		[DllImport("gio-2.0")]
++		[DllImport("libgio-2.0")]
+ 		private static extern IntPtr g_file_info_get_attribute_byte_string (IntPtr info, string attribute);
+ 		
+-		[DllImport("gio-2.0")]
++		[DllImport("libgio-2.0")]
+ 		static extern uint g_file_info_get_attribute_uint32 (IntPtr info, string attribute);
+ 		
+-		[DllImport("gio-2.0")]
++		[DllImport("libgio-2.0")]
+ 		static extern ulong g_file_info_get_attribute_uint64 (IntPtr info, string attribute);
+ 		
+-		[DllImport("gio-2.0")]
++		[DllImport("libgio-2.0")]
+ 		static extern bool g_file_info_get_attribute_boolean (IntPtr info, string attribute);
+ 		
+-		[DllImport("gio-2.0")]
++		[DllImport("libgio-2.0")]
+ 		static extern long g_file_info_get_size (IntPtr info);
+ 		
+-		[DllImport("gio-2.0")]
++		[DllImport("libgio-2.0")]
+ 		static extern IntPtr g_file_info_get_icon (IntPtr info);
+ 		
+ 		#endregion
+--- docky-2.1.3.orig/Docky.Services/Docky.Services/Xlib/Xlib.cs
++++ docky-2.1.3/Docky.Services/Docky.Services/Xlib/Xlib.cs
+@@ -65,7 +65,7 @@ namespace Docky.Services.Xlib {
+ 	}
+ 	
+ 	public static class X {
+-		const string libX11 = "X11";
++		const string libX11 = "libX11";
+ 		const string libGdkX11 = "libgdk-x11-2.0";
+ 		
+ 		[DllImport (libGdkX11)]
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..1495edd
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+00bzr-fix_dll_maps.patch

-- 
docky