Merge mdevctl from Debian unstable for noble

Bug #2040398 reported by Bryce Harrington
14
This bug affects 1 person
Affects Status Importance Assigned to Milestone
mdevctl (Ubuntu)
Fix Released
Undecided
Athos Ribeiro

Bug Description

Upstream: tbd
Debian: 1.2.0-5
Ubuntu: 1.2.0-3ubuntu1

Debian does new releases regularly, so it's likely there will be newer versions available before FF that we can pick up if this merge is done later in the cycle.

If it turns out this needs a sync rather than a merge, please change the tag 'needs-merge' to 'needs-sync', and (optionally) update the title as desired.

### New Debian Changes ###

mdevctl (1.2.0-5) unstable; urgency=medium

  [ Athos Ribeiro ]
  * d/control: pin env_logger B-D required version (Closes: 1054157)

  [ Christian Ehrhardt ]
  * d/control: Add Athos Ribeiro to uploaders - Thank you for all the great
    contributions so far!

 -- Christian Ehrhardt <email address hidden> Mon, 23 Oct 2023 10:21:00 +0200

mdevctl (1.2.0-4) unstable; urgency=medium

  [ Athos Ribeiro ]
  * d/control: bump Standards-Version to 4.6.2 (no changes needed)
  * d/patches: adjust env_logger dependency version (Closes: #1050521)
  * d/rules: run test suite during package build

 -- Christian Ehrhardt <email address hidden> Mon, 04 Sep 2023 16:46:19 +0200

mdevctl (1.2.0-3) unstable; urgency=medium

  [ Peter Michael Green ]
  * Update Debian dependencies on clap related packages to reflrect cargo
    dependencies (Closes: #1028655). Thanks to Peter Micheal Green for
    the report and suggested changes.

 -- Christian Ehrhardt <email address hidden> Thu, 19 Jan 2023 13:37:16 +0100

mdevctl (1.2.0-2) unstable; urgency=medium

  [ Christian Ehrhardt ]
  * Update uuid version to 1.0 (Closes: #1017369)
    Thanks to Peter Micheal Green for the report, taking the upstream
    accepted commit landed by Athos Ribeiro to solve this.
    - d/p/Update-uuid-version.patch new patch from upstream to work with
      uuid 1.0
    - d/p/lower-versions-for-unstable.patch: updated as we no more need to
      lower uuid

  [ Peter Micheal Green ]
  * d/control: switch uuid dependency to librust-uuid-1+v4-dev
  * d/rules: Fix clean target

 -- Christian Ehrhardt <email address hidden> Tue, 06 Sep 2022 10:25:20 +0200

mdevctl (1.2.0-1) unstable; urgency=medium

  [ Athos Ribeiro ]
  * Update Standards-Version (no changes needed)
  * d/copyright: update packaging copyright dates
  * d/rules: override tests to work for vendored dependencies too
    [Debian no-op]
  * d/rules: generate lockfile for vendored deps
    [Debian no-op]

  [ Christian Ehrhardt ]
  * New upstream version 1.2.0
  * d/control: adapt dependencies for 1.2.0
  * d/p/lower-versions-for-unstable.patch: adapt dependencies to Debian archive
  * Use upstream makefile for installation
    Upstream maintains a makefile that is generated out of the cargo build.
    Using that ensures we pick up any future changes more easily.
    In addition this will
    - properly install udev rules
    - add further subdirs of /etc/mdevctl.d
    - add lsmdev mapping
    - adds bash completion files
    - we no more need to maintain .dirs & .install files for the same
  * d/p/main-binary-already-installed.patch: avoid a vonflict between
    dh-cargo and the generated upstream makefile
  * d/p/main-binary-already-installed.patch: also place lsmdev correctly

 -- Christian Ehrhardt <email address hidden> Tue, 09 Aug 2022 13:24:25 +0200

mdevctl (1.1.0-2) unstable; urgency=medium

  [ Automated Janitor ]
  * Remove constraints unnecessary since buster

  [ Athos Ribeiro ]
  * d/control: depend on librust-uuid+rand-dev for v4 (Closes: #1013551)
  * d/rules: use vendorized dependencies for Ubuntu builds
    [easens their life, while being a no-op for Debian]

  [ Christian Ehrhardt ]
  * d/mdevctl.dirs: add /etc/mdevctl.d no more created by upstream
    (Closes: #1003777)

 -- Christian Ehrhardt <email address hidden> Tue, 26 Jul 2022 11:11:53 +0200

mdevctl (1.1.0-1) unstable; urgency=medium

  * New upstream version 1.1.0
    - fixes FTBFS in regard to env_logger (Closes: #998600)
  * d/control: bump Standards-Version to 4.6.0 (no changes needed)
  * d/control: use substvars provided by dh-cargo
  * d/p/lower-versions-for-unstable.patch: update for 1.1.0
  * d/control: librust-env-logger+default-dev now is new enough
  * d/p/tempfile-for-tempdir.patch: applied upstream

### Old Ubuntu Delta ###

mdevctl (1.2.0-3ubuntu1) lunar; urgency=medium

  * Merge with Debian unstable (LP: #1993417). Remaining changes:
    - d/watch: introduce vendor component with bundled dependencies.
    - vendor: unpack vendorized sources.
    - d/p/series: drop dependency version tweaks in favor of vendorized
      dependencies.
    - d/README.source: include information on uscan's Multiple Upstream
      Tarball (MUT) support for the vendorized code.
    - Ship Cargo lockfile to provide data on the vendorized code:
      + d/config.toml: provide a custom Cargo configuration to generate
        a lockfile from the vendorized dependencies.
      + d/install: ship the build-time generated lockfile.
    - d/copyright: include vendorized projects copyright data.
  * Dropped changes:
    - d/control: remove librust-uuid B-D. This is now vendorized in this
      package and the new librust-uuid version in kinetic is currently
      incompatible.
      [ Fixed in 1.2.0-2 ]
  * New changes:
    - d/p/series: drop Debian uuid version adjustment patch in favor of
      the vendorized version of the dependency.

 -- Athos Ribeiro <email address hidden> Thu, 26 Jan 2023 10:30:13 -0300

Related branches

Bryce Harrington (bryce)
Changed in mdevctl (Ubuntu):
milestone: none → ubuntu-24.01
Changed in mdevctl (Ubuntu):
assignee: nobody → Athos Ribeiro (athos-ribeiro)
Changed in mdevctl (Ubuntu):
milestone: ubuntu-24.01 → ubuntu-24.02
Revision history for this message
Athos Ribeiro (athos-ribeiro) wrote :

These are the changes introduced in Debian so far (from 1.2.0-4 to 1.2.0-6):

  * d/p/move-tempfile-to-dev-dependencies.patch: fix build with nocheck
  * d/control: pin env_logger B-D required version
  * d/control: Add Athos Ribeiro to uploaders
  * d/control: bump Standards-Version to 4.6.2
  * d/patches: adjust env_logger dependency version
  * d/rules: run test suite during package build

Most of them are either to build dependencies or to the package metadata. Since our B-Ds are vendorized, we do not need any of them.

The last one, regarding running the test suite during package build, is specific to Debian: we are already running the test suite during ubuntu builds (see d/rules).

Therefore, I am postponing this to February to see if we get any relevant changes in this packages. Otherwise, we do not really need a merge here.

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Also the newly added b-dep change to systemd-dev is likely not needed in the noble time-frame.

Upstream has plenty of changes that are interesting, but not yet released 1.3.0 and we'd not want to risk to diverge in a non official way. Maybe it is even better if those land post LTS to stabilize well.

Changed in mdevctl (Ubuntu):
status: New → In Progress
Revision history for this message
Launchpad Janitor (janitor) wrote :

This bug was fixed in the package mdevctl - 1.3.0-1ubuntu1

---------------
mdevctl (1.3.0-1ubuntu1) noble; urgency=medium

  * Merge with Debian unstable (LP: #2040398). Remaining changes:
    - d/watch: introduce vendor component with bundled dependencies.
    - vendor: unpack vendorized sources.
    - d/p/series: drop dependency version tweaks in favor of vendorized
      dependencies.
    - d/README.source: include information on uscan's Multiple Upstream
      Tarball (MUT) support for the vendorized code.
    - Ship Cargo lockfile to provide data on the vendorized code:
      + d/config.toml: provide a custom Cargo configuration to generate
        a lockfile from the vendorized dependencies.
      + d/install: ship the build-time generated lockfile.
    - d/copyright: include vendorized projects copyright data.
  * Dropped changes:
    - d/p/series: drop Debian uuid version adjustment patch in favor of
      the vendorized version of the dependency.
      [ Fixed in the upstream project in version 1.3.0 ]

 -- Athos Ribeiro <email address hidden> Fri, 16 Feb 2024 11:30:49 -0300

Changed in mdevctl (Ubuntu):
status: In Progress → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Duplicates of this bug

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.