Compare commits

...

17 Commits

Author SHA1 Message Date
Jeremy Bicha
ba9d2e7919 releasing package gnome-shell-extensions version 3.30.0-1 2018-09-05 12:35:10 -04:00
Jeremy Bicha
9d0c742f34 Update debian/gbp.conf 2018-09-05 12:33:05 -04:00
Jeremy Bicha
1e69961bc7 New upstream release 2018-09-05 12:32:55 -04:00
Jeremy Bicha
e4ddc4c14e Update upstream source from tag 'upstream/3.30.0'
Update to upstream version '3.30.0'
with Debian dir d0677ad034
2018-09-05 12:32:29 -04:00
Jeremy Bicha
a0b6535210 New upstream version 3.30.0 2018-09-05 12:32:25 -04:00
Jeremy Bicha
be149bab3d Revert "d/watch: Watch for development versions"
This reverts commit e37782c2ce.
2018-09-05 12:31:44 -04:00
Florian Müllner
913b2ba691 Bump version to 3.30.0 2018-09-04 00:10:36 +02:00
Simon McVittie
1b4bbe19e3 3.29.91-1 2018-08-20 20:28:07 +01:00
Simon McVittie
2e6b602a04 d/p/series: Remove commented-out line 2018-08-20 20:00:42 +01:00
Simon McVittie
5b9012152c d/copyright: Remove unnecessary sentence fragment 2018-08-20 20:00:08 +01:00
Simon McVittie
efd20bb4f7 Sort dependency lists (wrap-and-sort -a) 2018-08-20 19:58:52 +01:00
Simon McVittie
7d595e4774 Bump Standards-Version to 4.2.0 2018-08-20 19:58:00 +01:00
Simon McVittie
7b4c3085c0 New upstream development release 2018-08-20 19:56:46 +01:00
Simon McVittie
9a9b3afa31 New upstream version 3.29.91 2018-08-20 19:55:42 +01:00
Simon McVittie
7045a5dcea Update upstream source from tag 'upstream/3.29.91'
Update to upstream version '3.29.91'
with Debian dir 7aa6de354f
2018-08-20 19:55:42 +01:00
Florian Müllner
ba51869b93 Bump version to 3.29.91
Update NEWS.
2018-08-20 15:48:53 +02:00
Florian Müllner
ffe6110ea9 Stop using conditional catch statements
They are a mozilla extension that is going away in SpiderMonkey 60.

https://gitlab.gnome.org/GNOME/gnome-shell-extensions/issues/90
2018-08-13 12:00:22 +02:00
10 changed files with 102 additions and 56 deletions

11
NEWS
View File

