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

Proposed by Pushkar Kulkarni
Status: Approved
Approved by: Andreas Hasenack
Approved revision: 83ec30b4c1af4d753a8d1f92b9a0f2980b0742bf
Proposed branch: ~pushkarnk/ubuntu/+source/ruby-toml:merge-2089738-plucky
Merge into: ubuntu/+source/ruby-toml:debian/sid
Diff against target: 84 lines (+37/-2)
4 files modified
debian/changelog (+32/-0)
debian/control (+2/-1)
debian/rules (+2/-0)
debian/tests/run-test (+1/-1)
Reviewer Review Type Date Requested Status
Simon Quigley (community) noop Approve
Andreas Hasenack Approve
Review via email: mp+477360@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Pushkar Kulkarni (pushkarnk) :
Revision history for this message
Pushkar Kulkarni (pushkarnk) wrote :

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

----

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

- 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
Revision history for this message
Andreas Hasenack (ahasenack) wrote :

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

Revision history for this message
Simon Quigley (tsimonq2) wrote :

for sponsorship report

review: Approve (noop)

Unmerged commits

83ec30b... by Pushkar Kulkarni

update changelog

b67997a... by Pushkar Kulkarni

update-maintainer

45a9045... by Pushkar Kulkarni

reconstruct-changelog

ca3abdf... by Pushkar Kulkarni

merge-changelogs

f2b07c1... by Pushkar Kulkarni

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

d537534... by Pushkar Kulkarni

Add env var MT_COMPAT

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/changelog b/debian/changelog
index bc10a28..ba4da9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
1ruby-toml (0.3.0-1ubuntu1) plucky; urgency=medium
2
3 * Merge with Debian unstable (LP: #2089738). Remaining changes:
4 - d/t/run-tests: Add env var MT_COMPAT
5 - d/rules: Add env MT_COMPAT for build-time gem2deb-test-runner
6 * Drop changes:
7 - d/p/0004-Adjust-parslet-version.rb: patch not needed because
8 the intended change exists in the merged code.
9
10 -- Pushkar Kulkarni <pushkar.kulkarni@canonical.com> Wed, 27 Nov 2024 19:48:17 +0530
11
1ruby-toml (0.3.0-1) unstable; urgency=medium12ruby-toml (0.3.0-1) unstable; urgency=medium
213
3 * Team upload14 * Team upload
@@ -9,6 +20,27 @@ ruby-toml (0.3.0-1) unstable; urgency=medium
920
10 -- Cédric Boutillier <boutil@debian.org> Thu, 05 Sep 2024 00:17:38 +020021 -- Cédric Boutillier <boutil@debian.org> Thu, 05 Sep 2024 00:17:38 +0200
1122
23ruby-toml (0.2.0-4ubuntu3) oracular; urgency=medium
24
25 * d/rules: Export MT_COMPAT to ensure gem2deb-test-runner
26 compatibility with minitest 5.20.0 in Ruby 3.3.
27 (LP: #2077798)
28
29 -- Pushkar Kulkarni <pushkar.kulkarni@canonical.com> Sat, 24 Aug 2024 22:25:27 +0530
30
31ruby-toml (0.2.0-4ubuntu2) oracular; urgency=medium
32
33 * d/tests/run-test: Define env var MT_COMPAT for compatibility
34 with Minitest 5.20.0 in Ruby 3.3 (LP: #2077617)
35
36 -- Pushkar Kulkarni <pushkar.kulkarni@canonical.com> Thu, 22 Aug 2024 14:26:59 +0530
37
38ruby-toml (0.2.0-4ubuntu1) oracular; urgency=medium
39
40 * d/p/0004-Adjust-parslet-version.rb: loosen parslet version requirement
41
42 -- Athos Ribeiro <athos.ribeiro@canonical.com> Tue, 04 Jun 2024 14:33:36 -0300
43
12ruby-toml (0.2.0-4) unstable; urgency=medium44ruby-toml (0.2.0-4) unstable; urgency=medium
1345
14 * Team upload.46 * Team upload.
diff --git a/debian/control b/debian/control
index 3e87408..091ede1 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
1Source: ruby-toml1Source: ruby-toml
2Section: ruby2Section: ruby
3Priority: optional3Priority: optional
4Maintainer: Debian Ruby Team <pkg-ruby-extras-maintainers@lists.alioth.debian.org>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5XSBC-Original-Maintainer: Debian Ruby Team <pkg-ruby-extras-maintainers@lists.alioth.debian.org>
5Uploaders: Axel Wagner <mero@merovius.de>,6Uploaders: Axel Wagner <mero@merovius.de>,
6 Youhei SASAKI <uwabami@gfd-dennou.org>7 Youhei SASAKI <uwabami@gfd-dennou.org>
7Build-Depends: debhelper-compat (= 13),8Build-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 @@
3export GEM2DEB_TEST_RUNNER = --check-dependencies3export GEM2DEB_TEST_RUNNER = --check-dependencies
4export DH_RUBY = --gem-install4export DH_RUBY = --gem-install
55
6export MT_COMPAT=1
7
6%:8%:
7 dh $@ --buildsystem=ruby --with ruby9 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 @@
3set -e3set -e
44
5QUILT_PATCHES=debian/patches quilt push -a || true5QUILT_PATCHES=debian/patches quilt push -a || true
6gem2deb-test-runner --check-dependencies --autopkgtest 2>&16MT_COMPAT=true gem2deb-test-runner --check-dependencies --autopkgtest 2>&1
7QUILT_PATCHES=debian/patches quilt pop -a || true7QUILT_PATCHES=debian/patches quilt pop -a || true

Subscribers

People subscribed via source and target branches