r49722 - in /desktop/unstable/gnome-calendar/debian: changelog control control.in patches/0002-Spawn-Ubuntu-s-credentials-panel-instead-of-the-GOA-.patch

jbicha-guest at users.alioth.debian.org jbicha-guest at users.alioth.debian.org
Sat Aug 27 23:04:11 UTC 2016 

Author: jbicha-guest
Date: Sat Aug 27 23:04:11 2016
New Revision: 49722

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=49722
Log:
Depend on gnome-common (needed for autoreconf currently)

* 0002-Spawn-Ubuntu-s-credentials-panel-instead-of-the-GOA-.patch:
  - Use latest version from Ubuntu packaging

Modified:
    desktop/unstable/gnome-calendar/debian/changelog
    desktop/unstable/gnome-calendar/debian/control
    desktop/unstable/gnome-calendar/debian/control.in
    desktop/unstable/gnome-calendar/debian/patches/0002-Spawn-Ubuntu-s-credentials-panel-instead-of-the-GOA-.patch

Modified: desktop/unstable/gnome-calendar/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-calendar/debian/changelog?rev=49722&op=diff
==============================================================================
--- desktop/unstable/gnome-calendar/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-calendar/debian/changelog	[utf-8] Sat Aug 27 23:04:11 2016
@@ -1,8 +1,12 @@
 gnome-calendar (3.20.2-2) UNRELEASED; urgency=medium
 
   * Team upload
-  * Update Vcs fields
+  * debian/control.in:
+    - Update Vcs fields
+    - Depend on gnome-common (needed for autoreconf currently)
   * Add debian/docs: Install NEWS
+  * 0002-Spawn-Ubuntu-s-credentials-panel-instead-of-the-GOA-.patch:
+    - Use latest version from Ubuntu packaging
 
  -- Jeremy Bicha <jbicha at ubuntu.com>  Tue, 24 May 2016 22:18:50 -0400
 

Modified: desktop/unstable/gnome-calendar/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-calendar/debian/control?rev=49722&op=diff
==============================================================================
--- desktop/unstable/gnome-calendar/debian/control	[utf-8] (original)
+++ desktop/unstable/gnome-calendar/debian/control	[utf-8] Sat Aug 27 23:04:11 2016
@@ -9,6 +9,7 @@
 Uploaders: Andreas Henriksson <andreas at fatal.se>, Iain Lane <laney at debian.org>, Michael Biebl <biebl at debian.org>
 Build-Depends: debhelper (>= 9),
                dh-autoreconf,
+               gnome-common,
                gnome-pkg-tools,
                intltool (>= 0.40.6),
                libecal1.2-dev (>= 3.17.1),

Modified: desktop/unstable/gnome-calendar/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-calendar/debian/control.in?rev=49722&op=diff
==============================================================================
--- desktop/unstable/gnome-calendar/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gnome-calendar/debian/control.in	[utf-8] Sat Aug 27 23:04:11 2016
@@ -5,6 +5,7 @@
 Uploaders: @GNOME_TEAM@
 Build-Depends: debhelper (>= 9),
                dh-autoreconf,
+               gnome-common,
                gnome-pkg-tools,
                intltool (>= 0.40.6),
                libecal1.2-dev (>= 3.17.1),

Modified: desktop/unstable/gnome-calendar/debian/patches/0002-Spawn-Ubuntu-s-credentials-panel-instead-of-the-GOA-.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-calendar/debian/patches/0002-Spawn-Ubuntu-s-credentials-panel-instead-of-the-GOA-.patch?rev=49722&op=diff
==============================================================================
--- desktop/unstable/gnome-calendar/debian/patches/0002-Spawn-Ubuntu-s-credentials-panel-instead-of-the-GOA-.patch	[utf-8] (original)
+++ desktop/unstable/gnome-calendar/debian/patches/0002-Spawn-Ubuntu-s-credentials-panel-instead-of-the-GOA-.patch	[utf-8] Sat Aug 27 23:04:11 2016
@@ -15,11 +15,11 @@
  src/gcal-source-dialog.c | 51 ++++++++++++++++++++++++++++++++++++------------
  1 file changed, 39 insertions(+), 12 deletions(-)
 
