[caja-dropbox] 03/07: debian/patches: Enable all nautilus-dropbox patches by Raphaël Hertzog. All applied cleanly with a little fuzz only, all of them are still valid.

Fri Jun 19 14:03:22 UTC 2015

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch debian/experimental
in repository caja-dropbox.

commit 51165a741b4bc90ab15640158623d7e9178cf870
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Jun 19 15:49:28 2015 +0200

    debian/patches: Enable all nautilus-dropbox patches by Raphaël Hertzog. All applied cleanly with a little fuzz only, all of them are still valid.
---
 ...re-extract.patch => 1001_unlink-before-extract.patch} |  6 +++---
 ...th.patch => 1002_do-not-hardcode-dropboxd-path.patch} |  6 +++---
 .../{dropbox-update.patch => 1003_dropbox-update.patch}  |  6 +++---
 ...oxy-option.patch => 1004_add-http-proxy-option.patch} |  6 +++---
 ...-lib-dropbox.patch => 1005_use-var-lib-dropbox.patch} | 10 +++++-----
 ...ts.patch => 1006_use-pkexec-to-get-root-rights.patch} |  8 ++++----
 ...ve-update.patch => 2001_non-interactive-update.patch} |  8 ++++----
 ...form.patch => 2002_use-dpkg-to-select-platform.patch} |  6 +++---
 debian/patches/series                                    | 16 ++++++++--------
 9 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/debian/patches/unlink-before-extract.patch b/debian/patches/1001_unlink-before-extract.patch
similarity index 90%
rename from debian/patches/unlink-before-extract.patch
rename to debian/patches/1001_unlink-before-extract.patch
index af78335..0267d02 100644
--- a/debian/patches/unlink-before-extract.patch
+++ b/debian/patches/1001_unlink-before-extract.patch
@@ -4,9 +4,9 @@ Description: Unlink files that are going to be replaced by the unpack
 Author: Raphaël Hertzog <hertzog at debian.org>
 Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/caja-dropbox/+bug/818014
 
---- a/dropbox.in
-+++ b/dropbox.in
-@@ -271,6 +271,9 @@ class DownloadState(object):
+--- a/caja-dropbox.in
++++ b/caja-dropbox.in
+@@ -259,6 +259,9 @@
          archive = tarfile.open(fileobj=self.local_file, mode='r:gz')
          total_members = len(archive.getmembers())
          for i, member in enumerate(archive.getmembers()):
diff --git a/debian/patches/do-not-hardcode-dropboxd-path.patch b/debian/patches/1002_do-not-hardcode-dropboxd-path.patch
similarity index 85%
rename from debian/patches/do-not-hardcode-dropboxd-path.patch
rename to debian/patches/1002_do-not-hardcode-dropboxd-path.patch
index afd5c46..a9f0bf4 100644
--- a/debian/patches/do-not-hardcode-dropboxd-path.patch
+++ b/debian/patches/1002_do-not-hardcode-dropboxd-path.patch
@@ -2,9 +2,9 @@ Description: Use DROPBOXD_PATH instead of hardcoding ~/.dropbox-dist/dropboxd
 Author: Raphaël Hertzog <hertzog at debian.org>
 Origin: vendor
 
---- a/dropbox.in
-+++ b/dropbox.in
-@@ -702,7 +702,7 @@ def requires_dropbox_running(meth):
+--- a/caja-dropbox.in
++++ b/caja-dropbox.in
+@@ -727,7 +727,7 @@
      return newmeth
  
  def start_dropbox():
diff --git a/debian/patches/dropbox-update.patch b/debian/patches/1003_dropbox-update.patch
similarity index 82%
rename from debian/patches/dropbox-update.patch
rename to debian/patches/1003_dropbox-update.patch
index 331452a..d01007b 100644
--- a/debian/patches/dropbox-update.patch
+++ b/debian/patches/1003_dropbox-update.patch
@@ -4,9 +4,9 @@ Description: Add a new "dropbox update" command
 Author: Raphaël Hertzog <hertzog at debian.org>
 Origin: vendor
 
