Merge ~ahasenack/ubuntu/+source/rclone:rclone-fix-gdrive-download-1937136-FOCAL into ubuntu/+source/rclone:ubuntu/focal-devel

[Andreas Hasenack]

This fixes downloading certain files from google drive. The linked SRU bug has testing details. Setting this up, with the required API keys, is a bit less than a nightmare in my opinion, other clouds were much easier, but hey :)

For Focal, I had to fix an FTBFS as well (missing build-dep).

PPA: https://launchpad.net/~ahasenack/+archive/ubuntu/rclone-gdrive-download-1937136/

[Lucas Kanashiro (lucaskanashiro)]

Same comment from the Jammy MP about the DEP-3 headers applies here. Moreover, you forgot to run the update-maintainer script to fix the Maintainer field in d/control.

Thanks for also fixing the FTBFS here. The steps in the test plan worked as expected.

review: Needs Fixing

[Andreas Hasenack (ahasenack)]

dep-3 done, maintainer done (oops)

[Andreas Hasenack (ahasenack)]

I went ahead and created a salsa PR[1] for this, and added a comment in the debian bug pointing to it.

1. https://salsa.debian.org/go-team/packages/rclone/-/merge_requests/4

[Lucas Kanashiro (lucaskanashiro)]

+1

review: Approve

[Andreas Hasenack (ahasenack)]

Thanks, uploaded

$ dput ubuntu ../rclone_1.50.2-2ubuntu0.1_source.changes
D: Setting host argument.
Checking signature on .changes
gpg: ../rclone_1.50.2-2ubuntu0.1_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../rclone_1.50.2-2ubuntu0.1.dsc: Valid signature from AC983EB5BF6BCBA9
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading rclone_1.50.2-2ubuntu0.1.dsc: done.
  Uploading rclone_1.50.2-2ubuntu0.1.debian.tar.xz: done.
  Uploading rclone_1.50.2-2ubuntu0.1_source.buildinfo: done.
  Uploading rclone_1.50.2-2ubuntu0.1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 749b0e5..da1b288 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+rclone (1.50.2-2ubuntu0.1) focal; urgency=medium
+
+  * d/p/0008-fix-gdrive-download.patch: remove check for size, so google
+    docs are identified solely by not having an MD5 checksum
+    (LP: #1937136)
+  * d/control: add missing build-depends for
+    golang-github-mattn-go-colorable-dev (LP: #1966950)
+
+ -- Andreas Hasenack <[e-mail]>  Tue, 29 Mar 2022 10:28:41 -0300
+
 rclone (1.50.2-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index ddc9c0d..ae6c530 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: rclone
 Section: net
 Priority: optional
-Maintainer: Debian Go Packaging Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Go Packaging Team <[e-mail]>
 Uploaders: Dr. Tobias Quathamer <[e-mail]>
 Build-Depends: bash-completion,
                debhelper-compat (= 12),
@@ -23,6 +24,7 @@ Build-Depends: bash-completion,
                golang-github-jzelinskie-whirlpool-dev,
                golang-github-koofr-go-httpclient-dev,
                golang-github-koofr-go-koofrclient-dev,
+               golang-github-mattn-go-colorable-dev,
                golang-github-ncw-go-acd-dev,
                golang-github-ncw-swift-dev (>= 1.0.47),
                golang-github-nsf-termbox-go-dev,
diff --git a/debian/patches/0008-fix-gdrive-download.patch b/debian/patches/0008-fix-gdrive-download.patch
new file mode 100644
index 0000000..8911cf9
--- /dev/null
+++ b/debian/patches/0008-fix-gdrive-download.patch
@@ -0,0 +1,52 @@
+From 94b1439299e57f84dec27e865fba2b7356f3ea79 Mon Sep 17 00:00:00 2001
+From: Nick Craig-Wood <[e-mail]>
+Date: Wed, 14 Jul 2021 10:23:35 +0100
+Subject: [PATCH] drive: fix some google docs being treated as files - fixes
+ #5455
+
+At some point some google docs files started having sizes returned in
+their listing information.
+
+This then caused rclone to treat the docs as files which caused
+downloads to fail.
+
+The API docs now state that google docs may have sizes (whereas I'm
+pretty sure it didn't earlier).
+
+This fix removes the check for size, so google docs are identified
+solely by not having an MD5 checksum.
+---
+ backend/drive/drive.go | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+Origin: backport, https://github.com/rclone/rclone/commit/94b1439299e57f84dec27e865fba2b7356f3ea79
+Bug: https://github.com/rclone/rclone/issues/5455
+Bug-Debian: https://bugs.debian.org/991124
+Bug-Ubuntu: https://bugs.launchpad.net/rclone/+bug/1937136
+Applied-Upstream: 1.56.0
+Last-Update: 2022-03-28
+
+--- a/backend/drive/drive.go
++++ b/backend/drive/drive.go
+@@ -1189,8 +1189,8 @@
+ //
+ // When the drive.File cannot be represented as a fs.Object it will return (nil, nil).
+ func (f *Fs) newObjectWithInfo(remote string, info *drive.File) (fs.Object, error) {
+-	// If item has MD5 sum or a length it is a file stored on drive
+-	if info.Md5Checksum != "" || info.Size > 0 {
++	// If item has MD5 sum it is a file stored on drive
++	if info.Md5Checksum != "" {
+ 		return f.newRegularObject(remote, info), nil
+ 	}
+ 
+@@ -1205,8 +1205,8 @@
+ 	remote string, info *drive.File,
+ 	extension, exportName, exportMimeType string, isDocument bool) (fs.Object, error) {
+ 	switch {
+-	case info.Md5Checksum != "" || info.Size > 0:
+-		// If item has MD5 sum or a length it is a file stored on drive
++	case info.Md5Checksum != "":
++		// If item has MD5 sum it is a file stored on drive
+ 		return f.newRegularObject(remote, info), nil
+ 	case f.opt.SkipGdocs:
+ 		fs.Debugf(remote, "Skipping google document type %q", info.MimeType)
diff --git a/debian/patches/series b/debian/patches/series
index 4c900cd..34e8e09 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 0004-Disable-FTP-server-of-rclone.patch
 0005-Do-not-include-installation-instructions-in-manpage.patch
 0007-Remove-script-to-disable-possible-privacy-breach.patch
+0008-fix-gdrive-download.patch