[Pkg-cli-apps-commits] [SCM] docky branch, master, updated. debian/2.1.3-1-7-g1d66cb3

[Rico Tzschichholz]

The following commit has been merged in the master branch:
commit 1d66cb3e78e777a7eddd29a9e0caddaaff20bcae
Author: Rico Tzschichholz <ricotz at t-online.de>
Date:   Sat Mar 24 08:59:52 2012 +0100

    drop 00bzr-fix_dll_maps.patch

diff --git a/debian/changelog b/debian/changelog
index a5e505a..26ad688 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ docky (2.1.4-1) UNRELEASED; urgency=low
   * New upstream release 2.1.4 "Rediscovered friend",
     + matcher: fix for libreoffice 3.4+ (LP: #823834)
     + add support building with dmcs
+  * debian/patches:
+    + drop 00bzr-fix_dll_maps.patch, included upstream
 
- -- Rico Tzschichholz <ricotz at ubuntu.com>  Sat, 24 Mar 2012 08:55:45 +0100
+ -- Rico Tzschichholz <ricotz at ubuntu.com>  Sat, 24 Mar 2012 08:59:25 +0100
 
 docky (2.1.3-2) unstable; urgency=low
 
diff --git a/debian/patches/00bzr-fix_dll_maps.patch b/debian/patches/00bzr-fix_dll_maps.patch
deleted file mode 100644
index fa62496..0000000
--- a/debian/patches/00bzr-fix_dll_maps.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-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
index 1495edd..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-00bzr-fix_dll_maps.patch

-- 
docky