diff -Nru nautilus-dropbox-2015.10.28/debian/changelog nautilus-dropbox-2015.10.28/debian/changelog --- nautilus-dropbox-2015.10.28/debian/changelog 2017-03-27 18:11:18.000000000 +0000 +++ nautilus-dropbox-2015.10.28/debian/changelog 2017-05-22 09:46:08.000000000 +0000 @@ -1,3 +1,12 @@ +nautilus-dropbox (2015.10.28-1ubuntu2) artful; urgency=medium + + * debian/patches: + + Add fix-budgie-indicator-menu.patch. Coerce XDG_CURRENT_DESKTOP to report + "Unity" ensuring the indicator icon and menu work correctly for + the budgie-desktop environment. (LP: #1683051) + + -- David Mohammed Sun, 16 Apr 2017 10:03:58 +0100 + nautilus-dropbox (2015.10.28-1ubuntu1) zesty; urgency=medium * debian/patches: diff -Nru nautilus-dropbox-2015.10.28/debian/patches/fix-budgie-indicator-menu.patch nautilus-dropbox-2015.10.28/debian/patches/fix-budgie-indicator-menu.patch --- nautilus-dropbox-2015.10.28/debian/patches/fix-budgie-indicator-menu.patch 1970-01-01 00:00:00.000000000 +0000 +++ nautilus-dropbox-2015.10.28/debian/patches/fix-budgie-indicator-menu.patch 2017-05-22 09:46:08.000000000 +0000 @@ -0,0 +1,24 @@ +Description: Coerce XDG_CURRENT_DESKTOP to "Unity". (LP: #1683051) +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" for the budgie-desktop +Author: David Mohammed +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1683051 +Index: nautilus-dropbox-2015.10.28/dropbox.in +=================================================================== +--- nautilus-dropbox-2015.10.28.orig/dropbox.in ++++ nautilus-dropbox-2015.10.28/dropbox.in +@@ -745,8 +745,11 @@ def start_dropbox(): + f = open("/dev/null", "w") + + # Fix indicator icon and menu on Unity environments. (LP: #1559249) ++ # Fix indicator icon and menu in Budgie environment. (LP: #1683051) + new_env = os.environ.copy() +- if 'Unity' in os.environ.get("XDG_CURRENT_DESKTOP", '').split(":"): ++ current_env = os.environ.get("XDG_CURRENT_DESKTOP", '').split(":") ++ to_check = ['Unity', 'Budgie'] ++ if any(word in to_check for word in current_env): + new_env['XDG_CURRENT_DESKTOP'] = 'Unity' + + # we don't reap the child because we're gonna die anyway, let init do it 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 2017-03-27 18:11:18.000000000 +0000 +++ nautilus-dropbox-2015.10.28/debian/patches/series 2017-05-22 09:46:08.000000000 +0000 @@ -14,3 +14,4 @@ # Patches below are not really upstreamable non-interactive-update.patch use-dpkg-to-select-platform.patch +fix-budgie-indicator-menu.patch