[Pkg-telepathy-commits] [SCM] Empathy packaging branch, ubuntu, updated. ubuntu/2.27.3-1ubuntu1-12-g594323f

Laurent Bigonville bigon at bigon.be
Thu Jun 25 08:26:19 UTC 2009


The following commit has been merged in the ubuntu branch:
commit cb6ae5d8f8d2b801c9cd096f43510d66dab1417a
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Wed Jun 24 20:48:28 2009 +0200

    Drop geoloc support, dependencies not in main (yet)

diff --git a/debian/changelog b/debian/changelog
index 149f92d..2fe0a11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 empathy (2.27.3-2ubuntu1) UNRELEASED; urgency=low
 
   * Drop libindicate support for now
+  * Drop geoloc support, dependencies not in main (yet)
 
- -- Laurent Bigonville <bigon at ubuntu.com>  Wed, 24 Jun 2009 20:38:23 +0200
+ -- Laurent Bigonville <bigon at ubuntu.com>  Wed, 24 Jun 2009 20:42:14 +0200
 
 empathy (2.27.3-2) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index fc40c41..d513322 100644
--- a/debian/control
+++ b/debian/control
@@ -32,11 +32,7 @@ Build-Depends: cdbs,
                libtelepathy-farsight-dev (>= 0.0.4),
                libgstreamer0.10-dev,
                libgstreamer-plugins-base0.10-dev,
-               libwebkit-dev (>= 1.1.7),
-               libgeoclue-dev (>= 0.11),
-               libchamplain-0.3-dev (>= 0.3.3),
-               libchamplain-gtk-0.3-dev (>= 0.3.3),
-               libclutter-gtk-0.8-dev (>= 0.8.2)
+               libwebkit-dev (>= 1.1.7)
 Standards-Version: 3.8.2
 Vcs-Git: git://git.debian.org/git/pkg-telepathy/empathy.git
 Vcs-Browser: http://git.debian.org/?p=pkg-telepathy/empathy.git
diff --git a/debian/libempathy-gtk24.symbols b/debian/libempathy-gtk24.symbols
index 6028248..e7e609c 100644
--- a/debian/libempathy-gtk24.symbols
+++ b/debian/libempathy-gtk24.symbols
@@ -151,8 +151,6 @@ libempathy-gtk.so.24 libempathy-gtk24 #MINVER#
  empathy_icon_name_from_account at Base 0.21.91
  empathy_irc_network_dialog_show at Base 0.21.91
  empathy_link_button_new at Base 0.21.91
- empathy_location_manager_dup_singleton at Base 2.27.3-2~
- empathy_location_manager_get_type at Base 2.27.3-2~
  empathy_log_window_show at Base 0.21.91
  empathy_new_contact_dialog_show at Base 0.21.91
  empathy_new_message_dialog_show at Base 0.21.91
diff --git a/debian/rules b/debian/rules
index 047c4f9..6fe2965 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,9 +18,7 @@ DEB_CONFIGURE_EXTRA_FLAGS := --enable-spell \
                              --enable-python \
                              --enable-megaphone \
                              --disable-tests \
-                             --enable-webkit \
-                             --enable-location \
-                             --enable-map
+                             --enable-webkit
 
 binary-install/python-empathy::
 	dh_pysupport -p$(cdbs_curpkg)

-- 
Empathy packaging



More information about the Pkg-telepathy-commits mailing list