3.29.3+really3.28.1-1

${gnome:Version} doesn't understand the +really workaround.

NEWS

@@ -1,3 +1,13 @@
+3.28.1
+======
+* Misc. bug fixes [Xiaoguang, Florian; #59, #62]
+
+Contributors:
+  Florian Müllner, Xiaoguang Wang
+
+Translators:
+  Dz Chen [zh_CN]
+
 3.28.0
 ======
 

debian/changelog

@@ -1,3 +1,29 @@
+gnome-shell-extensions (3.29.3+really3.28.1-1) unstable; urgency=medium
+
+  * Team upload
+  * Revert unintended upload of 3.29.3 to unstable
+  * d/gbp.conf: Use debian/unstable and upstream/3.28.x branches
+  * Bump Standards-Version to 4.1.5
+  * Set Rules-Requires-Root to no
+  * Hard-code compatible Shell versions for this branch since
+    ${gnome:Version} doesn't understand the +really workaround
+
+ -- Simon McVittie <smcv@debian.org>  Fri, 27 Jul 2018 23:47:37 +0100
+
+gnome-shell-extensions (3.28.1-1) unstable; urgency=medium
+
+  * New upstream release
+  * Bump Standards-Version to 4.1.4
+
+ -- Jeremy Bicha <jbicha@debian.org>  Mon, 14 May 2018 21:51:46 -0400
+
+gnome-shell-extensions (3.28.0-2) unstable; urgency=medium
+
+  * Fix typo in configure flag that resulted in missing
+    auto-move-windows, native-window-placement, & user-theme extensions
+
+ -- Jeremy Bicha <jbicha@debian.org>  Mon, 19 Mar 2018 18:20:53 -0400
+
 gnome-shell-extensions (3.28.0-1) unstable; urgency=medium
 
   * New upstream release
@@ -264,11 +290,11 @@ gnome-shell-extensions (3.16.1-1) unstable; urgency=medium
 gnome-shell-extensions (3.14.2-1) unstable; urgency=medium
 
   * New upstream bugfix release.
-  * menu-arrows-icons: new patch. Make arrows consistent with the rest 
+  * menu-arrows-icons: new patch. Make arrows consistent with the rest
     of the shell.
-  * apps-center-labels.patch: patch from upstream git. Center labels 
+  * apps-center-labels.patch: patch from upstream git. Center labels
     vertically in the applications menu.
-  * window-list-pointerInNotification.patch: patch from upstream git. 
+  * window-list-pointerInNotification.patch: patch from upstream git.
     Update window-list extension for an older shell API change.
 
  -- Josselin Mouette <joss@debian.org>  Sun, 30 Nov 2014 16:06:59 +0100
@@ -424,9 +450,9 @@ gnome-shell-extensions (3.4.0-1) experimental; urgency=low
 gnome-shell-extensions (3.2.3-1) unstable; urgency=low
 
   [ Josselin Mouette ]
-  * gnome-shell-extensions.gsettings-override: enable the alternative 
+  * gnome-shell-extensions.gsettings-override: enable the alternative
     status menu by default. Closes: #648112.
-  * Use ${gnome:Version} to generate strict dependencies, it’s very 
+  * Use ${gnome:Version} to generate strict dependencies, it’s very
     unlikely that extensions remain compatible after a major upgrade.
 
   [ Michael Biebl ]
@@ -434,7 +460,7 @@ gnome-shell-extensions (3.2.3-1) unstable; urgency=low
 
   [ Josselin Mouette ]
   * 01_status-menu_disable_accounts.patch: new patch. Drop the unusable
-    advertisement for Google. It is already available in the control 
+    advertisement for Google. It is already available in the control
     center anyway.
 
   [ Michael Biebl ]

debian/control

@@ -11,7 +11,8 @@ Build-Depends: debhelper (>= 11.1.3),
                gnome-pkg-tools,
                meson (>= 0.44.0),
                sassc
-Standards-Version: 4.1.2
+Rules-Requires-Root: no
+Standards-Version: 4.1.5
 Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-shell-extensions
 Vcs-Git: https://salsa.debian.org/gnome-team/gnome-shell-extensions.git
 Homepage: https://wiki.gnome.org/Projects/GnomeShell/Extensions
@@ -19,8 +20,8 @@ Homepage: https://wiki.gnome.org/Projects/GnomeShell/Extensions
 Package: gnome-shell-extensions
 Architecture: all
 Depends: ${misc:Depends},
-         gnome-shell (>= ${gnome:Version}),
-         gnome-shell (<< ${gnome:NextVersion}),
+         gnome-shell (>= 3.28),
+         gnome-shell (<< 3.29),
          gir1.2-atk-1.0,
          gir1.2-clutter-1.0,
          gir1.2-gdkpixbuf-2.0,

debian/control.in

@@ -7,7 +7,8 @@ Build-Depends: debhelper (>= 11.1.3),
                gnome-pkg-tools,
                meson (>= 0.44.0),
                sassc
-Standards-Version: 4.1.2
+Rules-Requires-Root: no
+Standards-Version: 4.1.5
 Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-shell-extensions
 Vcs-Git: https://salsa.debian.org/gnome-team/gnome-shell-extensions.git
 Homepage: https://wiki.gnome.org/Projects/GnomeShell/Extensions
@@ -15,8 +16,8 @@ Homepage: https://wiki.gnome.org/Projects/GnomeShell/Extensions
 Package: gnome-shell-extensions
 Architecture: all
 Depends: ${misc:Depends},
-         gnome-shell (>= ${gnome:Version}),
-         gnome-shell (<< ${gnome:NextVersion}),
+         gnome-shell (>= 3.28),
+         gnome-shell (<< 3.29),
          gir1.2-atk-1.0,
          gir1.2-clutter-1.0,
          gir1.2-gdkpixbuf-2.0,

debian/gbp.conf

@@ -1,5 +1,5 @@
 [DEFAULT]
 pristine-tar = True
-debian-branch = debian/master
-upstream-branch = upstream/latest
+debian-branch = debian/unstable
+upstream-branch = upstream/3.28.x
 upstream-vcs-tag = %(version)s

debian/rules

@@ -1,18 +1,17 @@
 #!/usr/bin/make -f
--include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-EXTENSIONS_ENABLED="[alternate-tab, apps-menu, places-menu, \
+EXTENSIONS_ENABLED='alternate-tab, apps-menu, places-menu, \
  launch-new-instance, window-list, \
  drive-menu, screenshot-window-sizer, \
  windowsNavigator, workspace-indicator, \
- auto-move-windows, native-window-placement, user-theme]"
+ auto-move-windows, native-window-placement, user-theme'
 
-EXTENSIONS_DISABLED="example"
+EXTENSIONS_DISABLED='example'
 
 %:
 	dh $@ --with gnome
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		-Denable-extensions=$(EXTENSIONS_ENABLED) \
+		-Denable_extensions=$(EXTENSIONS_ENABLED) \
 		-Dclassic_mode=true

extensions/apps-menu/extension.js

@@ -742,7 +742,6 @@ class ApplicationsButton extends PanelMenu.Button {
     }
 
     destroy() {
-        this.menu.actor.get_children().forEach(c => { c.destroy() });
         super.destroy();
     }
 };

