r49461 - in /desktop/experimental/gnome-shell/debian: ./ patches/

ah at users.alioth.debian.org ah at users.alioth.debian.org
Wed Aug 10 11:24:33 UTC 2016 

Author: ah
Date: Wed Aug 10 11:24:33 2016
New Revision: 49461

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=49461
Log:
* New upstream release.
* Update build-dependencies according to configure.ac changes:
  - bump gobject-introspection to >= 1.49.1
  - bump *mutter* to >= 3.21.4
  - drop libclutter-1.0-dev (>= 1.22), clutter fork now shipped in mutter.
  - drop gir1.2-clutter-1.0 (>= 1.22), forked typelib now in gir1.2-mutter.
  - bump gsettings-desktop-schemas* to >= 3.21.3
* Add debian/patches/git_calendar-server_add_back_missing_return_value.patch
  - from upstream git master.
* Drop 0001-background-free-MetaBackground-explicitly.patch
  - originally from upstream git, now shipped in upstream release.
* Refresh debian/patches/41-handle-logind-fail.patch to apply cleanly.
* Add build-dependency on mesa-common-dev for GL/gl.h used by shell-util.c

Added:
    desktop/experimental/gnome-shell/debian/patches/git_calendar-server_add_back_missing_return_value.patch
Removed:
    desktop/experimental/gnome-shell/debian/patches/0001-background-free-MetaBackground-explicitly.patch
Modified:
    desktop/experimental/gnome-shell/debian/changelog
    desktop/experimental/gnome-shell/debian/control
    desktop/experimental/gnome-shell/debian/control.in
    desktop/experimental/gnome-shell/debian/patches/41-handle-logind-fail.patch
    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=49461&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/changelog	[utf-8] Wed Aug 10 11:24:33 2016