---- a/dropbox.in
-+++ b/dropbox.in
-@@ -799,6 +799,15 @@ def columnize(list, display_list=None, d
+--- a/caja-dropbox.in
++++ b/caja-dropbox.in
+@@ -823,6 +823,15 @@
          console_print(line)
  
  @command
diff --git a/debian/patches/add-http-proxy-option.patch b/debian/patches/1004_add-http-proxy-option.patch
similarity index 91%
rename from debian/patches/add-http-proxy-option.patch
rename to debian/patches/1004_add-http-proxy-option.patch
index 7f63e9d..85ba5b9 100644
--- a/debian/patches/add-http-proxy-option.patch
+++ b/debian/patches/1004_add-http-proxy-option.patch
@@ -5,9 +5,9 @@ Author: Raphaël Hertzog <hertzog at debian.org>
 Origin: vendor
 Bug-Debian: http://bugs.debian.org/651065
 
---- a/dropbox.in
-+++ b/dropbox.in
-@@ -1351,8 +1351,15 @@ def main(argv):
+--- a/caja-dropbox.in
++++ b/caja-dropbox.in
+@@ -1382,8 +1382,15 @@
          os._exit(0)
          return
  
diff --git a/debian/patches/use-var-lib-dropbox.patch b/debian/patches/1005_use-var-lib-dropbox.patch
similarity index 82%
rename from debian/patches/use-var-lib-dropbox.patch
rename to debian/patches/1005_use-var-lib-dropbox.patch
index 76aa799..ffeb3d2 100644
--- a/debian/patches/use-var-lib-dropbox.patch
+++ b/debian/patches/1005_use-var-lib-dropbox.patch
@@ -9,18 +9,18 @@ Description: Use /var/lib/dropbox instead of $HOME
 Author: Raphaël Hertzog <hertzog at debian.org>
 Origin: vendor
 
---- a/dropbox.in
-+++ b/dropbox.in
-@@ -54,7 +54,7 @@ GPG_WARNING = u"Note: python-gpgme is no
+--- a/caja-dropbox.in
++++ b/caja-dropbox.in
+@@ -60,7 +60,7 @@
  DOWNLOADING = u"Downloading Dropbox... %d%%"
  UNPACKING = u"Unpacking Dropbox... %d%%"
  
 -PARENT_DIR = os.path.expanduser("~")
 +PARENT_DIR = os.path.expanduser("/var/lib/dropbox")
  DROPBOXD_PATH = "%s/.dropbox-dist/dropboxd" % PARENT_DIR
- DESKTOP_FILE = u"@DESKTOP_FILE_DIR@/dropbox.desktop"
+ DESKTOP_FILE = u"@DESKTOP_FILE_DIR@/caja-dropbox.desktop"
  
-@@ -275,6 +275,7 @@ class DownloadState(object):
+@@ -263,6 +263,7 @@
              if os.path.exists(filename) and not os.path.isdir(filename):
                  os.unlink(filename)
              archive.extract(member, PARENT_DIR)
diff --git a/debian/patches/use-pkexec-to-get-root-rights.patch b/debian/patches/1006_use-pkexec-to-get-root-rights.patch
similarity index 88%
rename from debian/patches/use-pkexec-to-get-root-rights.patch
rename to debian/patches/1006_use-pkexec-to-get-root-rights.patch
index e3925d2..6987fb6 100644
--- a/debian/patches/use-pkexec-to-get-root-rights.patch
+++ b/debian/patches/1006_use-pkexec-to-get-root-rights.patch
@@ -4,9 +4,9 @@ Description: Use pkexec to execute Dropbox's installation as root
 Author: Raphaël Hertzog <hertzog at debian.org>
 Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/caja-dropbox/+bug/821212
 
---- a/dropbox.in
-+++ b/dropbox.in
-@@ -1239,7 +1239,14 @@ options:
+--- a/caja-dropbox.in
++++ b/caja-dropbox.in
+@@ -1267,7 +1267,14 @@
  
          # install dropbox!!!
          try:
@@ -20,5 +20,5 @@ Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/caja-dropbox/+bug/821212
 +                console_print(u"The installation of Dropbox failed.")
 +                return
          except:
-             pass
+             traceback.print_exc()
          else:
diff --git a/debian/patches/non-interactive-update.patch b/debian/patches/2001_non-interactive-update.patch
similarity index 85%
rename from debian/patches/non-interactive-update.patch
rename to debian/patches/2001_non-interactive-update.patch
index a9b04f9..b00cdb9 100644
--- a/debian/patches/non-interactive-update.patch
+++ b/debian/patches/2001_non-interactive-update.patch
@@ -7,9 +7,9 @@ Author: Raphaël Hertzog <hertzog at debian.org>
 Forwarded: not-needed
 Origin: vendor
 
---- a/dropbox.in
-+++ b/dropbox.in
-@@ -526,9 +526,6 @@ else:
+--- a/caja-dropbox.in
++++ b/caja-dropbox.in
+@@ -548,9 +548,6 @@
          console_print(u"%s %s\n" % (INFO, LINK))
          GPG_WARNING_MSG = (u"\n%s" % GPG_WARNING) if not gpgme else u""
  
@@ -17,5 +17,5 @@ Origin: vendor
 -            return
 -
          download = DownloadState()
-         one_chunk = download.copy_data()
  
+         try:
diff --git a/debian/patches/use-dpkg-to-select-platform.patch b/debian/patches/2002_use-dpkg-to-select-platform.patch
similarity index 91%
rename from debian/patches/use-dpkg-to-select-platform.patch
rename to debian/patches/2002_use-dpkg-to-select-platform.patch
index 6a3e336..ee75e93 100644
--- a/debian/patches/use-dpkg-to-select-platform.patch
+++ b/debian/patches/2002_use-dpkg-to-select-platform.patch
@@ -8,9 +8,9 @@ Author: Raphaël Hertzog <hertzog at debian.org>
 Origin: vendor
 Forwarded: not-needed
 
---- a/dropbox.in
-+++ b/dropbox.in
-@@ -139,13 +139,13 @@ def yes_no_question(question):
+--- a/caja-dropbox.in
++++ b/caja-dropbox.in
+@@ -145,13 +145,13 @@
  
  def plat():
      if sys.platform.lower().startswith('linux'):
diff --git a/debian/patches/series b/debian/patches/series
index e77d185..2457b86 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,10 +1,10 @@
-# unlink-before-extract.patch
-# do-not-hardcode-dropboxd-path.patch
-# dropbox-update.patch
+1001_unlink-before-extract.patch
+1002_do-not-hardcode-dropboxd-path.patch
+1003_dropbox-update.patch
 # Patches above should really be integrated upstream
-# add-http-proxy-option.patch
-# use-var-lib-dropbox.patch
-# use-pkexec-to-get-root-rights.patch
+1004_add-http-proxy-option.patch
+1005_use-var-lib-dropbox.patch
+1006_use-pkexec-to-get-root-rights.patch
 # Patches below are not really upstreamable
-# non-interactive-update.patch
-# use-dpkg-to-select-platform.patch
+2001_non-interactive-update.patch
+2002_use-dpkg-to-select-platform.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/caja-dropbox.git

