Merge ~pushkarnk/ubuntu/+source/ruby-toml:merge-2089738-plucky into ubuntu/+source/ruby-toml:debian/sid

[Pushkar Kulkarni]

[Pushkar Kulkarni (pushkarnk)]

Built in ppa:pushkarnk/plusone

Autopkgtest results

----

* Results:
  - ruby-toml: plucky/ruby-toml/0.3.0-1ubuntu1 [amd64]
    + ✅ ruby-toml on plucky for amd64 @ 27.11.24 17:24:46
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-pushkarnk-plusone/plucky/amd64/r/ruby-toml/20241127_172446_54437@/log.gz
  - ruby-toml: plucky/ruby-toml/0.3.0-1ubuntu1 [arm64]
    + ✅ ruby-toml on plucky for arm64 @ 27.11.24 17:24:59
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-pushkarnk-plusone/plucky/arm64/r/ruby-toml/20241127_172459_28103@/log.gz
  - ruby-toml: plucky/ruby-toml/0.3.0-1ubuntu1 [armhf]
    + ✅ ruby-toml on plucky for armhf @ 27.11.24 17:26:28
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-pushkarnk-plusone/plucky/armhf/r/ruby-toml/20241127_172628_36058@/log.gz
  - ruby-toml: plucky/ruby-toml/0.3.0-1ubuntu1 [i386]
    + ✅ ruby-toml on plucky for i386 @ 27.11.24 17:24:25
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-pushkarnk-plusone/plucky/i386/r/ruby-toml/20241127_172425_0538d@/log.gz
  - ruby-toml: plucky/ruby-toml/0.3.0-1ubuntu1 [s390x]
    + ✅ ruby-toml on plucky for s390x @ 27.11.24 17:23:52
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-pushkarnk-plusone/plucky/s390x/r/ruby-toml/20241127_172352_aaa05@/log.gz

----

[Andreas Hasenack (ahasenack)]

- ubuntu delta preserved correctly, ack on the dropped patch
- debian changes look ok
- upstream changes look ok
- d/watch works correctly and fetches the upstream tarball
- reverse-depends is ruby-asetus, which is a sync in ubuntu with debian, so I don't expect incompatibilities there at the moment (I'm not familiar with the ruby ecosystem, that's why I checked this)

+1

review: Approve

[Andreas Hasenack (ahasenack)]

Sponsored:

Uploading ruby-toml_0.3.0-1ubuntu1.dsc
Uploading ruby-toml_0.3.0.orig.tar.gz
Uploading ruby-toml_0.3.0-1ubuntu1.debian.tar.xz
Uploading ruby-toml_0.3.0-1ubuntu1_source.buildinfo
Uploading ruby-toml_0.3.0-1ubuntu1_source.changes

[Simon Quigley (tsimonq2)]

for sponsorship report

review: Approve (noop)

Unmerged commits

83ec30b... by Pushkar Kulkarni on 2024-11-27

update changelog

b67997a... by Pushkar Kulkarni on 2024-11-27

update-maintainer

45a9045... by Pushkar Kulkarni on 2024-11-27

reconstruct-changelog

ca3abdf... by Pushkar Kulkarni on 2024-11-27

merge-changelogs

f2b07c1... by Pushkar Kulkarni on 2024-08-24

Add env MT_COMPAT for build-time gem2deb-test-runner

d537534... by Pushkar Kulkarni on 2024-08-22

Add env var MT_COMPAT

diff --git a/debian/changelog b/debian/changelog
index bc10a28..ba4da9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+ruby-toml (0.3.0-1ubuntu1) plucky; urgency=medium
+
+  * Merge with Debian unstable (LP: #2089738). Remaining changes:
+    - d/t/run-tests: Add env var MT_COMPAT
+    - d/rules: Add env MT_COMPAT for build-time gem2deb-test-runner
+  * Drop changes:
+    - d/p/0004-Adjust-parslet-version.rb: patch not needed because
+      the intended change exists in the merged code.
+
+ -- Pushkar Kulkarni <[e-mail]>  Wed, 27 Nov 2024 19:48:17 +0530
+
 ruby-toml (0.3.0-1) unstable; urgency=medium
 
   * Team upload
@@ -9,6 +20,27 @@ ruby-toml (0.3.0-1) unstable; urgency=medium
 
  -- Cédric Boutillier <[e-mail]>  Thu, 05 Sep 2024 00:17:38 +0200
 
+ruby-toml (0.2.0-4ubuntu3) oracular; urgency=medium
+
+  * d/rules: Export MT_COMPAT to ensure gem2deb-test-runner
+    compatibility with minitest 5.20.0 in Ruby 3.3.
+    (LP: #2077798)
+
+ -- Pushkar Kulkarni <[e-mail]>  Sat, 24 Aug 2024 22:25:27 +0530
+
+ruby-toml (0.2.0-4ubuntu2) oracular; urgency=medium
+
+  * d/tests/run-test: Define env var MT_COMPAT for compatibility
+    with Minitest 5.20.0 in Ruby 3.3 (LP: #2077617)
+
+ -- Pushkar Kulkarni <[e-mail]>  Thu, 22 Aug 2024 14:26:59 +0530
+
+ruby-toml (0.2.0-4ubuntu1) oracular; urgency=medium
+
+  * d/p/0004-Adjust-parslet-version.rb: loosen parslet version requirement
+
+ -- Athos Ribeiro <[e-mail]>  Tue, 04 Jun 2024 14:33:36 -0300
+
 ruby-toml (0.2.0-4) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 3e87408..091ede1 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: ruby-toml
 Section: ruby
 Priority: optional
-Maintainer: Debian Ruby Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Ruby Team <[e-mail]>
 Uploaders: Axel Wagner <[e-mail]>,
            Youhei SASAKI <[e-mail]>
 Build-Depends: debhelper-compat (= 13),
diff --git a/debian/rules b/debian/rules
index 4e91465..12c09c4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,5 +3,7 @@
 export GEM2DEB_TEST_RUNNER = --check-dependencies
 export DH_RUBY = --gem-install
 
+export MT_COMPAT=1
+
 %:
 	dh $@ --buildsystem=ruby --with ruby
diff --git a/debian/tests/run-test b/debian/tests/run-test
index f9b8aa8..787fe47 100644
--- a/debian/tests/run-test
+++ b/debian/tests/run-test
@@ -3,5 +3,5 @@
 set -e
 
 QUILT_PATCHES=debian/patches quilt push -a || true
-gem2deb-test-runner --check-dependencies --autopkgtest 2>&1
+MT_COMPAT=true gem2deb-test-runner --check-dependencies --autopkgtest 2>&1
 QUILT_PATCHES=debian/patches quilt pop -a || true