diff --git a/debian/changelog b/debian/changelog index 908841ab..fd046ae3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,11 @@ gnome-shell-extensions (3.8.0-1) UNRELEASED; urgency=low * New upstream release. - * debian/patches - - fix-places-volume-without-class.diff (fix 'places', #697266) + * debian/control.in + - Added runtime dependency to 'gvfs' (>= 1.16.0). + The 'Places' extension rely on a 'gvfs' linked to 'udisks2'. - -- Jean Schurger Thu, 04 Apr 2013 09:32:25 -0400 + -- Jean Schurger Thu, 04 Apr 2013 10:03:26 -0400 gnome-shell-extensions (3.7.92-1) UNRELEASED; urgency=low diff --git a/debian/control b/debian/control index 161063ba..a429007e 100644 --- a/debian/control +++ b/debian/control @@ -26,7 +26,8 @@ Architecture: all Depends: ${misc:Depends}, gnome-shell (>= ${gnome:Version}), gnome-shell (<< ${gnome:NextVersion}), - gir1.2-gtop-2.0 + gir1.2-gtop-2.0, + gvfs (>= 1.16.0) Recommends: gnome-tweak-tool (>= ${gnome:Version}) Description: Extensions to extend functionality of GNOME Shell The GNOME Shell redefines user interactions with the GNOME desktop. In diff --git a/debian/control.in b/debian/control.in index d34875c9..0bcac17f 100644 --- a/debian/control.in +++ b/debian/control.in @@ -21,7 +21,8 @@ Architecture: all Depends: ${misc:Depends}, gnome-shell (>= ${gnome:Version}), gnome-shell (<< ${gnome:NextVersion}), - gir1.2-gtop-2.0 + gir1.2-gtop-2.0, + gvfs (>= 1.16.0) Recommends: gnome-tweak-tool (>= ${gnome:Version}) Description: Extensions to extend functionality of GNOME Shell The GNOME Shell redefines user interactions with the GNOME desktop. In diff --git a/debian/patches/fix-places-volume-without-class.diff b/debian/patches/fix-places-volume-without-class.diff deleted file mode 100644 index a73da1ff..00000000 --- a/debian/patches/fix-places-volume-without-class.diff +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/extensions/places-menu/placeDisplay.js b/extensions/places-menu/placeDisplay.js -index 6d0625b..4b78310 100644 ---- a/extensions/places-menu/placeDisplay.js -+++ b/extensions/places-menu/placeDisplay.js -@@ -292,7 +292,12 @@ const PlacesManager = new Lang.Class({ - let volumes = drives[i].get_volumes(); - - for(let j = 0; j < volumes.length; j++) { -- if (volumes[j].get_identifier('class').indexOf('network') >= 0) { -+ let cls = volumes[j].get_identifier('class'); -+ let have_network_class = false; -+ if (cls != null) -+ if (volumes[j].get_identifier('class').indexOf('network') >= 0) -+ have_network_class = true; -+ if (have_network_class) { - networkVolumes.push(volumes[i]); - } else { - let mount = volumes[j].get_mount(); diff --git a/debian/patches/series b/debian/patches/series index c2b0b6c4..e69de29b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +0,0 @@ -fix-places-volume-without-class.diff