[Pkg-telepathy-commits] [SCM] Empathy packaging branch, debian, updated. debian/2.91.5.1-1-6-g1699e8c

[Emilio Pozuelo Monfort]

The following commit has been merged in the debian branch:
commit 2f8eca0f4e61018e1b0830728d5ccb004f1abbc2
Author: Emilio Pozuelo Monfort <emilio.pozuelo at collabora.co.uk>
Date:   Sat Jan 22 00:31:07 2011 +0000

    Re-enable nautilus-sendto plugin

diff --git a/debian/changelog b/debian/changelog
index 475de0c..6412e65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+empathy (2.91.5.1-2) UNRELEASED; urgency=low
+
+  * debian/control:
+    - Re-enable nautilus-sendto plugin.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Sat, 22 Jan 2011 00:30:39 +0000
+
 empathy (2.91.5.1-1) experimental; urgency=low
 
   [ Laurent Bigonville ]
diff --git a/debian/control b/debian/control
index 73d15fe..7062b9e 100644
--- a/debian/control
+++ b/debian/control
@@ -40,7 +40,8 @@ Build-Depends: cdbs,
                libfolks-telepathy-dev (>= 0.3.3),
                libgnutls-dev (>= 2.8.5),
                libwebkitgtk-3.0-dev (>= 1.3.2),
-               gsettings-desktop-schemas-dev
+               gsettings-desktop-schemas-dev,
+               nautilus-sendto (>= 2.90)
 Standards-Version: 3.9.1
 Vcs-Git: git://git.debian.org/git/pkg-telepathy/empathy.git
 Vcs-Browser: http://git.debian.org/?p=pkg-telepathy/empathy.git
@@ -110,16 +111,18 @@ Description: GNOME multi-protocol chat and call client (common files)
  This package contains the architecture independent files for Empathy
  IM application.
 
-#Package: nautilus-sendto-empathy
-#Architecture: any
-#Depends: ${shlibs:Depends}, ${misc:Depends}, empathy-common (= ${source:Version})
-#Recommends: nautilus-sendto (>= 2.28.2-2)
-#Replaces: nautilus-sendto (<< 2.28.2-2)
-#Breaks: nautilus-sendto (<< 2.28.2-2)
-#Description: GNOME multi-protocol chat and call client (nautilus-sendto plugin)
-# Instant messaging program supporting text, voice, video, file transfers
-# and inter-application communication over many different protocols,
-# including: AIM, MSN, Google Talk (Jabber/XMPP), Facebook, Yahoo!, Salut,
-# Gadu-Gadu, Groupwise, ICQ and QQ.
-# .
-## This package contains nautilus-sendto plugin for the Empathy IM application.
+Package: nautilus-sendto-empathy
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         empathy-common (= ${source:Version})
+Recommends: nautilus-sendto (>= 2.28.2-2)
+Replaces: nautilus-sendto (<< 2.28.2-2)
+Breaks: nautilus-sendto (<< 2.28.2-2)
+Description: GNOME multi-protocol chat and call client (nautilus-sendto plugin)
+ Instant messaging program supporting text, voice, video, file transfers
+ and inter-application communication over many different protocols,
+ including: AIM, MSN, Google Talk (Jabber/XMPP), Facebook, Yahoo!, Salut,
+ Gadu-Gadu, Groupwise, ICQ and QQ.
+ .
+ This package contains nautilus-sendto plugin for the Empathy IM application.

-- 
Empathy packaging