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

[Mirco Bauer]

The following commit has been merged in the lenny-backports branch:
commit 6dba469ed9d67e27ef93d22308d7138f4f98355a
Author: Mirco Bauer <meebey at debian.org>
Date:   Mon Jan 11 23:30:52 2010 +0000

      * debian/control:
        + Lowered versioned mono build-deps to >= 2.0 and removed compiler
          override.
        + Replaced libgconf2.0-cil-dev build-dep with libgconf2.24-cil.
        + 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

diff --git a/debian/changelog b/debian/changelog
index fa7f4ca..43036ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+smuxi (0.7.1-1~jaunty+1) jaunty; urgency=low
+
+  * Rebuild for jaunty-ppa.
+  * debian/control:
+    + Lowered versioned mono build-deps to >= 2.0 and removed compiler
+      override.
+    + Replaced libgconf2.0-cil-dev build-dep with libgconf2.24-cil.
+    + 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
+
+ -- Mirco Bauer <meebey at debian.org>  Mon, 11 Jan 2010 23:22:08 +0100
+
 smuxi (0.7.1-1) unstable; urgency=medium
 
   * New upstream (bugfix) release.
diff --git a/debian/control b/debian/control
index 7b12fb4..7b46ca9 100644
--- a/debian/control
+++ b/debian/control
@@ -4,17 +4,19 @@ Priority: optional
 Maintainer: Mirco Bauer <meebey at debian.org>
 Build-Depends: debhelper (>= 7.0.50), quilt (>= 0.46-7~)
 Build-Depends-Indep: cli-common-dev (>= 0.5.7),
- mono-devel (>= 2.4.3),
- mono-xbuild (>= 2.4.3),
- libsmartirc4net-cil-dev (>= 0.4.5.1),
- libnini-cil-dev (>= 1.1),
- liblog4net-cil-dev,
- libgtk2.0-cil-dev (>= 2.8),
- libgnome2.0-cil-dev (>= 2.24),
- libglade2.0-cil-dev (>= 2.8),
- libglib2.0-cil-dev (>= 2.8),
- libgnome-vfs2.0-cil-dev (>= 2.8),
- libart2.0-cil-dev (>= 2.8),
+ mono-devel (>= 2.0),
+ mono-xbuild (>= 2.0),
+ libmono-dev (>= 2.0),
+ libmono2.0-cil,
+ libmono-cairo2.0-cil,
+ libmono-system-runtime2.0-cil,
+ libsmartirc4net0.4-cil (>= 0.4.5.1),
+ libnini1.1-cil (>= 1.1),
+ liblog4net1.2-cil,
+ libgtk2.0-cil (>= 2.8),
+ libgnome2.24-cil (>= 2.24),
+ libglade2.0-cil (>= 2.8),
+ libglib2.0-cil (>= 2.8),
  lsb-release,
  pkg-config,
  gettext,
diff --git a/debian/patches/mono_2.0_compat.patch b/debian/patches/mono_2.0_compat.patch
new file mode 100644
index 0000000..2712f11
--- /dev/null
+++ b/debian/patches/mono_2.0_compat.patch
@@ -0,0 +1,20 @@
+--- 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 9b2cd9b..0f8cf8c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+mono_2.0_compat.patch
 debian_default_settings.patch
diff --git a/debian/rules b/debian/rules
index be9174a..266eead 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,7 @@ $(PATCH_LIST_FILE):
 	fi
 
 override_dh_auto_configure: $(PATCH_LIST_FILE) patch
-	dh_auto_configure -- --enable-engine-irc --enable-frontend-gnome GMCS=/usr/bin/mono-csc MCS=/usr/bin/mono-csc
+	dh_auto_configure -- --enable-engine-irc --enable-frontend-gnome
 
 
 .DEFAULT:

-- 
smuxi