release to unstable

debian/patches/dont-require-nautilus-classic.patch,
  debian/patches/menu-arrows-icons.patch:
  + Dropped, merged upstream.

debian/changelog

@@ -1,3 +1,19 @@
+gnome-shell-extensions (3.16.1-1) unstable; urgency=medium
+
+  * New upstream release.
+  * debian/control.in,
+    debian/rules:
+    + The system monitor extension was removed. Drop the libgtop
+      build and runtime dependencies and stop enabling it.
+  * debian/patches/apps-center-labels.patch,
+    debian/patches/window-list-pointerInNotification.patch,
+    debian/patches/menu-arrows-icons.patch:
+    + Dropped, merged upstream.
+  * debian/patches/dont-require-nautilus-classic.patch:
+    + Updated for the new version.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org>  Sun, 14 Jun 2015 15:23:59 +0200
+
 gnome-shell-extensions (3.14.2-1) unstable; urgency=medium
 
   * New upstream bugfix release.

debian/control

@@ -6,7 +6,7 @@ Source: gnome-shell-extensions
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
-Uploaders: Victor Seva <linuxmaniac@torreviejawireless.org>, Andreas Henriksson <andreas@fatal.se>, Emilio Pozuelo Monfort <pochu@debian.org>, Laurent Bigonville <bigon@debian.org>, Michael Biebl <biebl@debian.org>
+Uploaders: Victor Seva <linuxmaniac@torreviejawireless.org>, Andreas Henriksson <andreas@fatal.se>, Emilio Pozuelo Monfort <pochu@debian.org>, Josselin Mouette <joss@debian.org>, Laurent Bigonville <bigon@debian.org>, Michael Biebl <biebl@debian.org>
 Build-Depends: debhelper (>= 8.0.0),
                cdbs,
                dh-autoreconf,
@@ -14,7 +14,6 @@ Build-Depends: debhelper (>= 8.0.0),
                gnome-pkg-tools,
                intltool,
                libgnome-desktop-3-dev (>= 3.2.0),
-               libgtop2-dev (>= 2.28.3)
 Standards-Version: 3.9.6
 Homepage: https://wiki.gnome.org/GnomeShell/Extensions
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/packages/unstable/gnome-shell-extensions
@@ -31,7 +30,6 @@ Depends: ${misc:Depends},
          gir1.2-glib-2.0,
          gir1.2-gmenu-3.0,
          gir1.2-gtk-3.0,
-         gir1.2-gtop-2.0,
          gir1.2-mutter-3.0,
          gir1.2-pango-1.0,
          gvfs (>= 1.16.0),

debian/control.in

@@ -10,7 +10,6 @@ Build-Depends: debhelper (>= 8.0.0),
                gnome-pkg-tools,
                intltool,
                libgnome-desktop-3-dev (>= 3.2.0),
-               libgtop2-dev (>= 2.28.3)
 Standards-Version: 3.9.6
 Homepage: https://wiki.gnome.org/GnomeShell/Extensions
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/packages/unstable/gnome-shell-extensions
@@ -27,7 +26,6 @@ Depends: ${misc:Depends},
          gir1.2-glib-2.0,
          gir1.2-gmenu-3.0,
          gir1.2-gtk-3.0,
-         gir1.2-gtop-2.0,
          gir1.2-mutter-3.0,
          gir1.2-pango-1.0,
          gvfs (>= 1.16.0),

debian/patches/apps-center-labels.patch

