[Pkg-telepathy-commits] [SCM] Empathy packaging branch, debian-experimental, updated. debian/3.3.90.2-1-12-gaf9d331

Laurent Bigonville bigon at bigon.be
Sun Apr 1 19:32:29 UTC 2012


The following commit has been merged in the debian-experimental branch:
commit af9d331f45634e6e58b867a8be774ea5af8c4b52
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Sun Apr 1 20:47:37 2012 +0200

    Revert "Bump telepathy-haze to Recommends (Closes: #610769)"
    
    This reverts commit e3cd8819ecb66673580f3a5fefdf80be2642b2b2.
    
    Conflicts:
    
    	debian/changelog

diff --git a/debian/changelog b/debian/changelog
index c10de69..511f799 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,6 @@ empathy (3.4.0-1) UNRELEASED; urgency=low
     - Drop dconf-gsettings-backend | gsettings-backend dependency:
       Let dh_installgsettings generate the dependency
     - Bump Standards-Version to 3.9.3 (no further changes)
-    - Bump telepathy-haze to Recommends (Closes: #610769)
     - Drop mention to QQ, no connection manager is supporting anymore
       (Closes: #646335)
   * debian/rules:
diff --git a/debian/control b/debian/control
index 777eacc..b847769 100644
--- a/debian/control
+++ b/debian/control
@@ -75,11 +75,11 @@ Depends: ${shlibs:Depends},
          dbus-x11
 Recommends: telepathy-gabble,
             telepathy-salut,
-            telepathy-haze,
             gvfs-backends,
             nautilus-sendto-empathy,
             freedesktop-sound-theme
 Suggests: vino,
+          telepathy-haze,
           telepathy-idle
 Replaces: libempathy-gtk-common
 Description: GNOME multi-protocol chat and call client

-- 
Empathy packaging



More information about the Pkg-telepathy-commits mailing list