Mike Gabriel pushed to branch master at Debian and Ubuntu MATE Packaging Team / caja-dropbox
Commits:
-
6ce0bfbc
by Mike Gabriel at 2021-12-17T16:17:02+01:00
-
a28066c0
by Mike Gabriel at 2021-12-17T16:17:27+01:00
-
0ba2fe6b
by Mike Gabriel at 2021-12-17T16:19:05+01:00
6 changed files:
- debian/changelog
- debian/patches/1004_add-http-proxy-option.patch
- debian/patches/1005_use-var-lib-dropbox.patch
- debian/patches/1006_use-pkexec-to-get-root-rights.patch
- debian/patches/2001_non-interactive-update.patch
- debian/patches/2002_use-dpkg-to-select-platform.patch
Changes:
| 1 |
+caja-dropbox (1.26.0-2) unstable; urgency=medium
|
|
| 2 |
+ |
|
| 3 |
+ * debian/patches:
|
|
| 4 |
+ + Fix ' dpkg-source: warning: unexpected end of diff' in
|
|
| 5 |
+ 1005_use-var-lib-dropbox.patch. Thanks to LocutusOfBorg for reporting
|
|
| 6 |
+ it via IRC.
|
|
| 7 |
+ * debian/patches:
|
|
| 8 |
+ + Trivial rebase of patches 1004, 1006, 2001 and 2002.
|
|
| 9 |
+ |
|
| 10 |
+ -- Mike Gabriel <sunweaver@debian.org> Fri, 17 Dec 2021 16:17:31 +0100
|
|
| 11 |
+ |
|
| 1 | 12 |
caja-dropbox (1.26.0-1) unstable; urgency=medium
|
| 2 | 13 |
|
| 3 | 14 |
[ Martin Wimpress ]
|
| ... | ... | @@ -7,7 +7,7 @@ Bug-Debian: http://bugs.debian.org/651065 |
| 7 | 7 |
|
| 8 | 8 |
--- a/caja-dropbox.in
|
| 9 | 9 |
+++ b/caja-dropbox.in
|
| 10 |
-@@ -1548,8 +1548,15 @@
|
|
| 10 |
+@@ -1557,8 +1557,15 @@
|
|
| 11 | 11 |
os._exit(0)
|
| 12 | 12 |
return
|
| 13 | 13 |
|
| ... | ... | @@ -27,3 +27,4 @@ Origin: vendor |
| 27 | 27 |
+ os.lchown(filename, os.geteuid(), os.getegid())
|
| 28 | 28 |
yield member.name, i, total_members
|
| 29 | 29 |
archive.close()
|
| 30 |
+
|
| ... | ... | @@ -6,7 +6,7 @@ Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/caja-dropbox/+bug/821212 |
| 6 | 6 |
|
| 7 | 7 |
--- a/caja-dropbox.in
|
| 8 | 8 |
+++ b/caja-dropbox.in
|
| 9 |
-@@ -1433,7 +1433,14 @@
|
|
| 9 |
+@@ -1442,7 +1442,14 @@
|
|
| 10 | 10 |
|
| 11 | 11 |
# install dropbox!!!
|
| 12 | 12 |
try:
|
| ... | ... | @@ -9,7 +9,7 @@ Origin: vendor |
| 9 | 9 |
|
| 10 | 10 |
--- a/caja-dropbox.in
|
| 11 | 11 |
+++ b/caja-dropbox.in
|
| 12 |
-@@ -561,9 +561,6 @@
|
|
| 12 |
+@@ -570,9 +570,6 @@
|
|
| 13 | 13 |
console_print("%s %s\n" % (INFO, LINK))
|
| 14 | 14 |
GPG_WARNING_MSG = ("\n%s" % GPG_WARNING) if not gpg and not gpgme else ""
|
| 15 | 15 |
|
| ... | ... | @@ -10,7 +10,7 @@ Forwarded: not-needed |
| 10 | 10 |
|
| 11 | 11 |
--- a/caja-dropbox.in
|
| 12 | 12 |
+++ b/caja-dropbox.in
|
| 13 |
-@@ -119,13 +119,13 @@
|
|
| 13 |
+@@ -128,13 +128,13 @@
|
|
| 14 | 14 |
|
| 15 | 15 |
def plat():
|
| 16 | 16 |
if sys.platform.lower().startswith('linux'):
|