Merge ~pushkarnk/ubuntu/+source/ruby-archive-zip:merge-2089732-ruby-archive-zip into ubuntu/+source/ruby-archive-zip:debian/sid

[Pushkar Kulkarni]

[Pushkar Kulkarni (pushkarnk)]

I did a test build in ppa:pushkarnk/plusone and here are the autopkgtest results

* Results:
  - ruby-archive-zip: plucky/ruby-archive-zip/0.12.0-1ubuntu1 [amd64]
    + ✅ ruby-archive-zip on plucky for amd64 @ 28.11.24 05:11:23
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-pushkarnk-plusone/plucky/amd64/r/ruby-archive-zip/20241128_051123_f32bc@/log.gz
  - ruby-archive-zip: plucky/ruby-archive-zip/0.12.0-1ubuntu1 [arm64]
    + ✅ ruby-archive-zip on plucky for arm64 @ 28.11.24 05:27:24
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-pushkarnk-plusone/plucky/arm64/r/ruby-archive-zip/20241128_052724_7824a@/log.gz
  - ruby-archive-zip: plucky/ruby-archive-zip/0.12.0-1ubuntu1 [armhf]
    + ✅ ruby-archive-zip on plucky for armhf @ 28.11.24 05:14:04
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-pushkarnk-plusone/plucky/armhf/r/ruby-archive-zip/20241128_051404_d70ae@/log.gz
  - ruby-archive-zip: plucky/ruby-archive-zip/0.12.0-1ubuntu1 [i386]
    + ✅ ruby-archive-zip on plucky for i386 @ 28.11.24 05:11:40
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-pushkarnk-plusone/plucky/i386/r/ruby-archive-zip/20241128_051140_4ce42@/log.gz
  - ruby-archive-zip: plucky/ruby-archive-zip/0.12.0-1ubuntu1 [ppc64el]
    + ✅ ruby-archive-zip on plucky for ppc64el @ 28.11.24 05:11:25
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-pushkarnk-plusone/plucky/ppc64el/r/ruby-archive-zip/20241128_051125_dbe36@/log.gz
  - ruby-archive-zip: plucky/ruby-archive-zip/0.12.0-1ubuntu1 [s390x]
    + ✅ ruby-archive-zip on plucky for s390x @ 28.11.24 05:11:45
      • Log: https://autopkgtest.ubuntu.com/results/autopkgtest-plucky-pushkarnk-plusone/plucky/s390x/r/ruby-archive-zip/20241128_051145_5cd46@/log.gz

[Simon Quigley (tsimonq2)]

review: Approve

Unmerged commits

8b2f764... by Pushkar Kulkarni on 2024-11-27

update-maintainer

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

reconstruct-changelog

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

merge-changelogs

06fc1ca... by Pushkar Kulkarni on 2024-11-27

Add MT_COMPAT for compatibility with Ruby 3.3

diff --git a/debian/changelog b/debian/changelog
index 7be995a..3450681 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ruby-archive-zip (0.12.0-1ubuntu1) plucky; urgency=medium
+
+  * Merge with Debian unstable (LP: #2089732). Remaining changes:
+    - Add MT_COMPAT for compatibility with Ruby 3.3
+
+ -- Pushkar Kulkarni <[e-mail]>  Wed, 27 Nov 2024 13:02:58 +0530
+
 ruby-archive-zip (0.12.0-1) unstable; urgency=medium
 
   * Team upload
@@ -28,6 +35,13 @@ ruby-archive-zip (0.12.0-1) unstable; urgency=medium
 
  -- Cédric Boutillier <[e-mail]>  Fri, 23 Aug 2024 23:56:42 +0200
 
+ruby-archive-zip (0.11.0-1.1ubuntu1) oracular; urgency=medium
+
+  * d/ruby-tests.rake: 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 12:39:10 +0530
+
 ruby-archive-zip (0.11.0-1) unstable; urgency=medium
 
   * Initial release (Closes: #912856)
diff --git a/debian/control b/debian/control
index 1c32984..ec79b90 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: ruby-archive-zip
 Section: ruby
 Priority: optional
-Maintainer: Debian Ruby Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Ruby Team <[e-mail]>
 Uploaders: Mangesh Divate <[e-mail]>
 Build-Depends: debhelper-compat (= 13),
                gem2deb (>= 1),
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
index dc64587..f8c38bd 100644
--- a/debian/ruby-tests.rake
+++ b/debian/ruby-tests.rake
@@ -1,5 +1,6 @@
 require 'gem2deb/rake/testtask'
 
+ENV["MT_COMPAT"] = 'true'
 Gem2Deb::Rake::TestTask.new do |t|
   t.test_files = FileList['spec/**/*_spec.rb']
 end