Merge ~lvoytek/ubuntu/+source/caja-extensions:fix-l-param-jammy into ubuntu/+source/caja-extensions:ubuntu/jammy-devel

[Lena Voytek]

PPA: https://launchpad.net/~lvoytek/+archive/ubuntu/caja-extensions-fix-samba-share-jammy

Similar to Kinetic merge request here:
https://code.launchpad.net/~lvoytek/ubuntu/+source/caja-extensions/+git/caja-extensions/+merge/428855

[Bryce Harrington (bryce)]

Verified from the link mentioned in the bug header that -l is deprecated

    net:
    -l is not available for --long anymore

So, straightforward change, LGTM. The SRU text also looks good, although I wonder since there are several packages involved here, is there any possibility a user could get into a inconsistent situation if they have older versions of any of the components installed? I don't think you need to mention "Other issues with sharing may show up..." unless you have specific concerns; this is a bit hand-wavy so may lead to requests/pushback from SRU reviewers to clarify.

I try to think about the "Where problems could occur" section from the context of if someone upgrades to this version and then experiences some random regression, how they could rule out whether it's likely or not this update caused their problem. So for instance, you might say that the change modifies how nautilus interacts with samba, so any regression would be limited to behaviors around share creation when using samba. You might also mention that as mitigation to any regression, that a workaround would be to manually create shares from the CLI, as described in comment #2.

Let me know if you need me to sponsor the upload for this. (I've no idea if caja-extensions is included in the server packageset.)

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: bryce, lvoytek
Uploaders: bryce
MP auto-approved

review: Approve

[Bryce Harrington (bryce)]

(I tried running autopkgtests for this PPA but caja-extensions has no DEP8 tests.)

[Lena Voytek (lvoytek)]

Thanks for the suggestions, I updated the sru description. A sponsorship would be great, thanks!

[Bryce Harrington (bryce)]

Upload sponsored:

$ debuild -S -sa -i -uc -us $(git ubuntu prepare-upload args)
...
$ grep '^Vcs-Git' ../caja-extensions_1.26.0-1ubuntu0.22.04.1_source.changes
Vcs-Git: https://git.launchpad.net/~bryce/ubuntu/+source/caja-extensions
Vcs-Git-Commit: a1705220947285c4438a37ed5dfbae725c37bddf
Vcs-Git-Ref: refs/heads/fix-l-param-jammy
$ dput ubuntu ../caja-extensions_1.26.0-1ubuntu0.22.04.1_source.changes
D: Setting host argument.
Checking signature on .changes
gpg: ../caja-extensions_1.26.0-1ubuntu0.22.04.1_source.changes: Valid signature from E603B2578FB8F0FB
Checking signature on .dsc
gpg: ../caja-extensions_1.26.0-1ubuntu0.22.04.1.dsc: Valid signature from E603B2578FB8F0FB
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading caja-extensions_1.26.0-1ubuntu0.22.04.1.dsc: done.
  Uploading caja-extensions_1.26.0.orig.tar.xz: done.
  Uploading caja-extensions_1.26.0-1ubuntu0.22.04.1.debian.tar.xz: done.
  Uploading caja-extensions_1.26.0-1ubuntu0.22.04.1_source.buildinfo: done.
  Uploading caja-extensions_1.26.0-1ubuntu0.22.04.1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index a66c49b..1c34ba5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+caja-extensions (1.26.0-1ubuntu0.22.04.1) jammy; urgency=medium
+
+  * d/p/fix-caja-share-long-param.patch: Fix samba sharing by changing -l
+    parameter to --long in arguments (LP: #1972057)
+
+ -- Lena Voytek <[e-mail]>  Thu, 25 Aug 2022 07:37:16 -0700
+
 caja-extensions (1.26.0-1) unstable; urgency=medium
 
   [ Martin Wimpress ]
diff --git a/debian/control b/debian/control
index 0457518..892fb55 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: caja-extensions
 Section: x11
 Priority: optional
-Maintainer: Debian+Ubuntu MATE Packaging Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian+Ubuntu MATE Packaging Team <[e-mail]>
 Uploaders: Mike Gabriel <[e-mail]>,
            John Paul Adrian Glaubitz <[e-mail]>,
            Stefano Karapetsas <[e-mail]>,
diff --git a/debian/patches/fix-caja-share-long-param.patch b/debian/patches/fix-caja-share-long-param.patch
 new file mode 100644
index 0000000..16b00de
--- /dev/null
+++ b/debian/patches/fix-caja-share-long-param.patch
@@ -0,0 +1,21 @@
+Description: Fix parameter error that prevents samba shares with caja
+Author: Knucklesfan <[e-mail]>
+Origin: upstream, https://github.com/mate-desktop/caja-extensions/commit/8f18dddb00e2b16448b43ff6da5c6b2d439e8cc0
+Bug: https://github.com/mate-desktop/caja-extensions/issues/111
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu-mate/+bug/1972057
+Forwarded: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1018059
+Last-Update: 2022-08-22
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/share/shares.c
++++ b/share/shares.c
+@@ -624,7 +624,7 @@
+ 		return FALSE;
+ 
+ 	argv[0] = "add";
+-	argv[1] = "-l";
++	argv[1] = "--long";
+ 	argv[2] = info->share_name;
+ 	argv[3] = info->path;
+ 	argv[4] = info->comment;
diff --git a/debian/patches/series b/debian/patches/series
index 8e46221..2304f1e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 2001_support-icedove-in-caja-sendto.patch
 1001_pkg-config-macro-not-cross-compilation-safe.patch
+fix-caja-share-long-param.patch