-Index: b/src/gcal-source-dialog.c
+Index: gnome-calendar-3.19.91/src/gcal-source-dialog.c
 ===================================================================
---- a/src/gcal-source-dialog.c
-+++ b/src/gcal-source-dialog.c
-@@ -39,6 +39,9 @@
+--- gnome-calendar-3.19.91.orig/src/gcal-source-dialog.c
++++ gnome-calendar-3.19.91/src/gcal-source-dialog.c
+@@ -39,6 +39,9 @@ struct _GcalSourceDialog
    GtkWidget          *name_entry;
    GtkWidget          *notebook;
    GtkWidget          *online_account_main_grid;
@@ -29,7 +29,7 @@
    GtkWidget          *remove_button;
    GtkWidget          *stack;
    GtkWidget          *web_source_grid;
-@@ -498,6 +501,29 @@
+@@ -498,6 +501,37 @@ default_check_toggled (GObject    *objec
      gcal_manager_set_default_source (self->manager, self->old_default_source);
  }
  
@@ -38,17 +38,25 @@
 +                     gchar *arg)
 +{
 +  const gchar *desktop;
++  GError *error = NULL;
 +
 +  gchar *command[] = {"gnome-control-center", "online-accounts", action, arg, NULL};
 +
-+  /* On Ubuntu (Ubuntu Online Accounts), the panel is called 'credentials' */
++  /* On Ubuntu (Ubuntu Online Accounts), unity-control-center is used and the 
++     panel is called 'credentials' */
 +  desktop = g_getenv ("XDG_CURRENT_DESKTOP");
 +  if (desktop && strstr (desktop, "Unity"))
 +  {
++    command[0] = "unity-control-center";
 +    command[1] = "credentials";
 +  }
 +
-+  g_spawn_async (NULL, command, NULL, G_SPAWN_SEARCH_PATH | G_SPAWN_STDOUT_TO_DEV_NULL, NULL, NULL, NULL, NULL);
++  if (!g_spawn_async (NULL, command, NULL, G_SPAWN_SEARCH_PATH | G_SPAWN_STDOUT_TO_DEV_NULL, 
++                      NULL, NULL, NULL, &error))
++  {
++    g_warning ("Couldn't open settings: %s", error->message);
++    g_error_free (error);
++  }
 +}
 +
 +static void
@@ -59,7 +67,7 @@
  
  /**
   * description_label_link_activated:
-@@ -512,8 +538,7 @@
+@@ -512,8 +546,7 @@ description_label_link_activated (GtkWid
                                    gchar     *uri,
                                    gpointer   user_data)
  {
@@ -69,7 +77,7 @@
  
    return TRUE;
  }
-@@ -653,14 +678,6 @@
+@@ -653,14 +686,6 @@ name_entry_text_changed (GObject    *obj
      e_source_set_display_name (self->source, gtk_entry_get_text (GTK_ENTRY (self->name_entry)));
  }
  
@@ -84,7 +92,7 @@
  /**
   * online_accounts_listbox_row_activated:
   *
-@@ -1095,8 +1112,7 @@
+@@ -1095,8 +1120,7 @@ static void
  online_accounts_settings_button_clicked (GtkWidget *button,
                                           gpointer   user_data)
  {
@@ -94,7 +102,7 @@
  }
  
  static void
-@@ -1798,6 +1814,14 @@
+@@ -1796,6 +1820,14 @@ gcal_source_dialog_constructed (GObject
    desktop = g_getenv ("XDG_CURRENT_DESKTOP");
    if (desktop && strstr (desktop, "Unity"))
      {
@@ -109,7 +117,7 @@
        gtk_widget_hide (self->online_account_main_grid);
      }
  
-@@ -1882,6 +1906,9 @@
+@@ -1880,6 +1912,9 @@ gcal_source_dialog_class_init (GcalSourc
    gtk_widget_class_bind_template_child (widget_class, GcalSourceDialog, notification_label);
    gtk_widget_class_bind_template_child (widget_class, GcalSourceDialog, online_accounts_listbox);
    gtk_widget_class_bind_template_child (widget_class, GcalSourceDialog, online_account_main_grid);

More information about the pkg-gnome-commits mailing list