[Pkg-cli-apps-commits] [SCM] smuxi branch, lenny-backports, updated. debian/0.7.2.1-1-20-gfecf245

Mirco Bauer meebey at meebey.net
Fri Jul 23 23:52:04 UTC 2010


The following commit has been merged in the lenny-backports branch:
commit 02827972269a66d2604bafa013bbb3a0eaa64678
Author: Mirco Bauer <meebey at meebey.net>
Date:   Wed Feb 3 01:30:03 2010 +0100

    Dropped debian/patches/mono_2.0_compat.patch

diff --git a/debian/changelog b/debian/changelog
index c1e65f6..02ab119 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,6 @@ smuxi (0.7.1-1~bpo50+1) lenny-backports; urgency=low
     + Replaced all -cil-dev build-deps with -cil.
     + Added libmono-dev, libmono2.0-cil, libmono-cairo2.0-cil, and
       libmono-system-runtime2.0-cil to build-deps.
-  * debian/patches/mono_2.0_compat.patch:
-    + Fixes failing build on Mono 2.0
   * debian/rules:
     + Fixed debian/series file patcher.
     + Disabled "make check" as gettext fails on sources in .pc/ from quilt.
diff --git a/debian/patches/mono_2.0_compat.patch b/debian/patches/mono_2.0_compat.patch
deleted file mode 100644
index 2712f11..0000000
--- a/debian/patches/mono_2.0_compat.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- smuxi-0.7.orig/src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs
-+++ smuxi-0.7/src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs
-@@ -553,7 +553,7 @@
- 
-                     // only poll once per interval or when we get fired
-                     f_FriendsTimelineEvent.WaitOne(
--                        f_UpdateFriendsTimelineInterval * 1000
-+                        f_UpdateFriendsTimelineInterval * 1000, false
-                     );
-                 }
-             } catch (ThreadAbortException) {
-@@ -728,7 +728,7 @@
- 
-                     // only poll once per interval or when we get fired
-                     f_DirectMessageEvent.WaitOne(
--                        f_UpdateDirectMessagesInterval * 1000
-+                        f_UpdateDirectMessagesInterval * 1000, false
-                     );
-                 }
-             } catch (ThreadAbortException) {
diff --git a/debian/patches/series b/debian/patches/series
index 0f8cf8c..9b2cd9b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-mono_2.0_compat.patch
 debian_default_settings.patch

-- 
smuxi



More information about the Pkg-cli-apps-commits mailing list