@@ -1,27 +0,0 @@
-From 79f263d1edbd6f7cfe13cf89933941b439325cee Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
-Date: Wed, 26 Nov 2014 19:03:49 +0100
-Subject: apps-menu: Center app labels
-
-Currently labels are not vertically centered, unlike icons.
-Fix this.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=740724
-
-diff --git a/extensions/apps-menu/extension.js b/extensions/apps-menu/extension.js
-index a8fb74d..f8438fd 100644
---- a/extensions/apps-menu/extension.js
-+++ b/extensions/apps-menu/extension.js
-@@ -58,7 +58,8 @@ const ApplicationMenuItem = new Lang.Class({
-         this._iconBin = new St.Bin();
-         this.actor.add_child(this._iconBin);
- 
--        let appLabel = new St.Label({ text: app.get_name() });
-+        let appLabel = new St.Label({ text: app.get_name(), y_expand: true,
-+                                      y_align: Clutter.ActorAlign.CENTER });
-         this.actor.add_child(appLabel, { expand: true });
-         this.actor.label_actor = appLabel;
- 
--- 
-cgit v0.10.1
-

debian/patches/dont-require-nautilus-classic.patch

@@ -2,12 +2,10 @@ Description: Don't use nautilus-classic since it forces desktop icons
 Author: Jeremy Bicha <jbicha@ubuntu.com>
 Bug: https://bugzilla.gnome.org/695088
 
-Index: gnome-shell-extensions-3.8.3.1/data/gnome-classic.session.desktop.in.in
-===================================================================
---- gnome-shell-extensions-3.8.3.1.orig/data/gnome-classic.session.desktop.in.in	2013-06-17 15:42:43.000000000 -0400
-+++ gnome-shell-extensions-3.8.3.1/data/gnome-classic.session.desktop.in.in	2013-06-19 10:31:47.900318151 -0400
+--- a/data/gnome-classic.session.desktop.in.in
++++ b/data/gnome-classic.session.desktop.in.in
 @@ -1,3 +1,3 @@
  [GNOME Session]
  _Name=GNOME Classic
--RequiredComponents=gnome-shell-classic;gnome-settings-daemon;nautilus-classic;
-+RequiredComponents=gnome-shell-classic;gnome-settings-daemon;
+-RequiredComponents=gnome-shell;gnome-settings-daemon;nautilus-classic;
++RequiredComponents=gnome-shell;gnome-settings-daemon;

debian/patches/menu-arrows-icons.patch

@@ -1,45 +0,0 @@
-Index: gnome-shell-extensions-3.14.2/extensions/apps-menu/extension.js
-===================================================================
---- gnome-shell-extensions-3.14.2.orig/extensions/apps-menu/extension.js	2014-10-07 13:54:01.000000000 +0200
-+++ gnome-shell-extensions-3.14.2/extensions/apps-menu/extension.js	2014-11-30 15:59:57.300620972 +0100
-@@ -283,9 +283,7 @@ const ApplicationsButton = new Lang.Clas
-                                      y_expand: true,
-                                      y_align: Clutter.ActorAlign.CENTER });
-         hbox.add_child(this._label);
--        hbox.add_child(new St.Label({ text: '\u25BE',
--                                      y_expand: true,
--                                      y_align: Clutter.ActorAlign.CENTER }));
-+        hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));
- 
-         this.actor.add_actor(hbox);
-         this.actor.name = 'panelApplications';
-Index: gnome-shell-extensions-3.14.2/extensions/drive-menu/extension.js
-===================================================================
---- gnome-shell-extensions-3.14.2.orig/extensions/drive-menu/extension.js	2014-11-30 15:59:14.629264311 +0100
-+++ gnome-shell-extensions-3.14.2/extensions/drive-menu/extension.js	2014-11-30 15:59:32.344997226 +0100
-@@ -128,9 +128,7 @@ const DriveMenu = new Lang.Class({
-                                  style_class: 'system-status-icon' });
- 
-         hbox.add_child(icon);
--        hbox.add_child(new St.Label({ text: '\u25BE',
--                                      y_expand: true,
--                                      y_align: Clutter.ActorAlign.CENTER }));
-+        hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));
-         this.actor.add_child(hbox);
- 
- 	this._monitor = Gio.VolumeMonitor.get();
-Index: gnome-shell-extensions-3.14.2/extensions/places-menu/extension.js
-===================================================================
---- gnome-shell-extensions-3.14.2.orig/extensions/places-menu/extension.js	2014-10-07 13:54:01.000000000 +0200
-+++ gnome-shell-extensions-3.14.2/extensions/places-menu/extension.js	2014-11-30 15:57:44.382624700 +0100
-@@ -82,9 +82,7 @@ const PlacesMenu = new Lang.Class({
-                                    y_expand: true,
-                                    y_align: Clutter.ActorAlign.CENTER });
-         hbox.add_child(label);
--        hbox.add_child(new St.Label({ text: '\u25BE',
--                                      y_expand: true,
--                                      y_align: Clutter.ActorAlign.CENTER }));
-+        hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));
-         this.actor.add_actor(hbox);
- 
-         this.placesManager = new PlaceDisplay.PlacesManager();

debian/patches/series

@@ -1,5 +1,2 @@
 dont-require-nautilus-classic.patch
 gnome-session-classic-wrapper-script.patch
-menu-arrows-icons.patch
-apps-center-labels.patch
-window-list-pointerInNotification.patch

debian/patches/window-list-pointerInNotification.patch

@@ -1,24 +0,0 @@
-From 2f49d77931b57d20ba37f03b9a0733f18cbba5c8 Mon Sep 17 00:00:00 2001
-From: Sylvain Pasche <sylvain.pasche@gmail.com>
-Date: Sat, 1 Nov 2014 22:03:43 +0100
-Subject: window-list: _pointerInTray was renamed to _pointerInNotification in
- bug 695800
-
-https://bugzilla.gnome.org/show_bug.cgi?id=737486
-
-diff --git a/extensions/window-list/extension.js b/extensions/window-list/extension.js
-index 5115a68..0cee654 100644
---- a/extensions/window-list/extension.js
-+++ b/extensions/window-list/extension.js
-@@ -1188,7 +1188,7 @@ function enable() {
- 
-     windowList.actor.connect('notify::hover', Lang.bind(Main.messageTray,
-         function() {
--            this._pointerInTray = windowList.actor.hover;
-+            this._pointerInNotification = windowList.actor.hover;
-             this._updateState();
-         }));
- 
--- 
-cgit v0.10.1
-

debian/rules

@@ -5,11 +5,11 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
--include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 EXTENSIONS_ENABLED="alternate-tab auto-move-windows workspace-indicator\
  native-window-placement user-theme apps-menu drive-menu places-menu\
- windowsNavigator systemMonitor launch-new-instance window-list\
+ windowsNavigator launch-new-instance window-list\
  screenshot-window-sizer"
 
 EXTENSIONS_DISABLED="example"