This package should be a sync. git-ubuntu gets a bit confused here due to this being a native package and due to the tilde in the deb version string. So I am pasting a diff instead of an MP here for server team review purposes before I sync this package. After the diff, I am commenting the changes in the diff.
diff -dru ruby-defaults/debian/changelog debian-package/ruby-defaults-3.3/debian/changelog --- ruby-defaults/debian/changelog 2025-06-02 11:23:36.340887592 -0300 +++ debian-package/ruby-defaults-3.3/debian/changelog 2025-02-11 17:23:48.000000000 -0300 @@ -1,23 +1,49 @@ -ruby-defaults (1:3.3~ubuntu3) oracular; urgency=medium +ruby-defaults (1:3.3) unstable; urgency=medium - * Make Ruby 3.3 the default and remove Ruby 3.2. - The workaround in the previous upload did not work. Let's make version - 3.3 the default again. + * Upload to unstable to remove ruby3.1 support. + ruby3.3 is the only supported interpreter. - -- Lucas Kanashiro <[email protected]> Thu, 15 Aug 2024 16:16:15 -0300 + -- Lucas Kanashiro <[email protected]> Tue, 11 Feb 2025 17:23:48 -0300 -ruby-defaults (1:3.3~ubuntu2) oracular; urgency=medium +ruby-defaults (1:3.3~3.3) experimental; urgency=medium - * Make ruby3.2 the default again and add ruby3.3 as an alternative. - * d/rules: do not compare the package version and the default version. + * Remove ruby3.1 from the list of supported interpreters. + Now, ruby3.3 is the default and only supported interpreter. - -- Lucas Kanashiro <[email protected]> Wed, 14 Aug 2024 09:44:59 -0300 + -- Lucas Kanashiro <[email protected]> Mon, 10 Feb 2025 10:39:03 -0300 -ruby-defaults (1:3.3~ubuntu1) oracular; urgency=medium +ruby-defaults (1:3.3~3.2) unstable; urgency=medium + + [ Lucas Kanashiro ] + * d/control: add puppet-agent (<= 7.24.0) to Breaks statement + + [ Utkarsh Gupta ] + * Add Breaks for ruby-marisa (<< 0.2.6-18+b4) + + -- Utkarsh Gupta <[email protected]> Fri, 31 Jan 2025 14:48:28 +0100 +ruby-defaults (1:3.3~3.1) unstable; urgency=medium + + [ Antonio Terceiro ] + * debian/tests/smoke-test: provide default for $AUTOPKGTEST_TMP + * Reinstate support for ruby3.1 + + -- Lucas Kanashiro <[email protected]> Thu, 23 Jan 2025 21:45:24 -0300 + +ruby-defaults (1:3.3~0) experimental; urgency=medium + + * Add new script: rdbg * Make Ruby 3.3 the default + * Drop support for Ruby 3.1 + * debian/tests: drop obsolete, unused wheezy2jessie tests - -- Lucas Kanashiro <[email protected]> Tue, 13 Aug 2024 15:46:00 -0300 + -- Antonio Terceiro <[email protected]> Sun, 19 Jan 2025 22:17:44 -0300 + +ruby-defaults (1:3.1+support3.3) unstable; urgency=medium + + * Upload to unstable, adding support to ruby3.3 + + -- Lucas Kanashiro <[email protected]> Fri, 10 Jan 2025 13:33:30 -0300 ruby-defaults (1:3.1+support3.3~0) experimental; urgency=medium @@ -39,12 +65,6 @@ -- Chris Hofstaedtler <[email protected]> Sun, 17 Mar 2024 16:08:39 +0100 -ruby-defaults (1:3.1+1) experimental; urgency=medium - - * Add support for ruby3.2. - - -- Lucas Kanashiro <[email protected]> Fri, 20 Oct 2023 16:48:21 -0300 - ruby-defaults (1:3.1) unstable; urgency=medium * Drop support for ruby3.0 diff -dru ruby-defaults/debian/control debian-package/ruby-defaults-3.3/debian/control --- ruby-defaults/debian/control 2025-06-02 11:23:36.341887596 -0300 +++ debian-package/ruby-defaults-3.3/debian/control 2025-02-10 10:37:44.000000000 -0300 @@ -1,8 +1,7 @@ Source: ruby-defaults Section: ruby Priority: optional -Maintainer: Ubuntu Developers <[email protected]> -XSBC-Original-Maintainer: Debian Ruby Team <[email protected]> +Maintainer: Debian Ruby Team <[email protected]> Uploaders: Antonio Terceiro <[email protected]>, Lucas Kanashiro <[email protected]> Build-Depends: debhelper-compat (= 13) @@ -16,10 +15,12 @@ Multi-Arch: allowed Depends: ruby3.3, libruby (= ${binary:Version}), ruby-rubygems, ${misc:Depends} Suggests: ri, ruby-dev -Conflicts: ruby-activesupport-3.3, ruby-activesupport-2.3 +Conflicts: ruby-activesupport-3.2, ruby-activesupport-2.3 Breaks: + ruby-marisa (<< 0.2.6-18+b4), ruby-switch (<= 0.1.0), - ruby-bootsnap (<< 1.4.6-1) + ruby-bootsnap (<< 1.4.6-1), + puppet-agent (<= 7.24.0) Replaces: irb, rdoc, rubygems Provides: irb, rdoc, rubygems Description: Interpreter of object-oriented scripting language Ruby (default version) diff -dru ruby-defaults/debian/README.Debian debian-package/ruby-defaults-3.3/debian/README.Debian --- ruby-defaults/debian/README.Debian 2025-06-02 10:17:17.867941816 -0300 +++ debian-package/ruby-defaults-3.3/debian/README.Debian 2025-01-10 13:29:53.000000000 -0300 @@ -30,7 +30,7 @@ ------------------------------------------------- To skip building/testing against a specific Ruby version that is listed as -suppotted, you can set e.g. RUBY_ALL_DEV_SKIP=ruby3.3 and get ruby3.3 ignored. +suppotted, you can set e.g. RUBY_ALL_DEV_SKIP=ruby3.2 and get ruby3.2 ignored. This is a developer feature, intended for very specific use cases, and MUST NOT be used in any Debian packages to skip tests and whatnot. diff -dru ruby-defaults/debian/rules debian-package/ruby-defaults-3.3/debian/rules --- ruby-defaults/debian/rules 2025-06-02 11:23:36.341887596 -0300 +++ debian-package/ruby-defaults-3.3/debian/rules 2025-02-10 10:37:44.000000000 -0300 @@ -12,6 +12,7 @@ export DEBIAN_RUBY_PROGRAMS = \ erb \ irb \ + rdbg \ rdoc \ ri \ ruby diff -dru ruby-defaults/debian/tests/smoke-test debian-package/ruby-defaults-3.3/debian/tests/smoke-test --- ruby-defaults/debian/tests/smoke-test 2025-06-02 11:23:36.341887596 -0300 +++ debian-package/ruby-defaults-3.3/debian/tests/smoke-test 2025-02-10 10:37:44.000000000 -0300 @@ -9,7 +9,7 @@ gem env -gems=$AUTOPKGTEST_TMP/gems +gems=${AUTOPKGTEST_TMP:=/tmp}/gems gem list | tee $gems # some standard gems should be available Only in ruby-defaults/debian/tests: wheezy2jessie-apt-listbugs-ruby1.8 Only in ruby-defaults/debian/tests: wheezy2jessie.control Only in ruby-defaults/debian/tests: wheezy2jessie-ruby-version Only in ruby-defaults: .git Comments on the diff: d/control is adding a few more packages to Breaks due to the new version which is the right thing to do. The important change here is the change in the conflicting ruby-activesupport version. The ubuntu delta conflicts with ruby-activesupport-3.3, which never existed. ruby- activesupport-3.2 is the one it should confict with. The delta seems to be a small packaging mistake which a sync will fix. d/rules is adding the missing rdbg binary, which is the right thing to do here as well. The remaining changes are DEP8 tests improvements. This package should be sync'd I will wait for a +1 to proceed. -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/2110458 Title: Merge ruby-defaults from Debian Unstable for questing To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/ruby-defaults/+bug/2110458/+subscriptions -- ubuntu-bugs mailing list [email protected] https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