@@ -1,3 +1,14 @@
3.30.0
======
* Bump version
3.29.91
=======
* Misc. bug fixes [Florian; #90]
Contributors:
Florian Müllner
3.29.90
=======
* Misc. bug fixes [Florian; #786496]

18
debian/changelog vendored
View File

@@ -1,3 +1,21 @@
gnome-shell-extensions (3.30.0-1) unstable; urgency=medium
* New upstream release
* Release to unstable
-- Jeremy Bicha <jbicha@debian.org> Wed, 05 Sep 2018 12:34:40 -0400
gnome-shell-extensions (3.29.91-1) experimental; urgency=medium
* Team upload
* New upstream development release
* Bump Standards-Version to 4.2.0
* Sort dependency lists (wrap-and-sort -a)
* d/copyright: Remove unnecessary sentence fragment
* d/p/series: Remove commented-out line
-- Simon McVittie <smcv@debian.org> Mon, 20 Aug 2018 20:27:57 +0100
gnome-shell-extensions (3.29.90-1) experimental; urgency=medium
* Team upload

14
debian/control vendored
View File

@@ -12,26 +12,26 @@ Build-Depends: debhelper (>= 11.1.3),
meson (>= 0.44.0),
sassc
Rules-Requires-Root: no
Standards-Version: 4.1.5
Standards-Version: 4.2.0
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
Package: gnome-shell-extensions
Architecture: all
Depends: ${misc:Depends},
gnome-shell (>= ${gnome:Version}),
gnome-shell (<< ${gnome:NextVersion}),
gir1.2-atk-1.0,
Depends: gir1.2-atk-1.0,
gir1.2-clutter-1.0,
gir1.2-gdkpixbuf-2.0,
gir1.2-glib-2.0,
gir1.2-gmenu-3.0,
gir1.2-gtk-3.0,
gir1.2-pango-1.0,
gvfs (>= 1.16.0),
gnome-session-bin (>= 3.8),
gnome-settings-daemon (>= 3.24)
gnome-settings-daemon (>= 3.24),
gnome-shell (<< ${gnome:NextVersion}),
gnome-shell (>= ${gnome:Version}),
gvfs (>= 1.16.0),
${misc:Depends}
Recommends: gnome-tweaks
Replaces: gnome-shell-common (<< 3.18)
Breaks: gnome-shell-common (<< 3.18)

14
debian/control.in vendored
View File

@@ -8,26 +8,26 @@ Build-Depends: debhelper (>= 11.1.3),
meson (>= 0.44.0),
sassc
Rules-Requires-Root: no
Standards-Version: 4.1.5
Standards-Version: 4.2.0
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
Package: gnome-shell-extensions
Architecture: all
Depends: ${misc:Depends},
gnome-shell (>= ${gnome:Version}),
gnome-shell (<< ${gnome:NextVersion}),
gir1.2-atk-1.0,
Depends: gir1.2-atk-1.0,
gir1.2-clutter-1.0,
gir1.2-gdkpixbuf-2.0,
gir1.2-glib-2.0,
gir1.2-gmenu-3.0,
gir1.2-gtk-3.0,
gir1.2-pango-1.0,
gvfs (>= 1.16.0),
gnome-session-bin (>= 3.8),
gnome-settings-daemon (>= 3.24)
gnome-settings-daemon (>= 3.24),
gnome-shell (<< ${gnome:NextVersion}),
gnome-shell (>= ${gnome:Version}),
gvfs (>= 1.16.0),
${misc:Depends}
Recommends: gnome-tweaks
Replaces: gnome-shell-common (<< 3.18)
Breaks: gnome-shell-common (<< 3.18)

3
debian/copyright vendored
View File

@@ -24,8 +24,5 @@ License: GPL-2+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
.
You should have received a copy of the GNU General Public License
along with this program. If not, see
.
On Debian systems, the complete text of the GNU General
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".

9
debian/gbp.conf vendored
View File

@@ -3,3 +3,12 @@ pristine-tar = True
debian-branch = debian/master
upstream-branch = upstream/latest
upstream-vcs-tag = %(version)s
[buildpackage]
sign-tags = True
[import-orig]
postimport = dch -v%(version)s New upstream release; git add debian/changelog; debcommit
[pq]
patch-numbers = False

View File

@@ -1,2 +1 @@
#dont-require-nautilus-classic.patch
gnome-session-classic-wrapper-script.patch

2
debian/watch vendored
View File

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

View File

@@ -50,33 +50,35 @@ class PlaceInfo {
return (_ignored, result) => {
try {
Gio.AppInfo.launch_default_for_uri_finish(result);
} catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_MOUNTED)) {
let source = {
get_icon: () => { return this.icon; }
};
let op = new ShellMountOperation.ShellMountOperation(source);
this.file.mount_enclosing_volume(0, op.mountOp, null, (file, result) => {
try {
op.close();
file.mount_enclosing_volume_finish(result);
} catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED)) {
// e.g. user canceled the password dialog
return;
} catch(e) {
Main.notifyError(_("Failed to mount volume for “%s”").format(this.name), e.message);
return;
}
if (tryMount) {
let callback = this._createLaunchCallback(launchContext, false);
Gio.AppInfo.launch_default_for_uri_async(file.get_uri(),
launchContext,
null,
callback);
}
});
} catch(e) {
Main.notifyError(_("Failed to launch “%s”").format(this.name), e.message);
if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_MOUNTED)) {
let source = {
get_icon: () => { return this.icon; }
};
let op = new ShellMountOperation.ShellMountOperation(source);
this.file.mount_enclosing_volume(0, op.mountOp, null, (file, result) => {
try {
op.close();
file.mount_enclosing_volume_finish(result);
} catch(e) {
if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.FAILED_HANDLED))
// e.g. user canceled the password dialog
return;
Main.notifyError(_("Failed to mount volume for “%s”").format(this.name), e.message);
return;
}
if (tryMount) {
let callback = this._createLaunchCallback(launchContext, false);
Gio.AppInfo.launch_default_for_uri_async(file.get_uri(),
launchContext,
null,
callback);
}
});
} else {
Main.notifyError(_("Failed to launch “%s”").format(this.name), e.message);
}
}
}
}
@@ -97,8 +99,10 @@ class PlaceInfo {
let info = file.query_info_finish(result);
this.icon = info.get_symbolic_icon();
this.emit('changed');
} catch(e if e instanceof Gio.IOErrorEnum) {
return;
} catch(e) {
if (e instanceof Gio.IOErrorEnum)
return;
throw e;
}
});
@@ -123,8 +127,10 @@ class PlaceInfo {
try {
let info = this.file.query_info('standard::display-name', 0, null);
return info.get_display_name();
} catch(e if e instanceof Gio.IOErrorEnum) {
return this.file.get_basename();
} catch(e) {
if (e instanceof Gio.IOErrorEnum)
return this.file.get_basename();
throw e;
}
}
};
@@ -349,8 +355,10 @@ var PlacesManager = class {
let file = Gio.File.new_for_path(specialPath), info;
try {
info = new PlaceInfo('special', file);
} catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND)) {
continue;
} catch(e) {
if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND))
continue;
throw e;
}
specials.push(info);
@@ -514,8 +522,10 @@ var PlacesManager = class {
try {
devItem = new PlaceDeviceInfo(kind, mount);
} catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND)) {
return;
} catch(e) {
if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND))
return;
throw e;
}
this._places[kind].push(devItem);
@@ -526,8 +536,10 @@ var PlacesManager = class {
try {
volItem = new PlaceVolumeInfo(kind, volume);
} catch(e if e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND)) {
return;
} catch(e) {
if (e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND))
return;
throw e;
}
this._places[kind].push(volItem);

View File

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