r49861 - in /desktop/unstable/gnome-calendar/debian: changelog control control.in patches/0001-Hide-GOA-sources-on-Unity.patch patches/0002-Spawn-Ubuntu-s-credentials-panel-instead-of-the-GOA-.patch watch
laney at users.alioth.debian.org
laney at users.alioth.debian.org
Wed Aug 31 14:36:46 UTC 2016
Author: laney
Date: Wed Aug 31 14:36:46 2016
New Revision: 49861
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=49861
Log:
Update to 3.21.91, refresh patches
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/0001-Hide-GOA-sources-on-Unity.patch
desktop/unstable/gnome-calendar/debian/patches/0002-Spawn-Ubuntu-s-credentials-panel-instead-of-the-GOA-.patch
desktop/unstable/gnome-calendar/debian/watch
Modified: desktop/unstable/gnome-calendar/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-calendar/debian/changelog?rev=49861&op=diff
==============================================================================
--- desktop/unstable/gnome-calendar/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-calendar/debian/changelog [utf-8] Wed Aug 31 14:36:46 2016
@@ -1,5 +1,6 @@
-gnome-calendar (3.20.2-2) UNRELEASED; urgency=medium
+gnome-calendar (3.21.91-1) UNRELEASED; urgency=medium
+ [ Jeremy Bicha ]
* Team upload
* debian/control.in:
- Update Vcs fields
@@ -7,6 +8,14 @@
* Add debian/docs: Install NEWS
* 0002-Spawn-Ubuntu-s-credentials-panel-instead-of-the-GOA-.patch:
- Use latest version from Ubuntu packaging
+
+ [ Iain Lane ]
+ * New upstream release 3.21.91
+ * debian/control{,.in}:
+ + Bump BDs for 3.21.91
+ + Add BD on appstream-util, for APPSTREAM_XML m4 function
+ * debian/patches/000*: Refresh
+ * debian/watch: Track unstable versions
-- 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=49861&op=diff
==============================================================================
--- desktop/unstable/gnome-calendar/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-calendar/debian/control [utf-8] Wed Aug 31 14:36:46 2016
@@ -6,22 +6,24 @@
Section: gnome
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Iain Lane <laney at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Iain Lane <laney at debian.org>, Jeremy Bicha <jbicha at ubuntu.com>, Michael Biebl <biebl at debian.org>
Build-Depends: debhelper (>= 9),
dh-autoreconf,
+ appstream-util,
gnome-common,
gnome-pkg-tools,
+ gsettings-desktop-schemas-dev (>= 3.21.2),
intltool (>= 0.40.6),
libecal1.2-dev (>= 3.17.1),
libedataserver1.2-dev (>= 3.17.1),
libedataserverui1.2-dev (>= 3.17.1),
libglib2.0-dev (>= 2.43.4),
libgoa-1.0-dev (>= 3.2.0),
- libgtk-3-dev (>= 3.19.12~),
+ libgtk-3-dev (>= 3.21.1),
libical-dev (>= 1.0.1),
pkg-config (>= 0.22)
Standards-Version: 3.9.8
-Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/packages/desktop/gnome-calendar
+Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-calendar
Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-calendar
Homepage: https://wiki.gnome.org/Apps/Calendar
Modified: desktop/unstable/gnome-calendar/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-calendar/debian/control.in?rev=49861&op=diff
==============================================================================
--- desktop/unstable/gnome-calendar/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-calendar/debian/control.in [utf-8] Wed Aug 31 14:36:46 2016
@@ -5,15 +5,17 @@
Uploaders: @GNOME_TEAM@
Build-Depends: debhelper (>= 9),
dh-autoreconf,
+ appstream-util,
gnome-common,
gnome-pkg-tools,
+ gsettings-desktop-schemas-dev (>= 3.21.2),
intltool (>= 0.40.6),
libecal1.2-dev (>= 3.17.1),
libedataserver1.2-dev (>= 3.17.1),
libedataserverui1.2-dev (>= 3.17.1),
libglib2.0-dev (>= 2.43.4),
libgoa-1.0-dev (>= 3.2.0),
- libgtk-3-dev (>= 3.19.12~),
+ libgtk-3-dev (>= 3.21.1),
libical-dev (>= 1.0.1),
pkg-config (>= 0.22)
Standards-Version: 3.9.8
Modified: desktop/unstable/gnome-calendar/debian/patches/0001-Hide-GOA-sources-on-Unity.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-calendar/debian/patches/0001-Hide-GOA-sources-on-Unity.patch?rev=49861&op=diff
==============================================================================
--- desktop/unstable/gnome-calendar/debian/patches/0001-Hide-GOA-sources-on-Unity.patch [utf-8] (original)
+++ desktop/unstable/gnome-calendar/debian/patches/0001-Hide-GOA-sources-on-Unity.patch [utf-8] Wed Aug 31 14:36:46 2016
@@ -1,4 +1,4 @@
-From 5e1d0482919405695df558874153f00d6991430c Mon Sep 17 00:00:00 2001
+From 505b7ae8520aee954f822e53707f0a62ccbbb0d2 Mon Sep 17 00:00:00 2001
From: Iain Lane <iain.lane at canonical.com>
Date: Thu, 28 Jan 2016 12:34:35 +0000
Subject: [PATCH 1/2] Hide GOA sources on Unity
@@ -6,14 +6,13 @@
(Backported to gnome-3-18, use the patches on the bug for 3.20)
https://bugzilla.gnome.org/show_bug.cgi?id=761259
-
---
src/gcal-manager.c | 14 ++++++++++----
src/gcal-source-dialog.c | 9 +++++++++
2 files changed, 19 insertions(+), 4 deletions(-)
-Index: b/src/gcal-manager.c
-===================================================================
+diff --git a/src/gcal-manager.c b/src/gcal-manager.c
+index a7c07e0..594a724 100644
--- a/src/gcal-manager.c
+++ b/src/gcal-manager.c
@@ -21,6 +21,7 @@
@@ -24,7 +23,7 @@
typedef struct
{
-@@ -790,6 +791,7 @@
+@@ -790,6 +791,7 @@ gcal_manager_constructed (GObject *object)
GList *sources, *l;
GError *error = NULL;
ESourceCredentialsProvider *credentials_provider;
@@ -32,7 +31,7 @@
G_OBJECT_CLASS (gcal_manager_parent_class)->constructed (object);
-@@ -801,10 +803,14 @@
+@@ -801,10 +803,14 @@ gcal_manager_constructed (GObject *object)
manager->clients = g_hash_table_new_full ((GHashFunc) e_source_hash, (GEqualFunc) e_source_equal,
g_object_unref, (GDestroyNotify) free_unit_data);
@@ -51,11 +50,11 @@
/* reading sources and schedule its connecting */
manager->source_registry = e_source_registry_new_sync (NULL, &error);
-Index: b/src/gcal-source-dialog.c
-===================================================================
+diff --git a/src/gcal-source-dialog.c b/src/gcal-source-dialog.c
+index ca5f187..8f4dbf0 100644
--- a/src/gcal-source-dialog.c
+++ b/src/gcal-source-dialog.c
-@@ -38,6 +38,7 @@
+@@ -38,6 +38,7 @@ struct _GcalSourceDialog
GtkWidget *main_scrolledwindow;
GtkWidget *name_entry;
GtkWidget *notebook;
@@ -63,7 +62,7 @@
GtkWidget *remove_button;
GtkWidget *stack;
GtkWidget *web_source_grid;
-@@ -1788,11 +1789,18 @@
+@@ -1794,11 +1795,18 @@ gcal_source_dialog_constructed (GObject *object)
GcalSourceDialog *self;
GtkBuilder *builder;
GMenuModel *menu;
@@ -82,7 +81,7 @@
/* widget responses */
gtk_dialog_set_default_response (GTK_DIALOG (object), GTK_RESPONSE_CANCEL);
-@@ -1873,6 +1881,7 @@
+@@ -1879,6 +1887,7 @@ gcal_source_dialog_class_init (GcalSourceDialogClass *klass)
gtk_widget_class_bind_template_child (widget_class, GcalSourceDialog, notification);
gtk_widget_class_bind_template_child (widget_class, GcalSourceDialog, notification_label);
gtk_widget_class_bind_template_child (widget_class, GcalSourceDialog, online_accounts_listbox);
@@ -90,3 +89,6 @@
gtk_widget_class_bind_template_child (widget_class, GcalSourceDialog, owncloud_stub_row);
gtk_widget_class_bind_template_child (widget_class, GcalSourceDialog, remove_button);
gtk_widget_class_bind_template_child (widget_class, GcalSourceDialog, settings_button);
+--
+2.9.3
+
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=49861&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] Wed Aug 31 14:36:46 2016
@@ -1,4 +1,4 @@
-From c589d3f665e576cda2d0c28209be00579d9ebca5 Mon Sep 17 00:00:00 2001
+From fd6abbf4a60d8afe71a379c1e12cfdc51e8fdb1c Mon Sep 17 00:00:00 2001
From: Iain Lane <iain.lane at canonical.com>
Date: Thu, 28 Jan 2016 13:35:32 +0000
Subject: [PATCH 2/2] Spawn Ubuntu's credentials panel instead of the GOA
@@ -10,48 +10,51 @@
(Backported to gnome-3-18, use the patches on the bug for 3.20)
https://bugzilla.gnome.org/show_bug.cgi?id=761259
+---
+ src/gcal-source-dialog.c | 63 ++++++++++++++++++++++++++++++++++++++----------
+ 1 file changed, 50 insertions(+), 13 deletions(-)
----
- src/gcal-source-dialog.c | 51 ++++++++++++++++++++++++++++++++++++------------
- 1 file changed, 39 insertions(+), 12 deletions(-)
-
-Index: gnome-calendar-3.19.91/src/gcal-source-dialog.c
-===================================================================
---- gnome-calendar-3.19.91.orig/src/gcal-source-dialog.c
-+++ gnome-calendar-3.19.91/src/gcal-source-dialog.c
+diff --git a/src/gcal-source-dialog.c b/src/gcal-source-dialog.c
+index 8f4dbf0..f21d2fb 100644
+--- a/src/gcal-source-dialog.c
++++ b/src/gcal-source-dialog.c
@@ -39,6 +39,9 @@ struct _GcalSourceDialog
GtkWidget *name_entry;
GtkWidget *notebook;
GtkWidget *online_account_main_grid;
+ GtkWidget *online_accounts_settings_button;
++ GtkWidget *other_calendars_main_frame;
+ GtkWidget *other_calendars_main_grid;
-+ GtkWidget *other_calendars_main_frame;
GtkWidget *remove_button;
GtkWidget *stack;
GtkWidget *web_source_grid;
-@@ -498,6 +501,37 @@ default_check_toggled (GObject *objec
+@@ -498,6 +501,41 @@ default_check_toggled (GObject *object,
gcal_manager_set_default_source (self->manager, self->old_default_source);
}
+static void
-+spawn_goa_with_args (gchar *action,
-+ gchar *arg)
++spawn_goa_with_args (const gchar *action,
++ const gchar *arg)
+{
+ const gchar *desktop;
++ g_auto(GStrv) desktops = NULL;
+ GError *error = NULL;
+
-+ gchar *command[] = {"gnome-control-center", "online-accounts", action, arg, NULL};
++ const gchar const *command[] = {"gnome-control-center", "online-accounts", action, arg, NULL};
+
-+ /* On Ubuntu (Ubuntu Online Accounts), unity-control-center is used and the
++ /* 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";
++ if (desktop) {
++ desktops = g_strsplit (desktop, ":", 0);
++ if (desktops && g_strv_contains ((const gchar * const *) desktops, "Unity"))
++ {
++ command[0] = "unity-control-center";
++ command[1] = "credentials";
++ }
+ }
+
-+ if (!g_spawn_async (NULL, command, NULL, G_SPAWN_SEARCH_PATH | G_SPAWN_STDOUT_TO_DEV_NULL,
++ if (!g_spawn_async (NULL, (gchar **) 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);
@@ -67,42 +70,35 @@
/**
* description_label_link_activated:
-@@ -512,8 +546,7 @@ description_label_link_activated (GtkWid
+@@ -512,8 +550,7 @@ description_label_link_activated (GtkWidget *widget,
gchar *uri,
gpointer user_data)
{
-- gchar *command[] = {"gnome-control-center", "online-accounts", NULL};
-- g_spawn_async (NULL, command, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL);
+- const gchar* const command[] = { "gnome-control-center", "online-accounts", NULL };
+- g_spawn_async (NULL, (gchar**) command, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL);
+ spawn_goa ();
return TRUE;
}
-@@ -653,14 +686,6 @@ name_entry_text_changed (GObject *obj
+@@ -653,17 +690,6 @@ name_entry_text_changed (GObject *object,
e_source_set_display_name (self->source, gtk_entry_get_text (GTK_ENTRY (self->name_entry)));
}
-static void
--spawn_goa_with_args (gchar *action,
-- gchar *arg)
+-spawn_goa_with_args (const gchar *action,
+- const gchar *arg)
-{
-- gchar *command[] = {"gnome-control-center", "online-accounts", action, arg, NULL};
-- g_spawn_async (NULL, command, NULL, G_SPAWN_SEARCH_PATH | G_SPAWN_STDOUT_TO_DEV_NULL, NULL, NULL, NULL, NULL);
+- const gchar* const command[] = { "gnome-control-center", "online-accounts", action, arg, NULL };
+- g_spawn_async (NULL, (gchar**) command,
+- NULL,
+- G_SPAWN_SEARCH_PATH | G_SPAWN_STDOUT_TO_DEV_NULL,
+- NULL, NULL, NULL, NULL);
-}
-
/**
* online_accounts_listbox_row_activated:
*
-@@ -1095,8 +1120,7 @@ static void
- online_accounts_settings_button_clicked (GtkWidget *button,
- gpointer user_data)
- {
-- gchar *command[] = {"gnome-control-center", "online-accounts", NULL};
-- g_spawn_async (NULL, command, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL);
-+ spawn_goa ();
- }
-
- static void
-@@ -1796,6 +1820,14 @@ gcal_source_dialog_constructed (GObject
+@@ -1804,6 +1830,14 @@ gcal_source_dialog_constructed (GObject *object)
desktop = g_getenv ("XDG_CURRENT_DESKTOP");
if (desktop && strstr (desktop, "Unity"))
{
@@ -117,13 +113,16 @@
gtk_widget_hide (self->online_account_main_grid);
}
-@@ -1880,6 +1912,9 @@ gcal_source_dialog_class_init (GcalSourc
+@@ -1888,6 +1922,9 @@ gcal_source_dialog_class_init (GcalSourceDialogClass *klass)
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);
+ gtk_widget_class_bind_template_child (widget_class, GcalSourceDialog, online_accounts_settings_button);
++ gtk_widget_class_bind_template_child (widget_class, GcalSourceDialog, other_calendars_main_frame);
+ gtk_widget_class_bind_template_child (widget_class, GcalSourceDialog, other_calendars_main_grid);
-+ gtk_widget_class_bind_template_child (widget_class, GcalSourceDialog, other_calendars_main_frame);
gtk_widget_class_bind_template_child (widget_class, GcalSourceDialog, owncloud_stub_row);
gtk_widget_class_bind_template_child (widget_class, GcalSourceDialog, remove_button);
gtk_widget_class_bind_template_child (widget_class, GcalSourceDialog, settings_button);
+--
+2.9.3
+
Modified: desktop/unstable/gnome-calendar/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-calendar/debian/watch?rev=49861&op=diff
==============================================================================
--- desktop/unstable/gnome-calendar/debian/watch [utf-8] (original)
+++ desktop/unstable/gnome-calendar/debian/watch [utf-8] Wed Aug 31 14:36:46 2016
@@ -1,3 +1,3 @@
version=4
-https://download.gnome.org/sources/@PACKAGE@/([\d\.]+[02468])/ \
+https://download.gnome.org/sources/@PACKAGE@/([\d\.]+)/ \
@PACKAGE@@ANY_VERSION@\.tar\.xz
More information about the pkg-gnome-commits
mailing list