r41043 - in /desktop/unstable/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:40:56 2014
New Revision: 41043

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=41043
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/unstable/gnome-shell/debian/patches/42-Specifically-ask-for-Telepathy-0.x.patch
Modified:
    desktop/unstable/gnome-shell/debian/changelog
    desktop/unstable/gnome-shell/debian/patches/series

Modified: desktop/unstable/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/changelog?rev=41043&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/changelog	[utf-8] Tue Mar 25 17:40:56 2014
@@ -1,3 +1,11 @@
+gnome-shell (3.8.4-6) UNRELEASED; urgency=medium
+
+  * 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.
+
+ -- Simon McVittie <smcv at debian.org>  Tue, 25 Mar 2014 13:25:27 +0000
+
 gnome-shell (3.8.4-5) unstable; urgency=low
 
   * debian/patches/41-handle-logind-fail.patch:

Added: desktop/unstable/gnome-shell/debian/patches/42-Specifically-ask-for-Telepathy-0.x.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/42-Specifically-ask-for-Telepathy-0.x.patch?rev=41043&op=file
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/42-Specifically-ask-for-Telepathy-0.x.patch	(added)
+++ desktop/unstable/gnome-shell/debian/patches/42-Specifically-ask-for-Telepathy-0.x.patch	[utf-8] Tue Mar 25 17:40:56 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/unstable/gnome-shell/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/series?rev=41043&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/patches/series	[utf-8] Tue Mar 25 17:40:56 2014
@@ -4,5 +4,6 @@
 #30-remoteMenu-Prevent-the-shell-from-becoming-unrespons.patch
 40_change-pam-name-to-match-gdm.patch
 41-handle-logind-fail.patch
+42-Specifically-ask-for-Telepathy-0.x.patch
 revert-suspend-break.patch
 git_relock_screen_after_crash.patch