[caja-dropbox] 01/07: debian/patches: Rebase patches against latest upstream release.

[Mike Gabriel]

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

sunweaver pushed a commit to branch master
in repository caja-dropbox.

commit c0d1c78d7fcf72fa5c499be014d20c6db35296ad
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Sep 18 10:41:32 2017 +0200

    debian/patches: Rebase patches against latest upstream release.
---
 debian/patches/2001_non-interactive-update.patch      | 4 ++--
 debian/patches/2002_use-dpkg-to-select-platform.patch | 2 +-
 debian/patches/2003_execute_via_dbus_launch.patch     | 4 +---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/debian/patches/2001_non-interactive-update.patch b/debian/patches/2001_non-interactive-update.patch
index b00cdb9..32e1f6d 100644
--- a/debian/patches/2001_non-interactive-update.patch
+++ b/debian/patches/2001_non-interactive-update.patch
@@ -9,9 +9,9 @@ Origin: vendor
 
 --- a/caja-dropbox.in
 +++ b/caja-dropbox.in
-@@ -548,9 +548,6 @@
+@@ -550,9 +550,6 @@
          console_print(u"%s %s\n" % (INFO, LINK))
-         GPG_WARNING_MSG = (u"\n%s" % GPG_WARNING) if not gpgme else u""
+         GPG_WARNING_MSG = (u"\n%s" % GPG_WARNING) if not gnupg else u""
  
 -        if not yes_no_question("%s%s" % (WARNING, GPG_WARNING_MSG)):
 -            return
diff --git a/debian/patches/2002_use-dpkg-to-select-platform.patch b/debian/patches/2002_use-dpkg-to-select-platform.patch
index ee75e93..2ac139f 100644
--- a/debian/patches/2002_use-dpkg-to-select-platform.patch
+++ b/debian/patches/2002_use-dpkg-to-select-platform.patch
@@ -10,7 +10,7 @@ Forwarded: not-needed
 
 --- a/caja-dropbox.in
 +++ b/caja-dropbox.in
-@@ -145,13 +145,13 @@
+@@ -148,13 +148,13 @@
  
  def plat():
      if sys.platform.lower().startswith('linux'):
diff --git a/debian/patches/2003_execute_via_dbus_launch.patch b/debian/patches/2003_execute_via_dbus_launch.patch
index 80fb338..a1074ec 100644
--- a/debian/patches/2003_execute_via_dbus_launch.patch
+++ b/debian/patches/2003_execute_via_dbus_launch.patch
@@ -7,11 +7,9 @@ Abstract:
  .
  This patch is valid for Debian and Ubuntu alike.
 
-diff --git a/caja-dropbox.in b/caja-dropbox.in
-index 5026ab7..932d779 100755
 --- a/caja-dropbox.in
 +++ b/caja-dropbox.in
-@@ -728,7 +728,8 @@ def start_dropbox():
+@@ -731,7 +731,8 @@
      if os.access(db_path, os.X_OK):
          f = open("/dev/null", "w")
          # we don't reap the child because we're gonna die anyway, let init do it

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