r53892 - in /desktop/unstable/gnome-color-manager/debian: changelog patches/01_unity_control_center.patch patches/series

[jbicha at users.alioth.debian.org]

Author: jbicha
Date: Thu Sep 14 01:04:16 2017
New Revision: 53892

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=53892
Log:
Point link to unity-control-center when running Unity

Added:
    desktop/unstable/gnome-color-manager/debian/patches/01_unity_control_center.patch
Modified:
    desktop/unstable/gnome-color-manager/debian/changelog
    desktop/unstable/gnome-color-manager/debian/patches/series

Modified: desktop/unstable/gnome-color-manager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-color-manager/debian/changelog?rev=53892&op=diff
==============================================================================
--- desktop/unstable/gnome-color-manager/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-color-manager/debian/changelog	[utf-8] Thu Sep 14 01:04:16 2017
@@ -1,6 +1,8 @@
 gnome-color-manager (3.26.0-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * Add 01_unity_control_center.patch:
+    - Point link to unity-control-center when running Unity
 
  -- Jeremy Bicha <jbicha at debian.org>  Wed, 13 Sep 2017 21:02:21 -0400
 

Added: desktop/unstable/gnome-color-manager/debian/patches/01_unity_control_center.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-color-manager/debian/patches/01_unity_control_center.patch?rev=53892&op=file
==============================================================================
--- desktop/unstable/gnome-color-manager/debian/patches/01_unity_control_center.patch	(added)
+++ desktop/unstable/gnome-color-manager/debian/patches/01_unity_control_center.patch	[utf-8] Thu Sep 14 01:04:16 2017
@@ -0,0 +1,25 @@
+Description: Use unity-control-center on Unity
+Author: Robert Ancell <robert.ancell at canonical.com>
+---
+ src/gcm-calibrate-main.c |   17 ++++++++++++++---
+ 1 file changed, 14 insertions(+), 3 deletions(-)
+
+Index: gnome-color-manager-3.20.0/src/gcm-calibrate-main.c
+===================================================================
+--- gnome-color-manager-3.20.0.orig/src/gcm-calibrate-main.c
++++ gnome-color-manager-3.20.0/src/gcm-calibrate-main.c
+@@ -631,9 +631,13 @@ gcm_calib_label_activate_link_cb (GtkLab
+ {
+ 	gboolean ret;
+ 	g_autoptr(GError) error = NULL;
+-	const gchar *argv[] = { BINDIR "/gnome-control-center color",
++	gchar *path = g_find_program_in_path ("unity-control-center");
++	gchar *argv[] = { BINDIR "/gnome-control-center color",
+ 				"color",
+ 				NULL };
++	if (path && g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity") == 0){
++		argv[0] = BINDIR "/unity-control-center";
++	}
+ 	ret = g_spawn_async (NULL,
+ 			     (gchar **) argv,
+ 			     NULL,

Modified: desktop/unstable/gnome-color-manager/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-color-manager/debian/patches/series?rev=53892&op=diff
==============================================================================
--- desktop/unstable/gnome-color-manager/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-color-manager/debian/patches/series	[utf-8] Thu Sep 14 01:04:16 2017
@@ -0,0 +1 @@
+01_unity_control_center.patch