[Pkg-telepathy-commits] [SCM] Empathy packaging branch, debian-wheezy, updated. debian/2.30.3-2-5-g15e794c

[Laurent Bigonville]

The following commit has been merged in the debian-wheezy branch:
commit 3cdc30e8c94e7ee017b66b12039af46cfd3e558e
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Mon Jul 25 22:34:47 2011 +0200

    debian/patches/0002-port-libnotify-0.7.patch: Port to libnotify 0.7 API (Closes: #630267)

diff --git a/debian/changelog b/debian/changelog
index eac721e..317f051 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ empathy (2.30.3-3) UNRELEASED; urgency=low
     - Do not Recommends geoclue providers anymore, geoclue package already
       does it
     - Use architecture wildcards instead of negated architectures
+  * debian/patches/0002-port-libnotify-0.7.patch: Port to libnotify 0.7 API
+    (Closes: #630267)
 
- -- Laurent Bigonville <bigon at debian.org>  Mon, 25 Jul 2011 22:30:50 +0200
+ -- Laurent Bigonville <bigon at debian.org>  Mon, 25 Jul 2011 22:33:32 +0200
 
 empathy (2.30.3-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 3d86a8c..176f7e4 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Build-Depends: cdbs,
                xsltproc,
                gnome-doc-utils (>= 0.17.3),
                libcanberra-gtk-dev (>= 0.4),
-               libnotify-dev (>= 0.4.4),
+               libnotify-dev (>= 0.7.0),
                libx11-dev,
                libgstfarsight0.10-dev,
                libdbus-glib-1-dev,
diff --git a/debian/patches/0002-port-libnotify-0.7.patch b/debian/patches/0002-port-libnotify-0.7.patch
new file mode 100644
index 0000000..d25d434
--- /dev/null
+++ b/debian/patches/0002-port-libnotify-0.7.patch
@@ -0,0 +1,39 @@
+From: Laurent Bigonville <bigon at debian.org>
+Date: Mon, 25 Jul 2011 22:11:42 +0200
+Subject: [PATCH] Transition to libnotify 0.7
+
+--- a/src/empathy-chat-window.c
++++ b/src/empathy-chat-window.c
+@@ -1230,7 +1230,7 @@
+ 		notify_notification_update (priv->notification,
+ 					    header, escaped, NULL);
+ 	} else {
+-		priv->notification = notify_notification_new (header, escaped, NULL, NULL);
++		priv->notification = notify_notification_new (header, escaped, NULL);
+ 		notify_notification_set_timeout (priv->notification, NOTIFY_EXPIRES_DEFAULT);
+ 
+ 		empathy_signal_connect_weak (priv->notification, "closed",
+--- a/src/empathy-status-icon.c
++++ b/src/empathy-status-icon.c
+@@ -140,8 +140,8 @@
+ 						    priv->event->header, message_esc,
+ 						    NULL);
+ 		} else {
+-			priv->notification = notify_notification_new_with_status_icon
+-				(priv->event->header, message_esc, NULL, priv->icon);
++			priv->notification = notify_notification_new
++				(priv->event->header, message_esc, NULL);
+ 			notify_notification_set_timeout (priv->notification,
+ 							 NOTIFY_EXPIRES_DEFAULT);
+ 
+--- a/configure.ac
++++ b/configure.ac
+@@ -36,7 +36,7 @@
+ TELEPATHY_LOGGER=0.1.1
+ ENCHANT_REQUIRED=1.2.0
+ ISO_CODES_REQUIRED=0.35
+-LIBNOTIFY_REQUIRED=0.4.4
++LIBNOTIFY_REQUIRED=0.7.0
+ LIBCANBERRA_GTK_REQUIRED=0.4
+ LIBCHAMPLAIN_REQUIRED=0.7.1
+ LIBCHAMPLAIN_GTK_REQUIRED=0.7.1
diff --git a/debian/patches/series b/debian/patches/series
index 3307f92..b024ef5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Transition-to-libchamplain-0.8.patch
+0002-port-libnotify-0.7.patch

-- 
Empathy packaging