Bug#686755: unblock: nautilus-dropbox/1.4.0-2
On Wed, 05 Sep 2012, Raphaël Hertzog wrote:
> Please unblock package nautilus-dropbox
I forgot the debdiff. It's attached.
Cheers,
--
Raphaël Hertzog ◈ Debian Developer
Get the Debian Administrator's Handbook:
→ http://debian-handbook.info/get/
diff -Nru nautilus-dropbox-0.7.1/configure nautilus-dropbox-1.4.0/configure
--- nautilus-dropbox-0.7.1/configure 2011-11-11 22:14:00.000000000 +0100
+++ nautilus-dropbox-1.4.0/configure 2012-04-26 05:37:09.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64 for nautilus-dropbox 0.7.1.
+# Generated by GNU Autoconf 2.64 for nautilus-dropbox 1.4.0.
#
# 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='0.7.1'
-PACKAGE_STRING='nautilus-dropbox 0.7.1'
+PACKAGE_VERSION='1.4.0'
+PACKAGE_STRING='nautilus-dropbox 1.4.0'
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 0.7.1 to adapt to many kinds of systems.
+\`configure' configures nautilus-dropbox 1.4.0 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 0.7.1:";;
+ short | recursive ) echo "Configuration of nautilus-dropbox 1.4.0:";;
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 0.7.1
+nautilus-dropbox configure 1.4.0
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 0.7.1, which was
+It was created by nautilus-dropbox $as_me 1.4.0, 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=0.7.1
+ VERSION=1.4.0
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 0.7.1, which was
+This file was extended by nautilus-dropbox $as_me 1.4.0, 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 0.7.1
+nautilus-dropbox config.status 1.4.0
configured by $0, generated by GNU Autoconf 2.64,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -Nru nautilus-dropbox-0.7.1/configure.in nautilus-dropbox-1.4.0/configure.in
--- nautilus-dropbox-0.7.1/configure.in 2011-11-11 22:13:56.000000000 +0100
+++ nautilus-dropbox-1.4.0/configure.in 2012-04-26 05:12:50.000000000 +0200
@@ -1,6 +1,6 @@
# Initialization
-AC_INIT([nautilus-dropbox],0.7.1)
+AC_INIT([nautilus-dropbox],1.4.0)
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
diff -Nru nautilus-dropbox-0.7.1/debian/changelog nautilus-dropbox-1.4.0/debian/changelog
--- nautilus-dropbox-0.7.1/debian/changelog 2011-12-28 12:38:52.000000000 +0100
+++ nautilus-dropbox-1.4.0/debian/changelog 2012-08-12 15:43:16.000000000 +0200
@@ -1,3 +1,23 @@
+nautilus-dropbox (1.4.0-2) unstable; urgency=low
+
+ * Update add-http-proxy-option.patch and use-pkexec-to-get-root-
+ rights.patch to support and handle --https-proxy option too. Dropbox
+ now redirects the download URL to an https URL so it might be needed
+ to get the download working in some situations.
+ * Add display-error-string-when-download-failed.patch to provide more
+ information when the download failed. It makes it easier to respond
+ to user support requests.
+
+ -- Raphaël Hertzog <hertzog@debian.org> Sun, 12 Aug 2012 15:40:00 +0200
+
+nautilus-dropbox (1.4.0-1) unstable; urgency=low
+
+ * New upstream release (without any change... just to increase
+ the version number above the version that was in Ubuntu LTS).
+ * Update Standards-Version to 3.9.3 (no change needed).
+
+ -- Raphaël Hertzog <hertzog@debian.org> Mon, 09 Jul 2012 09:49:31 +0200
+
nautilus-dropbox (0.7.1-2) unstable; urgency=low
* Update watch file to cope with changes on the dropbox website.
diff -Nru nautilus-dropbox-0.7.1/debian/control nautilus-dropbox-1.4.0/debian/control
--- nautilus-dropbox-0.7.1/debian/control 2011-12-28 12:38:52.000000000 +0100
+++ nautilus-dropbox-1.4.0/debian/control 2012-08-12 15:43:16.000000000 +0200
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Raphaël Hertzog <hertzog@debian.org>
Build-Depends: debhelper (>= 8), libnautilus-extension-dev (>= 2.16.0), libglib2.0-dev (>= 2.14.0), python-gtk2 (>= 2.12), python-docutils (>= 0.6), python (>= 2.6.6-3~), dh-autoreconf
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
XS-Autobuild: yes
Homepage: http://www.dropbox.com/
Vcs-Git: git://git.debian.org/collab-maint/nautilus-dropbox.git
diff -Nru nautilus-dropbox-0.7.1/debian/patches/add-http-proxy-option.patch nautilus-dropbox-1.4.0/debian/patches/add-http-proxy-option.patch
--- nautilus-dropbox-0.7.1/debian/patches/add-http-proxy-option.patch 2011-12-28 12:38:52.000000000 +0100
+++ nautilus-dropbox-1.4.0/debian/patches/add-http-proxy-option.patch 2012-08-12 15:43:16.000000000 +0200
@@ -7,7 +7,7 @@
--- a/dropbox.in
+++ b/dropbox.in
-@@ -1351,8 +1351,15 @@ def main(argv):
+@@ -1351,8 +1351,22 @@ def main(argv):
os._exit(0)
return
@@ -18,9 +18,16 @@
+ # Need to reset _urlopener to take the new value into account
+ urllib._urlopener = DropboxURLopener()
+
++ def set_https_proxy(option, opt_str, value, parser):
++ os.environ["https_proxy"] = value
++ # Need to reset _urlopener to take the new value into account
++ urllib._urlopener = DropboxURLopener()
++
globaloptionparser = optparse.OptionParser()
+ globaloptionparser.add_option("--http-proxy", action="callback",
+ type="string", callback=set_http_proxy)
++ globaloptionparser.add_option("--https-proxy", action="callback",
++ type="string", callback=set_https_proxy)
globaloptionparser.parse_args(argv[0:i])
# now dispatch and run
diff -Nru nautilus-dropbox-0.7.1/debian/patches/display-error-string-when-download-failed.patch nautilus-dropbox-1.4.0/debian/patches/display-error-string-when-download-failed.patch
--- nautilus-dropbox-0.7.1/debian/patches/display-error-string-when-download-failed.patch 1970-01-01 01:00:00.000000000 +0100
+++ nautilus-dropbox-1.4.0/debian/patches/display-error-string-when-download-failed.patch 2012-08-12 15:43:16.000000000 +0200
@@ -0,0 +1,55 @@
+Description: Give more info about download failures
+ When you have to diagnose download failures, you need some basic
+ information about the user's configuration. Print those
+ information in the error message.
+Author: Raphaël Hertzog <hertzog@debian.org>
+Origin: vendor
+Forwarded: no
+Last-Update: 2012-08-08
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/dropbox.in
++++ b/dropbox.in
+@@ -222,8 +222,9 @@ def download_file_chunk(socket, buf, siz
+ def download_uri_to_buffer(uri):
+ try:
+ socket = urllib.urlopen(uri)
+- except IOError:
+- FatalVisibleError("Trouble connecting to Dropbox servers. Maybe your internet connection is down, or you need to set your http_proxy environment variable.")
++ except IOError as e:
++ debug_info = get_download_debug_info(uri, e)
++ FatalVisibleError("Trouble connecting to Dropbox servers. Maybe your internet connection is down, or you need to set your http_proxy environment variable.\n%s" % debug_info)
+
+ fcntl.fcntl(socket, fcntl.F_SETFL, os.O_NONBLOCK)
+ size = int(socket.info()['content-length'])
+@@ -237,6 +238,14 @@ def download_uri_to_buffer(uri):
+ buf.seek(0)
+ return buf
+
++def get_download_debug_info(url, e):
++ msg = "\nURL that failed to download: %s\nError: %s\n" % (url, e.strerror)
++ if "http_proxy" in os.environ:
++ msg += "http_proxy = %s" % os.environ["http_proxy"]
++ if "https_proxy" in os.environ:
++ msg += "https_proxy = %s" % os.environ["https_proxy"]
++ return msg
++
+ # This sets a custom User-Agent
+ class DropboxURLopener(urllib.FancyURLopener):
+ version = "DropboxLinuxDownloader/@PACKAGE_VERSION@"
+@@ -244,10 +253,12 @@ urllib._urlopener = DropboxURLopener()
+
+ class DownloadState(object):
+ def __init__(self):
++ url = "http://www.dropbox.com/download?plat=%s"; % plat()
+ try:
+- self.socket = urllib.urlopen("http://www.dropbox.com/download?plat=%s"; % plat())
+- except IOError:
+- FatalVisibleError("Trouble connecting to Dropbox servers. Maybe your internet connection is down, or you need to set your http_proxy environment variable")
++ self.socket = urllib.urlopen(url)
++ except IOError as e:
++ debug_info = get_download_debug_info(url, e)
++ FatalVisibleError("Trouble connecting to Dropbox servers. Maybe your internet connection is down, or you need to set your http_proxy environment variable.\n%s" % debug_info)
+
+ fcntl.fcntl(self.socket, fcntl.F_SETFL, os.O_NONBLOCK)
+ self.size = int(self.socket.info()['content-length'])
diff -Nru nautilus-dropbox-0.7.1/debian/patches/series nautilus-dropbox-1.4.0/debian/patches/series
--- nautilus-dropbox-0.7.1/debian/patches/series 2011-12-28 12:38:52.000000000 +0100
+++ nautilus-dropbox-1.4.0/debian/patches/series 2012-08-12 15:43:16.000000000 +0200
@@ -1,6 +1,7 @@
unlink-before-extract.patch
do-not-hardcode-dropboxd-path.patch
dropbox-update.patch
+display-error-string-when-download-failed.patch
# Patches above should really be integrated upstream
add-http-proxy-option.patch
use-var-lib-dropbox.patch
diff -Nru nautilus-dropbox-0.7.1/debian/patches/use-pkexec-to-get-root-rights.patch nautilus-dropbox-1.4.0/debian/patches/use-pkexec-to-get-root-rights.patch
--- nautilus-dropbox-0.7.1/debian/patches/use-pkexec-to-get-root-rights.patch 2011-12-28 12:38:52.000000000 +0100
+++ nautilus-dropbox-1.4.0/debian/patches/use-pkexec-to-get-root-rights.patch 2012-08-12 15:43:16.000000000 +0200
@@ -6,7 +6,7 @@
--- a/dropbox.in
+++ b/dropbox.in
-@@ -1239,7 +1239,14 @@ options:
+@@ -1239,7 +1239,16 @@ options:
# install dropbox!!!
try:
@@ -14,6 +14,8 @@
+ args = [ "pkexec", "dropbox" ]
+ if "http_proxy" in os.environ:
+ args.extend(["--http-proxy", os.environ["http_proxy"]])
++ if "https_proxy" in os.environ:
++ args.extend(["--https-proxy", os.environ["https_proxy"]])
+ args.append("update")
+ status = os.spawnvp(os.P_WAIT, "pkexec", args)
+ if status != 0:
Reply to: