r23652 - in /packages/unstable/nautilus-sendto: ./ debian/changelog debian/control debian/control.in

[bigon at users.alioth.debian.org]

Author: bigon
Date: Fri Apr  9 13:55:35 2010
New Revision: 23652

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23652
Log:
Merge with experimental

Modified:
    packages/unstable/nautilus-sendto/   (props changed)
    packages/unstable/nautilus-sendto/debian/changelog
    packages/unstable/nautilus-sendto/debian/control
    packages/unstable/nautilus-sendto/debian/control.in

Propchange: packages/unstable/nautilus-sendto/
------------------------------------------------------------------------------
    svn:mergeinfo = /packages/experimental/nautilus-sendto:22666-23651

Modified: packages/unstable/nautilus-sendto/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nautilus-sendto/debian/changelog?rev=23652&op=diff
==============================================================================
--- packages/unstable/nautilus-sendto/debian/changelog [utf-8] (original)
+++ packages/unstable/nautilus-sendto/debian/changelog [utf-8] Fri Apr  9 13:55:35 2010
@@ -1,3 +1,13 @@
+nautilus-sendto (2.28.2-2) experimental; urgency=low
+
+  * Do not build empathy's plugin anymore,
+    as empathy package in experimental (>= 2.29.4) now builds it.
+  * debian/control.in:
+    - Remove libempathy-gtk-dev and libempathy-dev build-dependencies
+    - Remove suggests against empathy
+
+ -- Laurent Bigonville <bigon at debian.org>  Tue, 22 Dec 2009 22:12:02 +0100
+
 nautilus-sendto (2.28.2-1) unstable; urgency=low
 
   * New upstream release. (We still build empathy's plugin

Modified: packages/unstable/nautilus-sendto/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nautilus-sendto/debian/control?rev=23652&op=diff
==============================================================================
--- packages/unstable/nautilus-sendto/debian/control [utf-8] (original)
+++ packages/unstable/nautilus-sendto/debian/control [utf-8] Fri Apr  9 13:55:35 2010
@@ -1,3 +1,8 @@
+# This file is autogenerated. DO NOT EDIT!
+# 
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+
 Source: nautilus-sendto
 Section: gnome
 Priority: optional
@@ -14,12 +19,10 @@
                libebook1.2-dev (>= 1.5.3),
                libdbus-1-dev (>= 1.0),
                libdbus-glib-1-dev (>= 0.60),
-               libempathy-dev (>= 2.27.91),
-               libempathy-gtk-dev (>= 2.27.91),
                libgupnp-1.0-dev (>= 0.13),
                libxml-parser-perl,
                gconf2
-Uploaders: Andrea Veri <andrea.veri89 at gmail.com>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Laurent Bigonville <bigon at debian.org>
 VCS-Browser: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nautilus-sendto/
 VCS-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/nautilus-sendto/
 Standards-Version: 3.8.3
@@ -29,7 +32,7 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Suggests: evolution (>= 2.28) | icedove | claws-mail,
-          empathy | pidgin (>= 2.0.0) | gajim,
+          pidgin (>= 2.0.0) | gajim,
           python-dbus,
           gnome-bluetooth
 Description: integrates Evolution and Pidgin into the Nautilus file manager

Modified: packages/unstable/nautilus-sendto/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/nautilus-sendto/debian/control.in?rev=23652&op=diff
==============================================================================
--- packages/unstable/nautilus-sendto/debian/control.in [utf-8] (original)
+++ packages/unstable/nautilus-sendto/debian/control.in [utf-8] Fri Apr  9 13:55:35 2010
@@ -14,8 +14,6 @@
                libebook1.2-dev (>= 1.5.3),
                libdbus-1-dev (>= 1.0),
                libdbus-glib-1-dev (>= 0.60),
-               libempathy-dev (>= 2.27.91),
-               libempathy-gtk-dev (>= 2.27.91),
                libgupnp-1.0-dev (>= 0.13),
                libxml-parser-perl,
                gconf2
@@ -29,7 +27,7 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Suggests: evolution (>= 2.28) | icedove | claws-mail,
-          empathy | pidgin (>= 2.0.0) | gajim,
+          pidgin (>= 2.0.0) | gajim,
           python-dbus,
           gnome-bluetooth
 Description: integrates Evolution and Pidgin into the Nautilus file manager