Merge ~dviererbe/ubuntu/+source/dash:merge-lp2026730-mantic into ubuntu/+source/dash:debian/sid

[Dominik Viererbe]

[Dominik Viererbe (dviererbe)]

dash/0.5.12-6ubuntu1

builds on amd64, arm64, armhf, ppc64el, s390x for mantic in PPA dviererbe/dash-merge-lp2026730-mantic (https://launchpad.net/~dviererbe/+archive/ubuntu/dash-merge-lp2026730-mantic/+packages)

autopkgtest passes on:
 * mantic for amd64 @ 11.07.23 11:25:11 Log️ [1]
 * mantic for arm64 @ 11.07.23 11:28:27 Log️ [2]
 * mantic for armhf @ 11.07.23 11:29:11 Log️ [3]
 * mantic for ppc64el @ 11.07.23 11:26:32 Log️ [4]
 * mantic for s390x @ 11.07.23 11:27:43 Log️ [5]

[1] https://autopkgtest.ubuntu.com/results/autopkgtest-mantic-dviererbe-dash-merge-lp2026730-mantic/mantic/amd64/d/dash/20230711_112511_59e14@/log.gz
[2] https://autopkgtest.ubuntu.com/results/autopkgtest-mantic-dviererbe-dash-merge-lp2026730-mantic/mantic/arm64/d/dash/20230711_112827_c1f0d@/log.gz
[3] https://autopkgtest.ubuntu.com/results/autopkgtest-mantic-dviererbe-dash-merge-lp2026730-mantic/mantic/armhf/d/dash/20230711_112911_c4df6@/log.gz
[4] https://autopkgtest.ubuntu.com/results/autopkgtest-mantic-dviererbe-dash-merge-lp2026730-mantic/mantic/ppc64el/d/dash/20230711_112632_a8dd5@/log.gz
[5] https://autopkgtest.ubuntu.com/results/autopkgtest-mantic-dviererbe-dash-merge-lp2026730-mantic/mantic/s390x/d/dash/20230711_112743_47c81@/log.gz

[Dominik Viererbe (dviererbe)]

Do not mind Ubuntu Sponsors assigned twice. This was kind of a bug (LP: #2028031).

[Lukas Märdian (slyon)]

Hi Dominik, overall the change (and git history) looks good to me, just some tiny remarks:

* Please close the corresponding bug report from your d/changelog file (in your "reconstruct-changelog" commit), e.g.
  "Merge with Debian unstable (LP: #2026730). Remaining changes:"
* While on it, please drop the removal of empty newlines from d/changelog (in your "merge-changelogs" commit). I know it looks cleaner this way, but it's unnecessary delta to track in Ubuntu and we should just stick to whatever Debian did, as it doesn't affect the functionality.
* Did you run any autopkgtest on this locally or on your PPA? Or did any other testing around the diversion change?

d35b0e7... by Dominik Viererbe on 2023-07-24

merge-changelogs

a1567ab... by Dominik Viererbe on 2023-07-24

reconstruct-changelog

[Dominik Viererbe (dviererbe)]

Hi Lukas, thanks for the feedback!

- I have edited the commits to include the corresponding bug report in the changelog and removed the removal of empty newlines in the changelog (this is weird to me, as I did not remove the newlines myself in the first place; has to be some git-ubuntu magic ¯\_(ツ)_/¯).
- I triggered autopkgtests in my PPA. The first comment of mine [1] links to the logs of the autopkgtests, which all have passed.

[1] https://code.launchpad.net/~dviererbe/ubuntu/+source/dash/+git/dash/+merge/446503/comments/1189914

[Robie Basak (racb)]

On Mon, Jul 24, 2023 at 10:39:32AM -0000, Dominik Viererbe wrote:
> - I have edited the commits to include the corresponding bug report in the changelog and removed the removal of empty newlines in the changelog (this is weird to me, as I did not remove the newlines myself in the first place; has to be some git-ubuntu magic ¯\_(ツ)_/¯).

FWIW, the git-ubuntu workflow just uses dpkg-mergechangelogs behind the
scenes. If that is producing undesirable output, someone should fix that
tool, rather than sponsors requiring every developer to fix up to their
standards manually.

[Lukas Märdian (slyon)]

Thank you, LGTM.
Good work, Dominik!

@racb: I think the tooling is working alright. But the d/changelog was "cleaned up" in the past, as part of the Ubuntu delta. IMO this is a change which we should not be tracking as part of the delta, therefor my ask to drop it.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 937f0c8..fd15c96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+dash (0.5.12-6ubuntu1) mantic; urgency=medium
+
+  * Merge with Debian unstable (LP: #2026730). Remaining changes:
+    - d/t/control: Disable mmdebstrap autopkgtest test-case, 
+                   testing only the Debian archive.
+
+ -- Dominik Viererbe <[e-mail]>  Tue, 11 Jul 2023 12:03:53 +0300
+
 dash (0.5.12-6) unstable; urgency=medium
 
   [ Johannes Schauer Marin Rodrigues ]
@@ -38,6 +46,13 @@ dash (0.5.12-3) experimental; urgency=medium
 
  -- Andrej Shadura <[e-mail]>  Sun, 30 Apr 2023 15:53:24 +0200
 
+dash (0.5.12-2ubuntu1) lunar; urgency=medium
+
+  * Merge from Debian Unstable. Remaining changes:
+    - Disable the mmdebstrap autopkg test, testing only the Debian archive.
+
+ -- Simon Quigley <[e-mail]>  Sat, 11 Feb 2023 15:09:13 -0600
+
 dash (0.5.12-2) unstable; urgency=medium
 
   * Fix the changelog entry.
@@ -53,6 +68,13 @@ dash (0.5.12-1) unstable; urgency=medium
 
  -- Andrej Shadura <[e-mail]>  Thu, 05 Jan 2023 14:06:02 +0100
 
+dash (0.5.11+git20210903+057cd650a4ed-9ubuntu1) lunar; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Disable the mmdebstrap autopkg test, testing only the Debian archive.
+
+ -- Matthias Klose <[e-mail]>  Mon, 12 Dec 2022 09:12:49 +0100
+
 dash (0.5.11+git20210903+057cd650a4ed-9) unstable; urgency=medium
 
   [ Johannes Schauer Marin Rodrigues ]
@@ -61,6 +83,12 @@ dash (0.5.11+git20210903+057cd650a4ed-9) unstable; urgency=medium
 
  -- Andrej Shadura <[e-mail]>  Thu, 01 Sep 2022 16:11:54 +0200
 
+dash (0.5.11+git20210903+057cd650a4ed-8ubuntu1) kinetic; urgency=medium
+
+  * Disable the mmdebstrap autopkg test, testing only the Debian archive.
+
+ -- Matthias Klose <[e-mail]>  Thu, 23 Jun 2022 12:14:04 +0200
+
 dash (0.5.11+git20210903+057cd650a4ed-8) unstable; urgency=medium
 
   * Remove the remnants of the debconf shell question
diff --git a/debian/control b/debian/control
index 58fd8c5..3231e25 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: dash
 Section: shells
 Priority: optional
-Maintainer: Andrej Shadura <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Andrej Shadura <[e-mail]>
 Uploaders: Gerrit Pape <[e-mail]>
 Build-Depends:
  debhelper-compat (= 12),
diff --git a/debian/tests/control b/debian/tests/control
index 7bf049b..c8722a1 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -2,6 +2,6 @@ Tests: smoke
 Depends: dash, perl
 Restrictions: allow-stderr
 
-Tests: mmdebstrap
-Depends: mmdebstrap (>= 1.3.7-1), fakechroot, fakeroot
-Restrictions: allow-stderr
+#Tests: mmdebstrap
+#Depends: mmdebstrap (>= 1.3.7-1), fakechroot, fakeroot
+#Restrictions: allow-stderr