diff -Nru nautilus-dropbox-2015.10.28/debian/changelog nautilus-dropbox-2015.10.28/debian/changelog --- nautilus-dropbox-2015.10.28/debian/changelog 2016-09-24 18:38:46.000000000 +0100 +++ nautilus-dropbox-2015.10.28/debian/changelog 2017-03-27 19:31:31.000000000 +0100 @@ -1,3 +1,11 @@ +nautilus-dropbox (2015.10.28-1ubuntu1.17.04.1) zesty; urgency=medium + + * debian/patches: + + Add fix-unity-indicator-menu.patch. Coerce XDG_CURRENT_DESKTOP to report + "Unity" ensuring the indicator icon and menu work correctly. (LP: #1559249) + + -- Martin Wimpress Mon, 27 Mar 2017 19:11:18 +0100 + nautilus-dropbox (2015.10.28-1) unstable; urgency=medium * [788b88a] Imported Upstream version 2015.10.28 diff -Nru nautilus-dropbox-2015.10.28/debian/control nautilus-dropbox-2015.10.28/debian/control --- nautilus-dropbox-2015.10.28/debian/control 2016-09-24 18:36:38.000000000 +0100 +++ nautilus-dropbox-2015.10.28/debian/control 2017-03-27 19:15:33.000000000 +0100 @@ -1,7 +1,8 @@ Source: nautilus-dropbox Section: non-free/gnome Priority: optional -Maintainer: Luke Faraone +Maintainer: Martin Wimpress +XSBC-Original-Maintainer: Luke Faraone Build-Depends: debhelper (>= 9), dh-autoreconf, libglib2.0-dev (>= 2.14.0), diff -Nru nautilus-dropbox-2015.10.28/debian/patches/fix-unity-indicator-menu.patch nautilus-dropbox-2015.10.28/debian/patches/fix-unity-indicator-menu.patch --- nautilus-dropbox-2015.10.28/debian/patches/fix-unity-indicator-menu.patch 1970-01-01 01:00:00.000000000 +0100 +++ nautilus-dropbox-2015.10.28/debian/patches/fix-unity-indicator-menu.patch 2017-03-27 19:17:58.000000000 +0100 @@ -0,0 +1,28 @@ +Description: Coerce XDG_CURRENT_DESKTOP to "Unity". (LP: #1559249) +Abstract: + This works around broken dropbox binary that will only activate the + indicator icon and menu on Ubuntu Unity < 16.10. This patch coerces + XDG_CURRENT_DESKTOP to report as "Unity" following the recent change + to "Unity7" +Author: Martin Wimpress +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1559249 + +--- nautilus-dropbox-2015.10.28.orig/dropbox.in ++++ nautilus-dropbox-2015.10.28/dropbox.in +@@ -743,9 +743,15 @@ def start_dropbox(): + db_path = os.path.expanduser(DROPBOXD_PATH).encode(sys.getfilesystemencoding()) + if os.access(db_path, os.X_OK): + f = open("/dev/null", "w") ++ ++ # Fix indicator icon and menu on Unity environments. (LP: #1559249) ++ new_env = os.environ.copy() ++ if 'Unity' in os.environ.get("XDG_CURRENT_DESKTOP", '').split(":"): ++ new_env['XDG_CURRENT_DESKTOP'] = 'Unity' ++ + # we don't reap the child because we're gonna die anyway, let init do it + a = subprocess.Popen([db_path], preexec_fn=os.setsid, cwd=os.path.expanduser("~"), +- stderr=sys.stderr, stdout=f, close_fds=True) ++ stderr=sys.stderr, stdout=f, close_fds=True, env=new_env) + + # in seconds + interval = 0.5 diff -Nru nautilus-dropbox-2015.10.28/debian/patches/series nautilus-dropbox-2015.10.28/debian/patches/series --- nautilus-dropbox-2015.10.28/debian/patches/series 2016-09-24 18:36:38.000000000 +0100 +++ nautilus-dropbox-2015.10.28/debian/patches/series 2017-03-27 19:19:26.000000000 +0100 @@ -4,6 +4,7 @@ display-error-string-when-download-failed.patch add-http-proxy-option.patch fix-gdk-threads-init-crash.patch +fix-unity-indicator-menu.patch # Patches above should really be integrated upstream # global installation patches