extensions/places-menu/placeDisplay.js

@@ -385,7 +385,7 @@ var PlacesManager = class {
 
             for(let j = 0; j < volumes.length; j++) {
                 let identifier = volumes[j].get_identifier('class');
-                if (identifier && identifier.indexOf('network') >= 0) {
+                if (identifier && identifier.includes('network')) {
                     networkVolumes.push(volumes[j]);
                 } else {
                     let mount = volumes[j].get_mount();
@@ -402,7 +402,7 @@ var PlacesManager = class {
                 continue;
 
             let identifier = volumes[i].get_identifier('class');
-            if (identifier && identifier.indexOf('network') >= 0) {
+            if (identifier && identifier.includes('network')) {
                 networkVolumes.push(volumes[i]);
             } else {
                 let mount = volumes[i].get_mount();

extensions/window-list/extension.js

@@ -882,14 +882,14 @@ class WindowList {
     }
 
     _getDynamicWorkspacesSettings() {
-        if (this._workspaceSettings.list_keys().indexOf('dynamic-workspaces') > -1)
+        if (this._workspaceSettings.list_keys().includes('dynamic-workspaces'))
             return this._workspaceSettings;
         return this._mutterSettings;
     }
 
     _getWorkspaceSettings() {
-        let settings = global.get_overrides_settings();
-        if (settings.list_keys().indexOf('workspaces-only-on-primary') > -1)
+        let settings = global.get_overrides_settings() || this._mutterSettings;
+        if (settings.list_keys().includes('workspaces-only-on-primary'))
             return settings;
         return this._mutterSettings;
     }

meson.build

@@ -1,5 +1,5 @@
 project('gnome-shell-extensions',
-  version: '3.28.0',
+  version: '3.28.1',
   meson_version: '>= 0.44.0',
   license: 'GPL2+'
 )

po/zh_CN.po

@@ -5,21 +5,22 @@
 # Aron Xu <aronxu@gnome.org>, 2011.
 # tuhaihe <1132321739qq@gmail.com>, 2012, 2013.
 # 甘露(Gan Lu) <rhythm.gan@gmail.com>, 2013.
+# Mingcong Bai <jeffbai@aosc.xyz>, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"shell&keywords=I18N+L10N&component=extensions\n"
-"POT-Creation-Date: 2016-10-11 08:03+0000\n"
-"PO-Revision-Date: 2016-10-18 17:53+0800\n"
-"Last-Translator: YunQiang Su <wzssyqa@gmail.com>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/"
+"issues\n"
+"POT-Creation-Date: 2018-01-18 12:15+0000\n"
+"PO-Revision-Date: 2017-08-18 21:26+0800\n"
+"Last-Translator: Mingcong Bai <jeffbai@aosc.xyz>\n"
 "Language-Team: Chinese (China) <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.9\n"
+"X-Generator: Poedit 2.0.2\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: data/gnome-classic.desktop.in:3 data/gnome-classic.session.desktop.in:3
@@ -65,35 +66,35 @@ msgstr "仅在主显示器上显示工作区"
 msgid "Delay focus changes in mouse mode until the pointer stops moving"
 msgstr "将鼠标模式下焦点的切换推迟到光标停止移动之后"
 
-#: extensions/alternate-tab/prefs.js:20
+#: extensions/alternate-tab/prefs.js:19
 msgid "Thumbnail only"
 msgstr "仅缩略图"
 
-#: extensions/alternate-tab/prefs.js:21
+#: extensions/alternate-tab/prefs.js:20
 msgid "Application icon only"
 msgstr "仅应用程序图标"
 
-#: extensions/alternate-tab/prefs.js:22
+#: extensions/alternate-tab/prefs.js:21
 msgid "Thumbnail and application icon"
 msgstr "缩略图和应用程序图标"
 
-#: extensions/alternate-tab/prefs.js:38
+#: extensions/alternate-tab/prefs.js:34
 msgid "Present windows as"
 msgstr "窗口展现为"
 
-#: extensions/alternate-tab/prefs.js:69
+#: extensions/alternate-tab/prefs.js:65
 msgid "Show only windows in the current workspace"
 msgstr "仅显示当前工作区中的窗口"
 
-#: extensions/apps-menu/extension.js:38
+#: extensions/apps-menu/extension.js:37
 msgid "Activities Overview"
 msgstr "活动概览"
 
-#: extensions/apps-menu/extension.js:109
+#: extensions/apps-menu/extension.js:130
 msgid "Favorites"
 msgstr "收藏"
 
-#: extensions/apps-menu/extension.js:266
+#: extensions/apps-menu/extension.js:417
 msgid "Applications"
 msgstr "应用程序"
 
@@ -106,41 +107,43 @@ msgid ""
 "A list of strings, each containing an application id (desktop file name), "
 "followed by a colon and the workspace number"
 msgstr ""
-"一系列字符串，每个字符串包含一个应用程序标识(桌面文件名称)、冒号加工作区号"
+"一系列字符串，每个字符串包含一个应用程序标识（桌面文件名称）、冒号加工作区号"
 
-#: extensions/auto-move-windows/prefs.js:60
+#: extensions/auto-move-windows/prefs.js:53
 msgid "Application"
 msgstr "应用程序"
 
-#: extensions/auto-move-windows/prefs.js:69
-#: extensions/auto-move-windows/prefs.js:127
+#: extensions/auto-move-windows/prefs.js:62
+#: extensions/auto-move-windows/prefs.js:117
 msgid "Workspace"
 msgstr "工作区"
 
-#: extensions/auto-move-windows/prefs.js:85
+#: extensions/auto-move-windows/prefs.js:78
 msgid "Add Rule"
 msgstr "添加规则"
 
-#: extensions/auto-move-windows/prefs.js:106
+#: extensions/auto-move-windows/prefs.js:98
 msgid "Create new matching rule"
 msgstr "创建新的匹配规则"
 
-#: extensions/auto-move-windows/prefs.js:111
+#: extensions/auto-move-windows/prefs.js:103
 msgid "Add"
 msgstr "添加"
 
-#: extensions/drive-menu/extension.js:106
+#. TRANSLATORS: %s is the filesystem name
+#: extensions/drive-menu/extension.js:103
+#: extensions/places-menu/placeDisplay.js:219
 #, javascript-format
-msgid "Ejecting drive '%s' failed:"
+msgid "Ejecting drive “%s” failed:"
 msgstr "弹出驱动器“%s”失败："
 
-#: extensions/drive-menu/extension.js:124
+#: extensions/drive-menu/extension.js:118
 msgid "Removable devices"
 msgstr "可移动设备"
 
-#: extensions/drive-menu/extension.js:149
-msgid "Open File"
-msgstr "打开文件管理器"
+#: extensions/drive-menu/extension.js:143
+msgid "Open Files"
+msgstr "打开文件"
 
 #: extensions/example/extension.js:17
 msgid "Hello, world!"
@@ -156,17 +159,17 @@ msgid ""
 "panel."
 msgstr "如果不为空，所包含的文本会在点击面板时显示。"
 
-#: extensions/example/prefs.js:30
+#: extensions/example/prefs.js:27
 msgid "Message"
 msgstr "消息"
 
 #. TRANSLATORS: Example is the name of the extension, should not be
 #. translated
-#: extensions/example/prefs.js:43
+#: extensions/example/prefs.js:40
 msgid ""
 "Example aims to show how to build well behaved extensions for the Shell and "
 "as such it has little functionality on its own.\n"
-"Nevertheless it's possible to customize the greeting message."
+"Nevertheless it’s possible to customize the greeting message."
 msgstr ""
 "示例意在展示如何为 Shell 创建良好工作的扩展，本身功能有限。\n"
 "尽管如此，它还是具备定制祝福语的功能。"
@@ -197,32 +200,41 @@ msgstr ""
 "如果设置为 true，则将窗口说明文字放置在对应窗口的缩略图上方，而不是默认的下"
 "方。修改此设置需要重启 GNOME Shell 以使设置生效。"
 
-#: extensions/places-menu/extension.js:78
-#: extensions/places-menu/extension.js:81
+#: extensions/places-menu/extension.js:79
+#: extensions/places-menu/extension.js:82
 msgid "Places"
 msgstr "位置"
 
-#: extensions/places-menu/placeDisplay.js:59
+#: extensions/places-menu/placeDisplay.js:66
 #, javascript-format
-msgid "Failed to launch \"%s\""
+msgid "Failed to mount volume for “%s”"
+msgstr "无法为“%s”挂载卷"
+
+#: extensions/places-menu/placeDisplay.js:79
+#, javascript-format
+msgid "Failed to launch “%s”"
 msgstr "无法启动“%s”"
 
-#: extensions/places-menu/placeDisplay.js:101
-#: extensions/places-menu/placeDisplay.js:124
+#: extensions/places-menu/placeDisplay.js:135
+#: extensions/places-menu/placeDisplay.js:158
 msgid "Computer"
 msgstr "计算机"
 
-#: extensions/places-menu/placeDisplay.js:267
+#: extensions/places-menu/placeDisplay.js:336
 msgid "Home"
 msgstr "主文件夹"
 
-#: extensions/places-menu/placeDisplay.js:311
+#: extensions/places-menu/placeDisplay.js:378
 msgid "Browse Network"
 msgstr "浏览网络"
 
 #: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:7
 msgid "Cycle Screenshot Sizes"
-msgstr "循环调整窗口截图大小"
+msgstr "循环调整截图大小"
+
+#: extensions/screenshot-window-sizer/org.gnome.shell.extensions.screenshot-window-sizer.gschema.xml:11
+msgid "Cycle Screenshot Sizes Backward"
+msgstr "反向循环调整截图大小"
 
 #: extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml:5
 msgid "Theme name"
@@ -232,52 +244,52 @@ msgstr "主题名称"
 msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
 msgstr "从 ~/.themes/name/gnome-shell 加载的主题名称"
 
-#: extensions/window-list/extension.js:110
+#: extensions/window-list/extension.js:106
 msgid "Close"
 msgstr "关闭"
 
-#: extensions/window-list/extension.js:120
+#: extensions/window-list/extension.js:125
 msgid "Unminimize"
 msgstr "取消最小化"
 
-#: extensions/window-list/extension.js:121
+#: extensions/window-list/extension.js:126
 msgid "Minimize"
 msgstr "最小化"
 
-#: extensions/window-list/extension.js:127
+#: extensions/window-list/extension.js:132
 msgid "Unmaximize"
 msgstr "取消最大化"
 
-#: extensions/window-list/extension.js:128
+#: extensions/window-list/extension.js:133
 msgid "Maximize"
 msgstr "最大化"
 
-#: extensions/window-list/extension.js:411
+#: extensions/window-list/extension.js:408
 msgid "Minimize all"
 msgstr "全部最小化"
 
-#: extensions/window-list/extension.js:419
+#: extensions/window-list/extension.js:414
 msgid "Unminimize all"
 msgstr "全部取消最小化"
 
-#: extensions/window-list/extension.js:427
+#: extensions/window-list/extension.js:420
 msgid "Maximize all"
 msgstr "全部最大化"
 
-#: extensions/window-list/extension.js:436
+#: extensions/window-list/extension.js:429
 msgid "Unmaximize all"
 msgstr "全部取消最大化"
 
-#: extensions/window-list/extension.js:445
+#: extensions/window-list/extension.js:438
 msgid "Close all"
 msgstr "全部关闭"
 
-#: extensions/window-list/extension.js:669
-#: extensions/workspace-indicator/extension.js:30
+#: extensions/window-list/extension.js:646
+#: extensions/workspace-indicator/extension.js:26
 msgid "Workspace Indicator"
 msgstr "工作区指示器"
 
-#: extensions/window-list/extension.js:828
+#: extensions/window-list/extension.js:811
 msgid "Window List"
 msgstr "窗口列表"
 
@@ -288,10 +300,10 @@ msgstr "何时分组窗口"
 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:13
 msgid ""
 "Decides when to group windows from the same application on the window list. "
-"Possible values are \"never\", \"auto\" and \"always\"."
+"Possible values are “never”, “auto” and “always”."
 msgstr ""
-"决定何时对窗口列表上的同一应用的窗口进行分组。可用值有“never”(从"
-"不)、“auto”(自动)和“always”(总是)。"
+"决定何时对窗口列表上的同一应用的窗口进行分组。可用值有“never”（从"
+"不）、“auto”（自动）和“always”（总是）。"
 
 #: extensions/window-list/org.gnome.shell.extensions.window-list.gschema.xml:20
 msgid "Show the window list on all monitors"
@@ -303,35 +315,35 @@ msgid ""
 "primary one."
 msgstr "是否在所有连接的显示器上显示窗口列表或仅在主显示器上显示。"
 
-#: extensions/window-list/prefs.js:32
+#: extensions/window-list/prefs.js:28
 msgid "Window Grouping"
 msgstr "窗口分组"
 
-#: extensions/window-list/prefs.js:50
+#: extensions/window-list/prefs.js:46
 msgid "Never group windows"
 msgstr "从不将窗口分组"
 
-#: extensions/window-list/prefs.js:51
+#: extensions/window-list/prefs.js:47
 msgid "Group windows when space is limited"
 msgstr "当空间有限时将窗口分组"
 
-#: extensions/window-list/prefs.js:52
+#: extensions/window-list/prefs.js:48
 msgid "Always group windows"
 msgstr "总是对窗口分组"
 
-#: extensions/window-list/prefs.js:75
+#: extensions/window-list/prefs.js:71
 msgid "Show on all monitors"
 msgstr "在所有显示器上显示"
 
-#: extensions/workspace-indicator/prefs.js:141
+#: extensions/workspace-indicator/prefs.js:134
 msgid "Workspace Names"
 msgstr "工作区名称"
 
-#: extensions/workspace-indicator/prefs.js:157
+#: extensions/workspace-indicator/prefs.js:150
 msgid "Name"
 msgstr "名称"
 
-#: extensions/workspace-indicator/prefs.js:198
+#: extensions/workspace-indicator/prefs.js:190
 #, javascript-format
 msgid "Workspace %d"
 msgstr "工作区 %d"