Debian

Available patches from Ubuntu

To see Ubuntu differences wrt. to Debian, write down a grep-dctrl query identifying the packages you're interested in:
grep-dctrl -n -sPackage Sources.Debian
(e.g. -FPackage linux-ntfs or linux-ntfs)

Modified packages are listed below:

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: nautilus-dropbox

nautilus-dropbox (2019.02.14-1ubuntu1) focal; urgency=low * Merge from Debian unstable. Remaining changes: + 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. -- Gianfranco Costamagna <locutusofborg@debian.org> Fri, 06 Dec 2019 22:55:34 +0100

Modifications :
  1. Download patch debian/patches/fix-budgie-indicator-menu.patch

    --- 2019.02.14-1/debian/patches/fix-budgie-indicator-menu.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2019.02.14-1ubuntu1/debian/patches/fix-budgie-indicator-menu.patch 2019-12-06 21:55:31.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 <fossfreedom@ubuntu.com> +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1683051 +Index: nautilus-dropbox-2019.02.14-1ubuntu1/dropbox.in +=================================================================== +--- nautilus-dropbox-2019.02.14-1ubuntu1.orig/dropbox.in ++++ nautilus-dropbox-2019.02.14-1ubuntu1/dropbox.in +@@ -751,8 +751,11 @@ + 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
  2. Download patch debian/patches/series

    --- 2019.02.14-1/debian/patches/series 2019-07-10 06:22:08.000000000 +0000 +++ 2019.02.14-1ubuntu1/debian/patches/series 2019-12-06 21:51:25.000000000 +0000 @@ -1,8 +1,10 @@ dropbox-update.patch #display-error-string-when-download-failed.patch add-http-proxy-option.patch +fix-unity-indicator-menu.patch # Patches above should really be integrated upstream # Patches below are not really upstreamable non-interactive-update.patch use-dpkg-to-select-platform.patch +fix-budgie-indicator-menu.patch
  3. Download patch debian/patches/fix-unity-indicator-menu.patch

    --- 2019.02.14-1/debian/patches/fix-unity-indicator-menu.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2019.02.14-1ubuntu1/debian/patches/fix-unity-indicator-menu.patch 2019-12-06 21:55:20.000000000 +0000 @@ -0,0 +1,30 @@ +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 <martin.wimpress@ubuntu.com> +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1559249 + +Index: nautilus-dropbox-2019.02.14-1ubuntu1/dropbox.in +=================================================================== +--- nautilus-dropbox-2019.02.14-1ubuntu1.orig/dropbox.in ++++ nautilus-dropbox-2019.02.14-1ubuntu1/dropbox.in +@@ -750,9 +750,15 @@ + def start_dropbox(): + if os.access(DROPBOXD_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 + subprocess.Popen([DROPBOXD_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
  1. nautilus-dropbox