@@ -1,3 +1,21 @@
+gnome-shell (3.21.4-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * Update build-dependencies according to configure.ac changes:
+    - bump gobject-introspection to >= 1.49.1
+    - bump *mutter* to >= 3.21.4
+    - drop libclutter-1.0-dev (>= 1.22), clutter fork now shipped in mutter.
+    - drop gir1.2-clutter-1.0 (>= 1.22), forked typelib now in gir1.2-mutter.
+    - bump gsettings-desktop-schemas* to >= 3.21.3
+  * Add debian/patches/git_calendar-server_add_back_missing_return_value.patch
+    - from upstream git master.
+  * Drop 0001-background-free-MetaBackground-explicitly.patch
+    - originally from upstream git, now shipped in upstream release.
+  * Refresh debian/patches/41-handle-logind-fail.patch to apply cleanly.
+  * Add build-dependency on mesa-common-dev for GL/gl.h used by shell-util.c
+
+ -- Andreas Henriksson <andreas at fatal.se>  Wed, 10 Aug 2016 11:40:04 +0200
+
 gnome-shell (3.20.3-1) unstable; urgency=medium
 
   [ Laurent Bigonville ]

Modified: desktop/experimental/gnome-shell/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/control?rev=49461&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/control	[utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/control	[utf-8] Wed Aug 10 11:24:33 2016
@@ -12,14 +12,13 @@
                dh-autoreconf,
                gnome-control-center-dev (>= 1:3.4),
                gnome-pkg-tools (>= 0.11),
-               gobject-introspection (>= 1.45.4),
-               gsettings-desktop-schemas-dev (>= 3.19.2),
+               gobject-introspection (>= 1.49.1),
+               gsettings-desktop-schemas-dev (>= 3.21.3),
                gtk-doc-tools,
                intltool (>= 0.26),
                libatk-bridge2.0-dev,
                libcanberra-dev,
                libcanberra-gtk3-dev,
-               libclutter-1.0-dev (>= 1.22),
                libcroco3-dev (>= 0.6.8),
                libecal1.2-dev (>= 3.7.90),
                libedataserver1.2-dev (>= 3.17.2),
@@ -33,7 +32,7 @@
                libgstreamer1.0-dev (>= 0.11.92),
                libgtk-3-dev (>= 3.16),
                libibus-1.0-dev,
-               libmutter-dev (>= 3.20.3-1~),
+               libmutter-dev (>= 3.21.4),
                libnm-glib-dev (>= 0.9.8) [linux-any],
                libnm-glib-vpn-dev (>= 0.9.8) [linux-any],
                libnm-gtk-dev (>= 0.9.8) [linux-any],
@@ -47,6 +46,7 @@
                libx11-dev,
                libxfixes-dev,
                libxml2-dev,
+               mesa-common-dev,
                python3,
 Standards-Version: 3.9.8
 Homepage: https://wiki.gnome.org/Projects/GnomeShell
@@ -64,7 +64,6 @@
          gir1.2-accountsservice-1.0,
          gir1.2-atspi-2.0 (>= 2.9.91),
          gir1.2-caribou-1.0 (>= 0.4.8),
-         gir1.2-clutter-1.0 (>= 1.22),
          gir1.2-freedesktop,
          gir1.2-gdesktopenums-3.0 (>= 3.12),
          gir1.2-gcr-3 (>= 3.7.5),
@@ -74,7 +73,7 @@
          gir1.2-gtk-3.0 (>= 3.16),
          gir1.2-gweather-3.0,
          gir1.2-ibus-1.0 (>= 1.5.2),
-         gir1.2-mutter-3.0 (>= 3.20.3-1~),
+         gir1.2-mutter-3.0 (>= 3.21.4),
          gir1.2-networkmanager-1.0 [linux-any],
          gir1.2-nmgtk-1.0 (>= 0.9.8) [linux-any],
          gir1.2-pango-1.0,
@@ -87,8 +86,8 @@
          gnome-settings-daemon (>= 3.16.0),
          gnome-shell-common (= ${source:Version}),
          gnome-backgrounds (>= 3.13.90),
-         gsettings-desktop-schemas (>= 3.19.2),
-         mutter (>= 3.20.3-1~),
+         gsettings-desktop-schemas (>= 3.21.3),
+         mutter (>= 3.21.4),
          python3,
          telepathy-mission-control-5,
 Recommends: gkbd-capplet,

Modified: desktop/experimental/gnome-shell/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/control.in?rev=49461&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/control.in	[utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/control.in	[utf-8] Wed Aug 10 11:24:33 2016
@@ -8,14 +8,13 @@
                dh-autoreconf,
                gnome-control-center-dev (>= 1:3.4),
                gnome-pkg-tools (>= 0.11),
-               gobject-introspection (>= 1.45.4),
-               gsettings-desktop-schemas-dev (>= 3.19.2),
+               gobject-introspection (>= 1.49.1),
+               gsettings-desktop-schemas-dev (>= 3.21.3),
                gtk-doc-tools,
                intltool (>= 0.26),
                libatk-bridge2.0-dev,
                libcanberra-dev,
                libcanberra-gtk3-dev,
-               libclutter-1.0-dev (>= 1.22),
                libcroco3-dev (>= 0.6.8),
                libecal1.2-dev (>= 3.7.90),
                libedataserver1.2-dev (>= 3.17.2),
@@ -29,7 +28,7 @@
                libgstreamer1.0-dev (>= 0.11.92),
                libgtk-3-dev (>= 3.16),
                libibus-1.0-dev,
-               libmutter-dev (>= 3.20.3-1~),
+               libmutter-dev (>= 3.21.4),
                libnm-glib-dev (>= 0.9.8) [linux-any],
                libnm-glib-vpn-dev (>= 0.9.8) [linux-any],
                libnm-gtk-dev (>= 0.9.8) [linux-any],
@@ -43,6 +42,7 @@
                libx11-dev,
                libxfixes-dev,
                libxml2-dev,
+               mesa-common-dev,
                python3,
 Standards-Version: 3.9.8
 Homepage: https://wiki.gnome.org/Projects/GnomeShell
@@ -60,7 +60,6 @@
          gir1.2-accountsservice-1.0,
          gir1.2-atspi-2.0 (>= 2.9.91),
          gir1.2-caribou-1.0 (>= 0.4.8),
-         gir1.2-clutter-1.0 (>= 1.22),
          gir1.2-freedesktop,
          gir1.2-gdesktopenums-3.0 (>= 3.12),
          gir1.2-gcr-3 (>= 3.7.5),
@@ -70,7 +69,7 @@
          gir1.2-gtk-3.0 (>= 3.16),
          gir1.2-gweather-3.0,
          gir1.2-ibus-1.0 (>= 1.5.2),
-         gir1.2-mutter-3.0 (>= 3.20.3-1~),
+         gir1.2-mutter-3.0 (>= 3.21.4),
          gir1.2-networkmanager-1.0 [linux-any],
          gir1.2-nmgtk-1.0 (>= 0.9.8) [linux-any],
          gir1.2-pango-1.0,
@@ -83,8 +82,8 @@
          gnome-settings-daemon (>= 3.16.0),
          gnome-shell-common (= ${source:Version}),
          gnome-backgrounds (>= 3.13.90),
-         gsettings-desktop-schemas (>= 3.19.2),
-         mutter (>= 3.20.3-1~),
+         gsettings-desktop-schemas (>= 3.21.3),
+         mutter (>= 3.21.4),
          python3,
          telepathy-mission-control-5,
 Recommends: gkbd-capplet,

Modified: desktop/experimental/gnome-shell/debian/patches/41-handle-logind-fail.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/patches/41-handle-logind-fail.patch?rev=49461&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/patches/41-handle-logind-fail.patch	[utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/patches/41-handle-logind-fail.patch	[utf-8] Wed Aug 10 11:24:33 2016
@@ -9,11 +9,9 @@
 
 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=729877
 
-Index: gnome-shell-3.16.2/js/misc/loginManager.js
-===================================================================
---- gnome-shell-3.16.2.orig/js/misc/loginManager.js	2015-06-15 20:46:24.805673265 +0200
-+++ gnome-shell-3.16.2/js/misc/loginManager.js	2015-06-15 20:46:24.801673346 +0200
-@@ -90,7 +90,7 @@
+--- a/js/misc/loginManager.js
++++ b/js/misc/loginManager.js
+@@ -93,7 +93,7 @@
   */
  function getLoginManager() {
      if (_loginManager == null) {

Added: desktop/experimental/gnome-shell/debian/patches/git_calendar-server_add_back_missing_return_value.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/patches/git_calendar-server_add_back_missing_return_value.patch?rev=49461&op=file
==============================================================================
--- desktop/experimental/gnome-shell/debian/patches/git_calendar-server_add_back_missing_return_value.patch	(added)
+++ desktop/experimental/gnome-shell/debian/patches/git_calendar-server_add_back_missing_return_value.patch	[utf-8] Wed Aug 10 11:24:33 2016
@@ -0,0 +1,31 @@
+From 6e0e37519d485a64b3a332f25e45f8cc13dd61e0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner at gnome.org>
+Date: Mon, 25 Jul 2016 18:46:59 +0200
+Subject: calendar-server: Add back missing return value
+
+In commit 7e0e224e0, when moving from e_cal_recur_generate_instances()
+to e_cal_client_generate_instances(), the return value of the
+ECalRecurInstanceFn callback was accidentally removed; add it
+back.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=769156
+---
+ src/calendar-server/gnome-shell-calendar-server.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/calendar-server/gnome-shell-calendar-server.c b/src/calendar-server/gnome-shell-calendar-server.c
+index 5ff12f2..57bc71b 100644
+--- a/src/calendar-server/gnome-shell-calendar-server.c
++++ b/src/calendar-server/gnome-shell-calendar-server.c
+@@ -443,6 +443,8 @@ generate_instances_cb (ECalComponent *comp,
+   occurrence->rid        = e_cal_component_get_recurid_as_string (comp);
+ 
+   appointment->occurrences = g_slist_append (appointment->occurrences, occurrence);
++
++  return TRUE;
+ }
+ 
+ 
+-- 
+cgit v0.12
+

Modified: desktop/experimental/gnome-shell/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-shell/debian/patches/series?rev=49461&op=diff
==============================================================================
--- desktop/experimental/gnome-shell/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/gnome-shell/debian/patches/series	[utf-8] Wed Aug 10 11:24:33 2016
@@ -1,4 +1,4 @@
-0001-background-free-MetaBackground-explicitly.patch
 27-nm-libexec-path.patch
 #30-remoteMenu-Prevent-the-shell-from-becoming-unrespons.patch
 41-handle-logind-fail.patch
+git_calendar-server_add_back_missing_return_value.patch

More information about the pkg-gnome-commits mailing list