[Pkg-cli-apps-commits] [SCM] smuxi branch, master, updated. debian/0.8.9.2-2-5-g1d30b64

[Mirco Bauer]

The following commit has been merged in the master branch:
commit 99fe7889c2582251669343a4559127c5940462b2
Author: Mirco Bauer <meebey at meebey.net>
Date:   Sat Jun 30 16:14:34 2012 +0200

    Dropped fix_messaging_menu_detection.patch, as already applied upstream

diff --git a/debian/patches/fix_messaging_menu_detection.patch b/debian/patches/fix_messaging_menu_detection.patch
deleted file mode 100644
index 937e006..0000000
--- a/debian/patches/fix_messaging_menu_detection.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: smuxi/src/Frontend-GNOME/IndicateManager.cs
-===================================================================
---- smuxi.orig/src/Frontend-GNOME/IndicateManager.cs	2012-02-09 22:33:52.000000000 +0100
-+++ smuxi/src/Frontend-GNOME/IndicateManager.cs	2012-03-22 22:31:32.000000000 +0100
-@@ -42,7 +42,7 @@
- #if LOG4NET
-         private static readonly log4net.ILog Logger = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
- #endif
--        const string BusName = "com.canonical.indicate";
-+        const string BusName = "com.canonical.indicator.session";
-         private static DateTime UnixEpoch = new DateTime(1970, 1, 1, 0, 0, 0);
-         private static string PersonChatIconBase64 { get; set; }
-         private static string GroupChatIconBase64  { get; set; }
diff --git a/debian/patches/series b/debian/patches/series
index 8d89898..b127b5c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-fix_messaging_menu_detection.patch
 build_Newtonsoft.Json_with_default_compiler.patch
 build_Twitterizer2_with_default_compiler.patch
 build_db4o_with_default_compiler.patch
diff --git a/debian/patches/ubuntu.series b/debian/patches/ubuntu.series
index 8f8e783..21225a5 100644
--- a/debian/patches/ubuntu.series
+++ b/debian/patches/ubuntu.series
@@ -1,4 +1,3 @@
-fix_messaging_menu_detection.patch
 build_Newtonsoft.Json_with_default_compiler.patch
 build_Twitterizer2_with_default_compiler.patch
 build_db4o_with_default_compiler.patch

-- 
smuxi