diff -Nru nautilus-dropbox-2.10.0/AUTHORS nautilus-dropbox-2015.10.28/AUTHORS --- nautilus-dropbox-2.10.0/AUTHORS 2010-04-08 23:21:32.000000000 +0000 +++ nautilus-dropbox-2015.10.28/AUTHORS 2015-10-28 21:45:02.000000000 +0000 @@ -1,3 +1,9 @@ -Rian Hunter -Mike Haimes -David Euresti \ No newline at end of file +Rian Hunter +Mike Haimes +David Euresti +Andrew Drake +Dwayne Litzenberger +Jie Tang +Josiah Boning +Max Belanger +Ryan J. Kaplan diff -Nru nautilus-dropbox-2.10.0/ChangeLog nautilus-dropbox-2015.10.28/ChangeLog --- nautilus-dropbox-2.10.0/ChangeLog 2011-11-11 21:13:56.000000000 +0000 +++ nautilus-dropbox-2015.10.28/ChangeLog 2015-10-28 21:48:27.000000000 +0000 @@ -1,5 +1,24 @@ -This file isn't a real ChangeLog, we use our code commits for details on technical changes. -This changelog is a list of logical changes and bug fixes. +# Change Log +All notable changes to this project will be documented in this file. +Date based versioning is now used in this project. This is so that it doesn't get confused with the Dropbox desktop client. + +## [Unreleased] + +## [2015.10.28] +### Added +- Support for `sharelink`, `proxy`, and `throttle` CLI commands. +- Support for Fedora 22 +- Support for Ubuntu 15.10 + +## [2015.02.12] +### Added +- Support for Fedora 21 +- Support for Ubuntu 15.04 and 14.10 + +### Changed +- New version numbering format + +## Old Change Log. Version 0.7.1 (11/11/11): ------------------------ diff -Nru nautilus-dropbox-2.10.0/configure nautilus-dropbox-2015.10.28/configure --- nautilus-dropbox-2.10.0/configure 2014-11-17 21:50:50.000000000 +0000 +++ nautilus-dropbox-2015.10.28/configure 2015-10-28 21:49:45.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.64 for nautilus-dropbox 2.10.0. +# Generated by GNU Autoconf 2.64 for nautilus-dropbox 2015.10.28. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software @@ -695,8 +695,8 @@ # Identity of this package. PACKAGE_NAME='nautilus-dropbox' PACKAGE_TARNAME='nautilus-dropbox' -PACKAGE_VERSION='2.10.0' -PACKAGE_STRING='nautilus-dropbox 2.10.0' +PACKAGE_VERSION='2015.10.28' +PACKAGE_STRING='nautilus-dropbox 2015.10.28' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1426,7 +1426,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures nautilus-dropbox 2.10.0 to adapt to many kinds of systems. +\`configure' configures nautilus-dropbox 2015.10.28 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1497,7 +1497,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of nautilus-dropbox 2.10.0:";; + short | recursive ) echo "Configuration of nautilus-dropbox 2015.10.28:";; esac cat <<\_ACEOF @@ -1606,7 +1606,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -nautilus-dropbox configure 2.10.0 +nautilus-dropbox configure 2015.10.28 generated by GNU Autoconf 2.64 Copyright (C) 2009 Free Software Foundation, Inc. @@ -1884,7 +1884,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by nautilus-dropbox $as_me 2.10.0, which was +It was created by nautilus-dropbox $as_me 2015.10.28, which was generated by GNU Autoconf 2.64. Invocation command line was $ $0 $@ @@ -2693,7 +2693,7 @@ # Define the identity of the package. PACKAGE=nautilus-dropbox - VERSION=2.10.0 + VERSION=2015.10.28 cat >>confdefs.h <<_ACEOF @@ -11466,7 +11466,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by nautilus-dropbox $as_me 2.10.0, which was +This file was extended by nautilus-dropbox $as_me 2015.10.28, which was generated by GNU Autoconf 2.64. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -11530,7 +11530,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -nautilus-dropbox config.status 2.10.0 +nautilus-dropbox config.status 2015.10.28 configured by $0, generated by GNU Autoconf 2.64, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -Nru nautilus-dropbox-2.10.0/configure.in nautilus-dropbox-2015.10.28/configure.in --- nautilus-dropbox-2.10.0/configure.in 2014-11-17 21:45:36.000000000 +0000 +++ nautilus-dropbox-2015.10.28/configure.in 2015-10-28 21:45:02.000000000 +0000 @@ -1,6 +1,6 @@ # Initialization -AC_INIT([nautilus-dropbox],2.10.0) +AC_INIT([nautilus-dropbox],2015.10.28) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) diff -Nru nautilus-dropbox-2.10.0/debian/changelog nautilus-dropbox-2015.10.28/debian/changelog --- nautilus-dropbox-2.10.0/debian/changelog 2016-01-31 21:04:05.000000000 +0000 +++ nautilus-dropbox-2015.10.28/debian/changelog 2016-09-24 17:38:46.000000000 +0000 @@ -1,3 +1,20 @@ +nautilus-dropbox (2015.10.28-1) unstable; urgency=medium + + * [788b88a] Imported Upstream version 2015.10.28 + + -- Luke Faraone Sat, 24 Sep 2016 17:38:46 +0000 + +nautilus-dropbox (2.10.0-3) unstable; urgency=medium + + [ Jeremy Bicha ] + * [8fdd287] Adapt to nautilus multi-archification (Closes: #838747) + + [ Luke W Faraone ] + * [752fde3] Move Depends: on gpgme to a Recommends: since GPGME isn't needed + and currently FTBFS. + + -- Luke Faraone Sat, 24 Sep 2016 17:16:43 +0000 + nautilus-dropbox (2.10.0-2) unstable; urgency=medium * Upload to unstable. diff -Nru nautilus-dropbox-2.10.0/debian/control nautilus-dropbox-2015.10.28/debian/control --- nautilus-dropbox-2.10.0/debian/control 2016-01-31 20:57:07.000000000 +0000 +++ nautilus-dropbox-2015.10.28/debian/control 2016-09-24 17:36:38.000000000 +0000 @@ -18,12 +18,12 @@ Architecture: amd64 i386 Depends: policykit-1, procps, - python-gpgme, python-gtk2 (>= 2.12), ${misc:Depends}, ${python:Depends}, ${shlibs:Depends} -Recommends: libappindicator1 +Recommends: libappindicator1, + python-gpgme, Suggests: nautilus Conflicts: dropbox Description: Dropbox integration for Nautilus diff -Nru nautilus-dropbox-2.10.0/debian/patches/add-http-proxy-option.patch nautilus-dropbox-2015.10.28/debian/patches/add-http-proxy-option.patch --- nautilus-dropbox-2.10.0/debian/patches/add-http-proxy-option.patch 2016-01-31 20:38:32.000000000 +0000 +++ nautilus-dropbox-2015.10.28/debian/patches/add-http-proxy-option.patch 2016-09-24 17:37:26.000000000 +0000 @@ -5,11 +5,9 @@ Origin: vendor Bug-Debian: http://bugs.debian.org/651065 -Index: nautilus-dropbox/dropbox.in -=================================================================== ---- nautilus-dropbox.orig/dropbox.in 2014-05-03 00:52:58.016085663 +0800 -+++ nautilus-dropbox/dropbox.in 2014-05-03 00:52:58.013085677 +0800 -@@ -1395,8 +1395,22 @@ +--- a/dropbox.in ++++ b/dropbox.in +@@ -1542,8 +1542,22 @@ os._exit(0) return diff -Nru nautilus-dropbox-2.10.0/debian/patches/display-error-string-when-download-failed.patch nautilus-dropbox-2015.10.28/debian/patches/display-error-string-when-download-failed.patch --- nautilus-dropbox-2.10.0/debian/patches/display-error-string-when-download-failed.patch 2016-01-31 20:38:32.000000000 +0000 +++ nautilus-dropbox-2015.10.28/debian/patches/display-error-string-when-download-failed.patch 2016-09-24 17:37:27.000000000 +0000 @@ -8,10 +8,8 @@ Last-Update: 2012-08-08 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: nautilus-dropbox/dropbox.in -=================================================================== ---- nautilus-dropbox.orig/dropbox.in 2014-05-03 00:52:54.149103491 +0800 -+++ nautilus-dropbox/dropbox.in 2014-05-03 00:52:54.147103500 +0800 +--- a/dropbox.in ++++ b/dropbox.in @@ -236,17 +236,27 @@ else: raise diff -Nru nautilus-dropbox-2.10.0/debian/patches/do-not-hardcode-dropboxd-path.patch nautilus-dropbox-2015.10.28/debian/patches/do-not-hardcode-dropboxd-path.patch --- nautilus-dropbox-2.10.0/debian/patches/do-not-hardcode-dropboxd-path.patch 2016-01-31 20:38:32.000000000 +0000 +++ nautilus-dropbox-2015.10.28/debian/patches/do-not-hardcode-dropboxd-path.patch 2016-09-24 17:37:28.000000000 +0000 @@ -2,10 +2,8 @@ Author: Raphaël Hertzog Origin: vendor -Index: nautilus-dropbox/dropbox.in -=================================================================== ---- nautilus-dropbox.orig/dropbox.in 2014-05-03 00:52:45.294144315 +0800 -+++ nautilus-dropbox/dropbox.in 2014-05-03 00:52:45.287144347 +0800 +--- a/dropbox.in ++++ b/dropbox.in @@ -727,7 +727,7 @@ return newmeth diff -Nru nautilus-dropbox-2.10.0/debian/patches/dropbox-update.patch nautilus-dropbox-2015.10.28/debian/patches/dropbox-update.patch --- nautilus-dropbox-2.10.0/debian/patches/dropbox-update.patch 2016-01-31 20:38:32.000000000 +0000 +++ nautilus-dropbox-2015.10.28/debian/patches/dropbox-update.patch 2016-09-24 17:37:27.000000000 +0000 @@ -4,10 +4,8 @@ Author: Raphaël Hertzog Origin: vendor -Index: nautilus-dropbox/dropbox.in -=================================================================== ---- nautilus-dropbox.orig/dropbox.in 2014-05-03 00:52:50.149121932 +0800 -+++ nautilus-dropbox/dropbox.in 2014-05-03 00:52:50.144121955 +0800 +--- a/dropbox.in ++++ b/dropbox.in @@ -823,6 +823,15 @@ console_print(line) diff -Nru nautilus-dropbox-2.10.0/debian/patches/fix-gdk-threads-init-crash.patch nautilus-dropbox-2015.10.28/debian/patches/fix-gdk-threads-init-crash.patch --- nautilus-dropbox-2.10.0/debian/patches/fix-gdk-threads-init-crash.patch 2016-01-31 20:38:32.000000000 +0000 +++ nautilus-dropbox-2015.10.28/debian/patches/fix-gdk-threads-init-crash.patch 2016-09-24 17:37:25.000000000 +0000 @@ -2,10 +2,8 @@ Subject: Fix gdk_threads_init crash Bug-Debian: http://bugs.debian.org/763724 Forwarded: no -Index: nautilus-dropbox/dropbox.in -=================================================================== ---- nautilus-dropbox.orig/dropbox.in 2014-10-03 11:51:01.472492588 +0800 -+++ nautilus-dropbox/dropbox.in 2014-10-03 11:55:57.429265924 +0800 +--- a/dropbox.in ++++ b/dropbox.in @@ -297,7 +297,7 @@ import pango import webbrowser diff -Nru nautilus-dropbox-2.10.0/debian/patches/non-interactive-update.patch nautilus-dropbox-2015.10.28/debian/patches/non-interactive-update.patch --- nautilus-dropbox-2.10.0/debian/patches/non-interactive-update.patch 2016-01-31 20:38:32.000000000 +0000 +++ nautilus-dropbox-2015.10.28/debian/patches/non-interactive-update.patch 2016-09-24 17:37:24.000000000 +0000 @@ -7,10 +7,8 @@ Forwarded: not-needed Origin: vendor -Index: nautilus-dropbox/dropbox.in -=================================================================== ---- nautilus-dropbox.orig/dropbox.in 2014-09-13 21:46:10.283017536 +0800 -+++ nautilus-dropbox/dropbox.in 2014-09-13 21:46:10.280017542 +0800 +--- a/dropbox.in ++++ b/dropbox.in @@ -561,9 +561,6 @@ console_print(u"%s %s\n" % (INFO, LINK)) GPG_WARNING_MSG = (u"\n%s" % GPG_WARNING) if not gpgme else u"" diff -Nru nautilus-dropbox-2.10.0/debian/patches/unlink-before-extract.patch nautilus-dropbox-2015.10.28/debian/patches/unlink-before-extract.patch --- nautilus-dropbox-2.10.0/debian/patches/unlink-before-extract.patch 2016-01-31 20:38:32.000000000 +0000 +++ nautilus-dropbox-2015.10.28/debian/patches/unlink-before-extract.patch 2016-09-24 17:37:29.000000000 +0000 @@ -4,10 +4,8 @@ Author: Raphaël Hertzog Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/nautilus-dropbox/+bug/818014 -Index: nautilus-dropbox/dropbox.in -=================================================================== ---- nautilus-dropbox.orig/dropbox.in 2013-09-23 02:11:59.078433379 +0800 -+++ nautilus-dropbox/dropbox.in 2013-09-23 02:11:59.074433400 +0800 +--- a/dropbox.in ++++ b/dropbox.in @@ -259,6 +259,9 @@ archive = tarfile.open(fileobj=self.local_file, mode='r:gz') total_members = len(archive.getmembers()) diff -Nru nautilus-dropbox-2.10.0/debian/patches/use-dpkg-to-select-platform.patch nautilus-dropbox-2015.10.28/debian/patches/use-dpkg-to-select-platform.patch --- nautilus-dropbox-2.10.0/debian/patches/use-dpkg-to-select-platform.patch 2016-01-31 20:38:32.000000000 +0000 +++ nautilus-dropbox-2015.10.28/debian/patches/use-dpkg-to-select-platform.patch 2016-09-24 17:37:23.000000000 +0000 @@ -8,10 +8,8 @@ Origin: vendor Forwarded: not-needed -Index: nautilus-dropbox/dropbox.in -=================================================================== ---- nautilus-dropbox.orig/dropbox.in 2013-09-23 02:12:03.068413169 +0800 -+++ nautilus-dropbox/dropbox.in 2013-09-23 02:12:03.064413189 +0800 +--- a/dropbox.in ++++ b/dropbox.in @@ -145,13 +145,13 @@ def plat(): diff -Nru nautilus-dropbox-2.10.0/debian/rules nautilus-dropbox-2015.10.28/debian/rules --- nautilus-dropbox-2.10.0/debian/rules 2016-01-31 20:38:32.000000000 +0000 +++ nautilus-dropbox-2015.10.28/debian/rules 2016-09-24 17:36:38.000000000 +0000 @@ -8,10 +8,10 @@ override_dh_makeshlibs: # Don't generate a shlibs file for the plugin - dh_makeshlibs -X/usr/lib/nautilus/ + dh_makeshlibs -X/usr/lib/$(DEB_HOST_MULTIARCH)/nautilus/ override_dh_auto_install: dh_auto_install # Drop useless files - rm -f debian/nautilus-dropbox/usr/lib/nautilus/extensions-*/libnautilus-dropbox.a - rm -f debian/nautilus-dropbox/usr/lib/nautilus/extensions-*/libnautilus-dropbox.la + rm -f debian/nautilus-dropbox/usr/lib/$(DEB_HOST_MULTIARCH)/nautilus/extensions-*/libnautilus-dropbox.a + rm -f debian/nautilus-dropbox/usr/lib/$(DEB_HOST_MULTIARCH)/nautilus/extensions-*/libnautilus-dropbox.la diff -Nru nautilus-dropbox-2.10.0/dropbox.in nautilus-dropbox-2015.10.28/dropbox.in --- nautilus-dropbox-2.10.0/dropbox.in 2014-04-18 18:27:39.000000000 +0000 +++ nautilus-dropbox-2015.10.28/dropbox.in 2015-10-28 21:45:02.000000000 +0000 @@ -995,10 +995,10 @@ @command @requires_dropbox_running def puburl(args): - u"""get public url of a file in your dropbox + u"""get public url of a file in your dropbox's public folder dropbox puburl FILE -Prints out a public url for FILE. +Prints out a public url for FILE (which must be in your public folder). """ if len(args) != 1: console_print(puburl.__doc__,linebreak=False) @@ -1013,6 +1013,153 @@ except DropboxCommand.BadConnectionError, e: console_print(u"Dropbox isn't responding!") except DropboxCommand.EOFError: + console_print(u"Dropbox daemon stopped.") + except DropboxCommand.CouldntConnectError, e: + console_print(u"Dropbox isn't running!") + +@command +@requires_dropbox_running +def sharelink(args): + u"""get a shared link for a file in your dropbox +dropbox sharelink FILE + +Prints out a shared link for FILE. +""" + if len(args) != 1: + console_print(sharelink.__doc__, linebreak=False) + return + + try: + with closing(DropboxCommand()) as dc: + try: + path = unicode_abspath(args[0].decode(sys.getfilesystemencoding())) + link = dc.get_shared_link(path=path).get('link', [u'No link'])[0] + console_print(link) + except DropboxCommand.CommandError, e: + console_print(u"Couldn't get shared link: " + str(e)) + except DropboxCommand.BadConnectionError, e: + console_print(u"Dropbox isn't responding!") + except DropboxCommand.EOFError: + console_print(u"Dropbox daemon stopped.") + except DropboxCommand.CouldntConnectError, e: + console_print(u"Dropbox isn't running!") + +@command +@requires_dropbox_running +def proxy(args): + u"""set proxy settings for Dropbox +dropbox proxy MODE [TYPE] [HOST] [PORT] [USERNAME] [PASSWORD] + +Set proxy settings for Dropbox. + +MODE - one of "none", "auto", "manual" +TYPE - one of "http", "socks4", "socks5" (only valid with "manual" mode) +HOST - proxy hostname (only valid with "manual" mode) +PORT - proxy port (only valid with "manual" mode) +USERNAME - (optional) proxy username (only valid with "manual" mode) +PASSWORD - (optional) proxy password (only valid with "manual" mode) +""" + mode = None + type_ = None + if len(args) >= 1: + mode = args[0].decode(sys.getfilesystemencoding()).lower() + if len(args) >= 2: + type_ = args[1].decode(sys.getfilesystemencoding()).lower() + + if (len(args) == 0 or + mode not in [u'none', u'auto', u'manual'] or + (mode == 'manual' and len(args) not in (4, 6)) or + (mode != 'manual' and len(args) != 1) or + (mode == 'manual' and type_ not in [u'http', u'socks4', u'socks5'])): + # Print help + console_print(proxy.__doc__, linebreak=False) + return + + ARGS = ['mode', 'type', 'host', 'port', 'username', 'password'] + + # Load the args into a dictionary + kwargs = dict(zip(ARGS, [a.decode(sys.getfilesystemencoding()) for a in args])) + + # Re-set these two because they were coerced to lower case + kwargs['mode'] = mode + if type_: + kwargs['type'] = type_ + + try: + with closing(DropboxCommand()) as dc: + try: + dc.set_proxy_settings(**kwargs) + console_print(u'set') + except DropboxCommand.CommandError, e: + console_print(u"Couldn't set proxy: " + str(e)) + except DropboxCommand.BadConnectionError, e: + console_print(u"Dropbox isn't responding!") + except DropboxCommand.EOFError: + console_print(u"Dropbox daemon stopped.") + except DropboxCommand.CouldntConnectError, e: + console_print(u"Dropbox isn't running!") + +@command +@requires_dropbox_running +def throttle(args): + u"""set bandwidth limits for Dropbox +dropbox throttle DOWNLOAD UPLOAD + +Set bandwidth limits for file sync. + +DOWNLOAD - either "unlimited" or a manual limit in KB/s +UPLOAD - one of "unlimited", "auto", or a manual limit in KB/s +""" + if len(args) != 2: + console_print(throttle.__doc__, linebreak=False) + return + + downlimit = args[0].decode(sys.getfilesystemencoding()).lower() + uplimit = args[1].decode(sys.getfilesystemencoding()).lower() + + download_limit = None + download_mode = None + if downlimit == u'unlimited': + download_mode = downlimit + else: + try: + download_limit = int(downlimit) + download_mode = u'manual' + except ValueError: + console_print(throttle.__doc__, linebreak=False) + return + + upload_limit = None + upload_mode = None + if uplimit in [u'unlimited', u'auto']: + upload_mode = uplimit + else: + try: + upload_limit = int(uplimit) + upload_mode = u'manual' + except ValueError: + console_print(throttle.__doc__, linebreak=False) + return + + kwargs = { + u'download_mode': download_mode, + u'upload_mode': upload_mode, + } + if download_limit: + kwargs[u'download_limit'] = unicode(download_limit) + if upload_limit: + kwargs[u'upload_limit'] = unicode(upload_limit) + + try: + with closing(DropboxCommand()) as dc: + try: + dc.set_bandwidth_limits(**kwargs) + console_print(u'set') + except DropboxCommand.CommandError, e: + console_print(u"Couldn't set bandwidth limits: " + str(e)) + except DropboxCommand.BadConnectionError, e: + console_print(u"Dropbox isn't responding!") + except DropboxCommand.EOFError: console_print(u"Dropbox daemon stopped.") except DropboxCommand.CouldntConnectError, e: console_print(u"Dropbox isn't running!") diff -Nru nautilus-dropbox-2.10.0/README nautilus-dropbox-2015.10.28/README --- nautilus-dropbox-2.10.0/README 2013-01-23 22:20:59.000000000 +0000 +++ nautilus-dropbox-2015.10.28/README 2015-10-28 21:45:02.000000000 +0000 @@ -8,7 +8,7 @@ Check us out at https://www.dropbox.com/ <3, -Rian Hunter and the rest of the Dropbox Team +The Dropbox Team Building Dropbox Nautilus Extension From Source Tarball -------------------------------------------------- diff -Nru nautilus-dropbox-2.10.0/src/nautilus-dropbox-hooks.c nautilus-dropbox-2015.10.28/src/nautilus-dropbox-hooks.c --- nautilus-dropbox-2.10.0/src/nautilus-dropbox-hooks.c 2010-04-08 23:21:32.000000000 +0000 +++ nautilus-dropbox-2015.10.28/src/nautilus-dropbox-hooks.c 2015-10-28 21:45:02.000000000 +0000 @@ -158,7 +158,7 @@ /* set native non-blocking, for connect timeout */ { - unsigned int flags; + int flags; if ((flags = fcntl(hookserv->socket, F_GETFL, 0)) < 0) { goto FAIL_CLEANUP;