r41044 - in /desktop/experimental/gnome-shell/debian: changelog patches/42-Specifically-ask-for-Telepathy-0.x.patch patches/series

[smcv at users.alioth.debian.org]

Author: smcv
Date: Tue Mar 25 17:44:17 2014
New Revision: 41044

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=41044
Log:
* debian/patches/42-Specifically-ask-for-Telepathy-0.x.patch:
  + Don't attempt to use the parallel-installable Telepathy 1.0 when
    that gets uploaded, if it happens to be installed.

Added:
    desktop/experimental/gnome-shell/debian/patches/42-Specifically-ask-for-Telepathy-0.x.patch
Modified:
    desktop/experimental/gnome-shell/debian/changelog
    desktop/experimental/gnome-shell/debian/patches/series

Modified: desktop/experimental/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/changelog?rev=41044&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/changelog	[utf-8] Tue Mar 25 17:44:17 2014
@@ -25,6 +25,11 @@
     - needs Clutter.GestureTriggerEdge
   * Bump gir1.2-glib-1.0 dependency to 1.39.90-4~
     - needs Gio.DesktopAppInfo.search
+
+  [ Simon McVittie ]
+  * debian/patches/42-Specifically-ask-for-Telepathy-0.x.patch:
+    + Don't attempt to use the parallel-installable Telepathy 1.0 when
+      that gets uploaded, if it happens to be installed.
 
  -- Andreas Henriksson <andreas at fatal.se>  Thu, 06 Mar 2014 00:07:01 +0100
 

Added: desktop/experimental/gnome-shell/debian/patches/42-Specifically-ask-for-Telepathy-0.x.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/patches/42-Specifically-ask-for-Telepathy-0.x.patch?rev=41044&op=file
==============================================================================
--- desktop/experimental/gnome-shell/debian/patches/42-Specifically-ask-for-Telepathy-0.x.patch	(added)
+++ desktop/experimental/gnome-shell/debian/patches/42-Specifically-ask-for-Telepathy-0.x.patch	[utf-8] Tue Mar 25 17:44:17 2014
@@ -0,0 +1,30 @@
+From: Simon McVittie <simon.mcvittie at collabora.co.uk>
+Date: Tue, 25 Mar 2014 17:02:02 +0000
+Subject: [PATCH] Specifically ask for Telepathy 0.x
+
+Telepathy 1.0 will not be compatible, and will probably require
+source changes. telepathy-glib 0.12 and telepathy-logger 0.2 are
+the 0.x ABIs (they were the first stable-branches to have g-i).
+
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=721704
+Reviewed-by: Giovanni Campagna
+Applied-upstream: 3.8.5, commit:226032d
+Applied-upstream: 3.10.5, commit:c95432f
+Applied-upstream: 3.12.1, commit:e09e1bc
+---
+ js/ui/environment.js | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/js/ui/environment.js b/js/ui/environment.js
+index aa7a4bd..4d78c2b 100644
+--- a/js/ui/environment.js
++++ b/js/ui/environment.js
+@@ -5,6 +5,8 @@ imports.gi.versions.Gio = '2.0';
+ imports.gi.versions.Gdk = '3.0';
+ imports.gi.versions.GdkPixbuf = '2.0';
+ imports.gi.versions.Gtk = '3.0';
++imports.gi.versions.TelepathyGLib = '0.12';
++imports.gi.versions.TelepathyLogger = '0.2';
+ 
+ const Clutter = imports.gi.Clutter;;
+ const Gettext = imports.gettext;

Modified: desktop/experimental/gnome-shell/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/patches/series?rev=41044&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/patches/series	[utf-8] Tue Mar 25 17:44:17 2014
@@ -1,3 +1,4 @@
 #10-make-NetworkManager-optional.patch
 27-nm-libexec-path.patch
 #30-remoteMenu-Prevent-the-shell-from-becoming-unrespons.patch
+42-Specifically-ask-for-Telepathy-0.x.patch