Release to unstable.

* Replace Build-Depends gnome-common with pkg-config and gettext.

debian/changelog

@@ -1,3 +1,88 @@
+gnome-shell-extensions (3.22.2-2) unstable; urgency=medium
+
+  * Add adapt-to-gsd324.patch (Closes: #869948):
+    - Adjust gnome-session file for gnome-settings-daemon 3.24
+  * debian/control.in:
+    - Bump Standards-Version to 4.0.0
+    - Explicitly depend on gnome-settings-daemon >= 3.24
+    - Drop version from gnome-tweak-tool recommends
+    - Depend on gnome-session-bin instead of gnome-session (LP: #1702832)
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Sun, 06 Aug 2017 17:38:06 -0400
+
+gnome-shell-extensions (3.22.2-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 10 Nov 2016 19:36:44 +0100
+
+gnome-shell-extensions (3.22.1-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 11 Oct 2016 17:58:31 +0200
+
+gnome-shell-extensions (3.22.0-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 20 Sep 2016 01:59:50 +0200
+
+gnome-shell-extensions (3.21.92-1) unstable; urgency=medium
+
+  * New upstream development release.
+  * Replace Build-Depends gnome-common with pkg-config and gettext.
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 13 Sep 2016 22:13:19 +0200
+
+gnome-shell-extensions (3.21.91-1) unstable; urgency=medium
+
+  * New upstream beta release.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Tue, 30 Aug 2016 19:57:32 +0200
+
+gnome-shell-extensions (3.21.90-1) experimental; urgency=medium
+
+  [ Andreas Henriksson ]
+  * New upstream beta release.
+  * Update build-dependencies according to configure.ac changes:
+    - drop intltool, now gettext is used instead.
+
+  [ Jeremy Bicha ]
+  * Convert from cdbs to dh
+  * Add debian/docs to install NEWS and README
+  * Bump dh compat to 10
+  * Update Vcs fields
+  * Refresh patches
+
+ -- Andreas Henriksson <andreas@fatal.se>  Sun, 21 Aug 2016 05:36:17 +0200
+
+gnome-shell-extensions (3.21.4-1) experimental; urgency=medium
+
+  * New upstream development release.
+  * Stop hard-coding Victor Seva in the Uploaders field
+
+ -- Andreas Henriksson <andreas@fatal.se>  Fri, 12 Aug 2016 16:28:33 +0200
+
+gnome-shell-extensions (3.20.1-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Bump Standards-Version to 3.9.8.
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 11 May 2016 15:21:35 +0200
+
+gnome-shell-extensions (3.20.0-2) unstable; urgency=medium
+
+  * Upload to unstable.
+
+ -- Michael Biebl <biebl@debian.org>  Sun, 17 Apr 2016 00:25:25 +0200
+
+gnome-shell-extensions (3.20.0-1) experimental; urgency=medium
+
+  * New upstream release.
+
+ -- Andreas Henriksson <andreas@fatal.se>  Fri, 25 Mar 2016 10:48:00 +0100
+
 gnome-shell-extensions (3.19.92-1) experimental; urgency=medium
 
   * New upstream release.

debian/compat

@@ -1 +1 @@
-9
+10

debian/control

@@ -6,18 +6,16 @@ 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>, Josselin Mouette <joss@debian.org>, Laurent Bigonville <bigon@debian.org>, Michael Biebl <biebl@debian.org>
-Build-Depends: debhelper (>= 9),
-               cdbs,
-               dh-autoreconf,
-               gnome-common,
+Uploaders: Andreas Henriksson <andreas@fatal.se>, Jeremy Bicha <jbicha@ubuntu.com>, Michael Biebl <biebl@debian.org>
+Build-Depends: debhelper (>= 10),
+               pkg-config (>= 0.22),
+               gettext,
                gnome-pkg-tools,
-               intltool,
                libgnome-desktop-3-dev (>= 3.2.0),
-Standards-Version: 3.9.7
+Standards-Version: 4.0.0
 Homepage: https://wiki.gnome.org/Projects/GnomeShell/Extensions
-Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/packages/unstable/gnome-shell-extensions
-Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/gnome-shell-extensions
+Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-shell-extensions
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-shell-extensions
 
 Package: gnome-shell-extensions
 Architecture: all
@@ -33,8 +31,9 @@ Depends: ${misc:Depends},
          gir1.2-mutter-3.0,
          gir1.2-pango-1.0,
          gvfs (>= 1.16.0),
-         gnome-session (>= 3.8)
-Recommends: gnome-tweak-tool (>= ${gnome:Version})
+         gnome-session-bin (>= 3.8),
+         gnome-settings-daemon (>= 3.24)
+Recommends: gnome-tweak-tool
 Replaces: gnome-shell-common (<< 3.18)
 Breaks: gnome-shell-common (<< 3.18)
 Description: Extensions to extend functionality of GNOME Shell

debian/control.in

@@ -2,18 +2,16 @@ 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>, @GNOME_TEAM@
-Build-Depends: debhelper (>= 9),
-               cdbs,
-               dh-autoreconf,
-               gnome-common,
+Uploaders: @GNOME_TEAM@
+Build-Depends: debhelper (>= 10),
+               pkg-config (>= 0.22),
+               gettext,
                gnome-pkg-tools,
-               intltool,
                libgnome-desktop-3-dev (>= 3.2.0),
-Standards-Version: 3.9.7
+Standards-Version: 4.0.0
 Homepage: https://wiki.gnome.org/Projects/GnomeShell/Extensions
-Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/packages/unstable/gnome-shell-extensions
-Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/gnome-shell-extensions
+Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-shell-extensions
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-shell-extensions
 
 Package: gnome-shell-extensions
 Architecture: all
@@ -29,8 +27,9 @@ Depends: ${misc:Depends},
          gir1.2-mutter-3.0,
          gir1.2-pango-1.0,
          gvfs (>= 1.16.0),
-         gnome-session (>= 3.8)
-Recommends: gnome-tweak-tool (>= ${gnome:Version})
+         gnome-session-bin (>= 3.8),
+         gnome-settings-daemon (>= 3.24)
+Recommends: gnome-tweak-tool
 Replaces: gnome-shell-common (<< 3.18)
 Breaks: gnome-shell-common (<< 3.18)
 Description: Extensions to extend functionality of GNOME Shell

debian/copyright

@@ -1,19 +1,19 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: gnome-shell-extensions
 Upstream-Contact: 2011 Giovanni Campagna <gcampagna@src.gnome.org>
-Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-shell-extensions/
+Source: https://download.gnome.org/sources/gnome-shell-extensions/
 
 Files: *
 Copyright: 2011 Giovanni Campagna <gcampagna@src.gnome.org>
-License: GPL-2.0+
+License: GPL-2+
 
 Files: debian/*
 Copyright:
     2011 Victor Seva <linuxmaniac@torreviejawireless.org>
     2011 Bilal Akhtar <bilalakhtar@ubuntu.com>
-License: GPL-2.0+
+License: GPL-2+
 
-License: GPL-2.0+
+License: GPL-2+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 2 of the License, or

debian/docs

@@ -0,0 +1,2 @@
+NEWS
+README

debian/install

@@ -0,0 +1 @@
+debian/local/gnome-session-classic usr/bin

debian/patches/adapt-to-gsd324.patch

@@ -0,0 +1,22 @@
+From 4fa73145b489423ef099aa1229193352ae6e2a77 Mon Sep 17 00:00:00 2001
+From: Rui Matos <tiagomatos@gmail.com>
+Date: Tue, 2 May 2017 19:25:53 +0200
+Subject: data: Adjust to g-s-d's plugin removals
+
+These plugins have been removed.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=782233
+---
+ data/gnome-classic.session.desktop.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/gnome-classic.session.desktop.in b/data/gnome-classic.session.desktop.in
+index b7b8d02..392ec37 100644
+--- a/data/gnome-classic.session.desktop.in
++++ b/data/gnome-classic.session.desktop.in
+@@ -1,3 +1,3 @@
+ [GNOME Session]
+ Name=GNOME Classic
+-RequiredComponents=org.gnome.Shell;gnome-settings-daemon;nautilus-classic;
++RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11yKeyboard;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;nautilus-classic;
+

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

@@ -2,10 +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
 
---- a/data/gnome-classic.session.desktop.in.in
-+++ b/data/gnome-classic.session.desktop.in.in
+--- a/data/gnome-classic.session.desktop.in
++++ b/data/gnome-classic.session.desktop.in
 @@ -1,3 +1,3 @@
  [GNOME Session]
- _Name=GNOME Classic
--RequiredComponents=org.gnome.Shell;gnome-settings-daemon;nautilus-classic;
-+RequiredComponents=org.gnome.Shell;gnome-settings-daemon;
+ Name=GNOME Classic
+-RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11yKeyboard;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;nautilus-classic;
++RequiredComponents=org.gnome.Shell;org.gnome.SettingsDaemon.A11yKeyboard;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;

debian/patches/gnome-session-classic-wrapper-script.patch

@@ -10,16 +10,16 @@ Description: Use a wrapper script to start GNOME classic session
  [1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=653327.
 Author: Michael Biebl <biebl@debian.org>
 
-Index: gnome-shell-extensions-3.8.4/data/gnome-classic.desktop.in
+Index: gnome-shell-extensions-3.21.90/data/gnome-classic.desktop.in
 ===================================================================
---- gnome-shell-extensions-3.8.4.orig/data/gnome-classic.desktop.in	2013-07-16 13:12:50.000000000 +0200
-+++ gnome-shell-extensions-3.8.4/data/gnome-classic.desktop.in	2013-10-11 18:45:36.749513420 +0200
+--- gnome-shell-extensions-3.21.90.orig/data/gnome-classic.desktop.in
++++ gnome-shell-extensions-3.21.90/data/gnome-classic.desktop.in
 @@ -1,7 +1,7 @@
  [Desktop Entry]
- _Name=GNOME Classic
- _Comment=This session logs you into GNOME Classic
+ Name=GNOME Classic
+ Comment=This session logs you into GNOME Classic
 -Exec=env GNOME_SHELL_SESSION_MODE=classic gnome-session --session gnome-classic
 +Exec=gnome-session-classic
  TryExec=gnome-session
- Icon=
  Type=Application
+ DesktopNames=GNOME-Classic;GNOME;

debian/patches/series

@@ -1,2 +1,3 @@
+adapt-to-gsd324.patch
 dont-require-nautilus-classic.patch
 gnome-session-classic-wrapper-script.patch

debian/rules

@@ -1,23 +1,17 @@
 #!/usr/bin/make -f
+-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-include /usr/share/cdbs/1/rules/autoreconf.mk
-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
-
-EXTENSIONS_ENABLED="alternate-tab auto-move-windows workspace-indicator\
- native-window-placement user-theme apps-menu drive-menu places-menu\
- windowsNavigator launch-new-instance window-list\
- screenshot-window-sizer"
+EXTENSIONS_ENABLED="alternate-tab apps-menu auto-move-windows \
+ drive-menu launch-new-instance native-window-placement places-menu \
+ screenshot-window-sizer user-theme window-list windowsNavigator \
+ workspace-indicator"
 
 EXTENSIONS_DISABLED="example"
 
-DEB_CONFIGURE_EXTRA_FLAGS := \
-	--enable-extensions=$(EXTENSIONS_ENABLED) \
-	--enable-classic-mode
+%:
+	dh $@ --with gnome
 
-binary-install/gnome-shell-extensions::
-	install -m 755 -D debian/local/gnome-session-classic \
-		debian/$(cdbs_curpkg)/usr/bin/gnome-session-classic
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--enable-extensions=$(EXTENSIONS_ENABLED) \
+		--enable-classic-mode

debian/watch

@@ -1,2 +1,3 @@
-version=3
-http://ftp.gnome.org/pub/GNOME/sources/gnome-shell-extensions/([\d\.]+[02468])/gnome-shell-extensions-([\d\.]+)\.tar\.xz
+version=4
+https://download.gnome.org/sources/@PACKAGE@/([\d\.]+[02468])/ \
+	@PACKAGE@@ANY_VERSION@\.tar\.xz