diff -Nru rust-rusty-pool-0.7.0/debian/changelog rust-rusty-pool-0.7.0/debian/changelog --- rust-rusty-pool-0.7.0/debian/changelog 2022-12-07 14:03:50.000000000 +0000 +++ rust-rusty-pool-0.7.0/debian/changelog 2023-02-02 19:33:45.000000000 +0000 @@ -1,3 +1,16 @@ +rust-rusty-pool (0.7.0-5) unstable; urgency=medium + + * tighten autopkgtests + * stop superfluously provide virtual unversioned feature packages + * change binary library package to be arch-independent + * declare compliance with Debian Policy 4.6.2 + * update dh-cargo fork; + build-depend on libstring-shellquote-perl + * update copyright info: update coverage + * fix: stop recommend gone virtual package + + -- Jonas Smedegaard Thu, 02 Feb 2023 20:33:45 +0100 + rust-rusty-pool (0.7.0-4) unstable; urgency=medium * stop superfluously provide virtual packages diff -Nru rust-rusty-pool-0.7.0/debian/control rust-rusty-pool-0.7.0/debian/control --- rust-rusty-pool-0.7.0/debian/control 2022-12-07 13:51:23.000000000 +0000 +++ rust-rusty-pool-0.7.0/debian/control 2023-02-02 19:33:20.000000000 +0000 @@ -9,17 +9,17 @@ librust-futures-channel-0.3+default-dev (>= 0.3.21) , librust-futures-executor-0.3+default-dev , librust-num-cpus-1+default-dev (>= 1.13.1) , + libstring-shellquote-perl, Maintainer: Jonas Smedegaard -Standards-Version: 4.6.1 +Standards-Version: 4.6.2 Vcs-Git: https://salsa.debian.org/debian/rust-rusty-pool.git Vcs-Browser: https://salsa.debian.org/debian/rust-rusty-pool Homepage: https://github.com/robinfriedli/rusty_pool Rules-Requires-Root: no -X-Cargo-Crate: rusty_pool Package: librust-rusty-pool-dev -Architecture: any -Multi-Arch: same +Architecture: all +Multi-Arch: foreign Depends: librust-crossbeam-channel-0.5+default-dev, librust-futures-0.3+default-dev, @@ -27,11 +27,7 @@ librust-futures-executor-0.3+default-dev, librust-num-cpus-1+default-dev (>= 1.13.1), ${misc:Depends}, -Recommends: - librust-rusty-pool+async-dev (= ${binary:Version}), Provides: - librust-rusty-pool+async-dev (= ${binary:Version}), - librust-rusty-pool+default-dev (= ${binary:Version}), librust-rusty-pool-0-dev (= ${binary:Version}), librust-rusty-pool-0.7+async-dev (= ${binary:Version}), librust-rusty-pool-0.7+default-dev (= ${binary:Version}), diff -Nru rust-rusty-pool-0.7.0/debian/copyright rust-rusty-pool-0.7.0/debian/copyright --- rust-rusty-pool-0.7.0/debian/copyright 2022-10-26 14:22:22.000000000 +0000 +++ rust-rusty-pool-0.7.0/debian/copyright 2023-02-02 19:30:21.000000000 +0000 @@ -13,9 +13,10 @@ Cargo.toml LICENSE -Files: debian/* +Files: + debian/* Copyright: - 2022 Jonas Smedegaard + 2022-2023 Jonas Smedegaard License-Grant: This packaging is free software: you can redistribute it and/or modify it @@ -26,7 +27,8 @@ License: GPL-3+ Reference: debian/copyright -Files: debian/debcargo/bin/cargo +Files: + debian/debcargo/bin/cargo Copyright: 2022 Jonas Smedegaard 2015-2016 Luca Bruno @@ -34,11 +36,12 @@ 2016-2019 Ximin Luo License: Apache-2.0 or Expat -Files: debian/debcargo/lib/* +Files: + debian/debcargo/lib/* Copyright: - 2022 Jonas Smedegaard - 2016 Josh Triplett - 2018 Ximin Luo + 2022-2023 Jonas Smedegaard + 2016 Josh Triplett + 2018 Ximin Luo License: Expat License: Apache-2.0 diff -Nru rust-rusty-pool-0.7.0/debian/copyright_hints rust-rusty-pool-0.7.0/debian/copyright_hints --- rust-rusty-pool-0.7.0/debian/copyright_hints 2022-12-07 14:03:45.000000000 +0000 +++ rust-rusty-pool-0.7.0/debian/copyright_hints 2023-02-02 19:30:31.000000000 +0000 @@ -22,13 +22,21 @@ FIXME Files: LICENSE - debian/dh-cargo/bin/cargo Copyright: NONE License: Apache-2.0 FIXME +Files: debian/dh-cargo/bin/cargo +Copyright: 2015-2016, Luca Bruno + 2016-2019, Ximin Luo + 2017-2019, Vasudeva Kamath +License: Apache-2.0 + FIXME + Files: debian/dh-cargo/lib/Debian/Debhelper/Buildsystem/cargo.pm -Copyright: NONE +Copyright: 2016, Josh Triplett + 2018, Ximin Luo + 2022-2023, Jonas Smedegaard License: Expat FIXME diff -Nru rust-rusty-pool-0.7.0/debian/dh-cargo/bin/cargo rust-rusty-pool-0.7.0/debian/dh-cargo/bin/cargo --- rust-rusty-pool-0.7.0/debian/dh-cargo/bin/cargo 2022-07-01 11:28:52.000000000 +0000 +++ rust-rusty-pool-0.7.0/debian/dh-cargo/bin/cargo 2023-01-25 15:45:55.000000000 +0000 @@ -3,8 +3,8 @@ Wrapper around cargo to have it build using Debian settings. SPDX-FileCopyrightText: 2015-2016 Luca Bruno -SPDX-FileCopyrightText: 2017-2019 Vasudeva Kamath SPDX-FileCopyrightText: 2016-2019 Ximin Luo +SPDX-FileCopyrightText: 2017-2019 Vasudeva Kamath SPDX-License-Identifier: Apache-2.0 or MIT @@ -35,8 +35,11 @@ Otherwise, you *must* set the following environment variables: -- DEB_CARGO_CRATE +- (optional) DEB_CARGO_CRATE ${crate}_${version} of whatever you're building. + Needed for command "prepare-debian" with option --link-from-system + when --remap-path-prefix options are not set in RUSTFLAGS, + and for command "install". - CFLAGS CXXFLAGS CPPFLAGS LDFLAGS [*] - DEB_HOST_GNU_TYPE DEB_HOST_RUST_TYPE [*] @@ -101,9 +104,16 @@ rustflags.extend(["-C", "linker=%s-gcc" % host_gnu_type]) for f in ldflags: rustflags.extend(["-C", "link-arg=%s" % f]) - if link_from_system: - rustflags.extend(["--remap-path-prefix", "%s=%s/%s" % - (sourcepath(), SYSTEM_REGISTRY, cratespec.replace("_", "-"))]) + if link_from_system and cratespec: + rustflags.extend([ + # Note that this order is important! Rust evaluates these options in + # priority of reverse order, so if the second option were in front, + # it would never be used, because any paths in registry_path are + # also in sourcepath(). + "--remap-path-prefix", "%s=%s/%s" % + (sourcepath(), SYSTEM_REGISTRY, cratespec.replace("_", "-")), + "--remap-path-prefix", "%s=%s" % (registry_path, SYSTEM_REGISTRY), + ]) rustflags.extend(extra_rustflags.split()) # TODO: we cannot enable this until dh_shlibdeps works correctly; atm we get: @@ -196,8 +206,9 @@ link_from_system = False if len(args) > 2 and args[2] == "--link-from-system": link_from_system = True + cratespec = os.environ.get('DEB_CARGO_CRATE') return prepare_debian(cargo_home, registry, - os.environ["DEB_CARGO_CRATE"], host_gnu_type, + cratespec, host_gnu_type, os.getenv("LDFLAGS", "").split(), link_from_system, extra_rustflags) newargs = [] diff -Nru rust-rusty-pool-0.7.0/debian/dh-cargo/lib/Debian/Debhelper/Buildsystem/cargo.pm rust-rusty-pool-0.7.0/debian/dh-cargo/lib/Debian/Debhelper/Buildsystem/cargo.pm --- rust-rusty-pool-0.7.0/debian/dh-cargo/lib/Debian/Debhelper/Buildsystem/cargo.pm 2022-07-01 11:28:52.000000000 +0000 +++ rust-rusty-pool-0.7.0/debian/dh-cargo/lib/Debian/Debhelper/Buildsystem/cargo.pm 2023-01-25 15:45:55.000000000 +0000 @@ -1,8 +1,8 @@ # debhelper buildsystem for Rust crates using Cargo # -# SPDX-FileCopyrightText: 2022 Jonas Smedegaard # SPDX-FileCopyrightText: 2016 Josh Triplett # SPDX-FileCopyrightText: 2018 Ximin Luo +# SPDX-FileCopyrightText: 2022-2023 Jonas Smedegaard # # SPDX-License-Identifier: MIT # @@ -15,7 +15,7 @@ # # If you have a multi-language program such as firefox or librsvg that # includes private Rust crates or libraries not exposed to others, you -# should instead use the cargo wrapper at debian/dh-cargo/bin/cargo, +# should instead use our cargo wrapper, in debian/dh-cargo/bin/cargo, # which this script also uses. That file contains usage instructions. # You then should define a Build-Depends on cargo and not dh-cargo. # The Debian cargo package itself also uses the wrapper as part of its @@ -30,23 +30,46 @@ use warnings; use Cwd; use Debian::Debhelper::Dh_Lib; -use Dpkg::Changelog::Debian; use Dpkg::Control::Info; -use Dpkg::Version; +use Dpkg::Deps; +use File::Spec; use JSON::PP; +use String::ShellQuote qw( shell_quote ); use base 'Debian::Debhelper::Buildsystem'; +use constant CARGO_SYSTEM_REGISTRY => '/usr/share/cargo/registry/'; + sub DESCRIPTION { "Rust Cargo" } -sub cargo_version { - my $src = shift; +sub cargo_crates { + my ( $root, $src, $default ) = @_; open(F, "cargo metadata --manifest-path $src --no-deps --format-version 1 |"); local $/; my $json = JSON::PP->new; my $manifest = $json->decode(); - return %{@{%{$manifest}{'packages'}}[0]}{'version'} . ""; + my %crates; + for ( @{ $manifest->{packages} } ) { + my $pkg_longstem = "$_->{name}-$_->{version}" =~ s/_/-/gr; + my %object = ( + cratespec => "$_->{name}_$_->{version}", + systempath => CARGO_SYSTEM_REGISTRY . "/$_->{name}-$_->{version}", + sourcepath => File::Spec->abs2rel( $_->{manifest_path} =~ s{/Cargo\.toml$}{}r, $root ), + ); + + # resolve crate from dh-cargo cratespec + $crates{ $object{cratespec} } = \%object; + + # resolve topmost declared crate from package stems + $crates{$_} //= \%object + for ( $pkg_longstem =~ /^(((([^+]+?)-[^+.-]+)?\.[^+.]+)?\.[^+]+)?$/ ); + + # resolve topmost declared crate from crate name + $crates{_default} //= \%object + if $_->{name} eq $default; + } + return \%crates; } sub deb_host_rust_type { @@ -67,6 +90,14 @@ return 0; } +# fork of Debian::Debhelper::Buildsystem::doit_in_sourcedir() +# needed to work on individual members of a workspace crate +sub doit_in_somedir { + my ($this, $dir, @args) = @_; + $this->_generic_doit_in_dir($dir, \&print_and_doit, @args); + return 1; +} + sub new { my $class = shift; my $this = $class->SUPER::new(@_); @@ -95,41 +126,101 @@ $crate =~ s/^ru[sz]t-//; $crate =~ s/-[0-9]+(\.[0-9]+)*$//; } - $this->{crate} = $crate; - my $changelog = Dpkg::Changelog::Debian->new(range => { count => 1 }); - $changelog->load("debian/changelog"); - $this->{version} = Dpkg::Version->new(@{$changelog}[0]->get_version())->version(); - - my @packages = $control->get_packages(); - $this->{libpkg} = 0; - $this->{binpkg} = 0; + $this->{crates} = cargo_crates( $this->{cwd}, $this->get_sourcepath("Cargo.toml"), $crate ); + + $this->{libpkg} = {}; + $this->{binpkg} = {}; $this->{featurepkg} = []; - foreach my $package (@packages) { - if ($package->{Package} =~ /^libru[sz]t-.*-dev$/) { - if ($package->{Package} =~ /\+/) { - push(@{$this->{featurepkg}}, $package->{Package}); + my @arch_packages = getpackages('arch'); + my $cratepkg_re = qr/^libru[sz]t-(?[^+]+?(?-[^+.-]+(?:\.[^+.]+){2})?)(?:\+(?.+))?-dev$/; + foreach my $package ( getpackages() ) { + if ($package =~ /$cratepkg_re/) { + unless ( $this->{crates}{ $+{stem} } ) { + error("Failed to resolve crate \"$+{stem}\" in cargo metadata for library package $package."); + } + if ( $+{feature} ) { + push(@{$this->{featurepkg}}, { name => $package , libcrate => $this->{crates}{ $+{stem} } }); next; } - if ($this->{libpkg}) { - error("Multiple Cargo lib packages found: " . $this->{libpkg} . " and " . $package->{Package}); + $this->{libpkg}{$package}{name} = $package; + my %fullnames; + if ( $+{fullversion} ) { + push @{ $this->{libpkg}{$package}{crates} }, $this->{crates}{ $+{stem} }; + $fullnames{ "$+{stem}$+{fullversion}" } = undef; + } + deps_iterate( + deps_parse( deps_concat( $control->get_pkg_by_name($package)->{'Provides'} ), virtual => 1 ), + sub { + $_[0]->{package} =~ /$cratepkg_re/; + if ( $+{fullversion} and not exists $fullnames{ "$+{stem}$+{fullversion}" } ) { + unless ( $this->{crates}{ $+{stem} } ) { + error("Failed to resolve crate \"$+{stem}\" in cargo metadata for virtual library package \"$package\"."); + } + push @{ $this->{libpkg}{$package}{crates} }, $this->{crates}{ $+{stem} }; + $fullnames{ "$+{stem}$+{fullversion}" } = undef; + } + 1; + }, + ) or error("Failed to parse virtual crate library packages provided by package $package."); + } elsif ( grep {$package} @arch_packages ) { + deps_iterate( + # TODO: parse as crate names (not package names) + deps_parse( deps_concat( $control->get_pkg_by_name($package)->{'X-Cargo-Crates'} ) ), + sub { + my $crate = $this->{crates}{ $_[0]->{package} }; + if ($crate) { + if ( exists $crate->{binpkg} ) { + error("Crate $crate->{cratespec} is tied to multiple packages: $crate->{binpkg}{name} and $package."); + } + push @{ $this->{binpkg}{$package}{crates} }, $crate; + $crate->{binpkg}{name} = $package; + } else { + error("Failed to resolve crate \"$_[0]->{package}\" in cargo metadata for binary package \"$package\"."); + } + 1; + }, + ) or error("Failed to parse crates for binary package $package."); + unless ( keys %{ $this->{binpkg} } ) { + # fallback: use arch-specific package when name matches a crate + my $crate = $this->{crates}{$package}; + if ($crate and not $crate->{binpkg} ) { + push @{ $this->{binpkg}{$package}{crates} }, $crate; + $crate->{binpkg}{name} = $package; + } + } + } + } + unless ( keys %{ $this->{libpkg} } or keys %{ $this->{binpkg} } ) { + # default: tie a single arch-specific package with topmost crate + if ( @arch_packages eq 1 ) { + unless ( exists $this->{crates}{_default} ) { + error("Failed to resolve a default crate from cargo metadata."); } - $this->{libpkg} = $package->{Package}; - } elsif ($package->{Architecture} ne 'all') { - $this->{binpkg} = $package->{Package}; + push @{ $this->{binpkg}{ $arch_packages[0] }{crates} }, $this->{crates}{_default}; + $this->{crates}{_default}{binpkg}{name} = $arch_packages[0]; + } else { + error("Could not find any Cargo lib or bin packages to build."); } } - if (!$this->{libpkg} && !$this->{binpkg}) { - error("Could not find any Cargo lib or bin packages to build."); + foreach my $pkg ( values %{ $this->{libpkg} } ) { + foreach my $crate ( @{ $pkg->{crates} } ) { + if ( exists $crate->{libpkg} ) { + error("Crate $crate->{cratespec} is tied to multiple packages: $crate->{libpkg}{name} and $pkg->{name}."); + } + $crate->{libpkg} = $pkg; + } } - if (@{$this->{featurepkg}} && !$this->{libpkg}) { - error("Found feature packages but no lib package."); + foreach my $pkg (@{$this->{featurepkg}}) { + unless ( exists $pkg->{libcrate}{libpkg} ) { + error("Found feature package $pkg->{name} but no matching lib package."); + } + push @{ $pkg->{libcrate}{libpkg}{featurepkg} }, $pkg->{name}; } my $parallel = $this->get_parallel(); $this->{j} = $parallel > 0 ? ["-j$parallel"] : []; - $ENV{'CARGO_HOME'} = $this->{cargo_home}; - $ENV{'DEB_CARGO_CRATE'} = $crate . '_' . $this->{version}; + $ENV{'CARGO_HOME'} ||= $this->{cargo_home}; $ENV{'DEB_HOST_RUST_TYPE'} = $this->{host_rust_type}; $ENV{'DEB_HOST_GNU_TYPE'} = dpkg_architecture_value("DEB_HOST_GNU_TYPE"); @@ -137,8 +228,8 @@ } sub get_sources { - my $this=shift; - opendir(my $dirhandle, $this->get_sourcedir()); + my ( $this, $sourcedir ) = @_; + opendir(my $dirhandle, $sourcedir); my @sources = grep { !/^(\.(\.|git.*|pc)?|debian|Cargo\.lock|COPYING.*|LICENSE.*)$/ } readdir($dirhandle); closedir($dirhandle); @sources @@ -154,9 +245,16 @@ if -f "debian/Cargo.lock"; doit(qw(sed -i -e), '/^checksum / d', $cargo_lock); } + my $registry_path = $this->_rel2rel('debian/cargo_registry', $this->get_sourcedir()); + my @rustflags = map {( + "--remap-path-prefix", + "$_->{cratespec}=$_->{systempath}", + )} map { @{ $this->{libpkg}{$_}{crates} } } sort keys %{ $this->{libpkg} }; + push @rustflags, "--remap-path-prefix", "$registry_path=" . CARGO_SYSTEM_REGISTRY; $this->doit_in_sourcedir( + "env", 'RUSTFLAGS=' . shell_quote(@rustflags), $this->{cargo_command}, "prepare-debian", - $this->_rel2rel('debian/cargo_registry', $this->get_sourcedir()), + $registry_path, "--link-from-system"); if ( -d 'debian/vendorlibs' ) { complex_doit( @@ -171,7 +269,7 @@ my $this=shift; # Compile the crate, if needed to build binaries. $this->doit_in_sourcedir($this->{cargo_command}, "build", @_) - if ($this->{binpkg}); + if ( keys %{ $this->{binpkg} } ); } sub test { @@ -189,36 +287,38 @@ sub install { my $this=shift; my $destdir=shift; - my $crate = $this->{crate} . '-' . cargo_version($this->get_sourcepath("Cargo.toml")); - if ($this->{libpkg}) { - my $target = tmpdir($this->{libpkg}) . "/usr/share/cargo/registry/$crate"; - my @sources = $this->get_sources(); + foreach my $crate ( map { @{ $_->{crates} } } sort values %{ $this->{libpkg} } ) { + my $target = tmpdir( $crate->{libpkg}{name} ) . $crate->{systempath}; + my @sources = $this->get_sources( $crate->{sourcepath} ); install_dir($target); - $this->doit_in_sourcedir( + $this->doit_in_somedir( + $crate->{sourcepath}, + "env", "DEB_CARGO_CRATE=$crate->{cratespec}", "cp", "--parents", - "-at", $this->_rel2rel($target, $this->get_sourcedir()), + "-at", $this->_rel2rel($target, $crate->{sourcepath}), @sources); doit("rm", "-rf", "$target/target"); complex_doit( qw(perl -MDigest::SHA=sha256_hex -0777 -nE 'say sprintf), 'q<{"package":"%s","files":{}}>,', "sha256_hex($_)'", - "<", $this->get_sourcepath("Cargo.toml"), + "<", "$crate->{sourcepath}/Cargo.toml", ">", "$target/.cargo-checksum.json"); # prevent an ftpmaster auto-reject regarding files with old dates. doit("touch", "-d@" . $ENV{SOURCE_DATE_EPOCH}, "$target/Cargo.toml"); - } - foreach my $pkg (@{$this->{featurepkg}}) { - my $target = tmpdir($pkg) . "/usr/share/doc"; + } + foreach my $featurepkg (@{$this->{featurepkg}}) { + my $target = tmpdir( $featurepkg->{name} ) . "/usr/share/doc"; install_dir($target); - make_symlink_raw_target($this->{libpkg}, "$target/$pkg"); + make_symlink_raw_target( $featurepkg->{libcrate}{libpkg}{name}, "$target/$featurepkg->{name}" ); } - if ($this->{binpkg}) { + foreach my $crate ( map { @{ $_->{crates} } } sort values %{ $this->{binpkg} } ) { # Do the install - my $destdir = $ENV{'DESTDIR'} || tmpdir($this->{binpkg}); - $this->doit_in_sourcedir("env", "DESTDIR=$destdir", - $this->{cargo_command}, "install", @_); + my $destdir = $ENV{'DESTDIR'} || tmpdir( $crate->{binpkg}{name} ); + my @path_opts = $crate->{sourcepath} ne '.' ? ('--path', $crate->{sourcepath}) : (); + $this->doit_in_sourcedir("env", "DESTDIR=$destdir", "DEB_CARGO_CRATE=$crate->{cratespec}", + $this->{cargo_command}, "install", @path_opts, @_); # generate Built-Using fields - doit("env", "/usr/share/cargo/bin/dh-cargo-built-using", $this->{binpkg}); + doit("env", "/usr/share/cargo/bin/dh-cargo-built-using", $crate->{binpkg}{name}); } } diff -Nru rust-rusty-pool-0.7.0/debian/dh-cargo/README.md rust-rusty-pool-0.7.0/debian/dh-cargo/README.md --- rust-rusty-pool-0.7.0/debian/dh-cargo/README.md 2022-07-01 11:28:52.000000000 +0000 +++ rust-rusty-pool-0.7.0/debian/dh-cargo/README.md 2023-01-25 15:45:55.000000000 +0000 @@ -1,35 +1,45 @@ # dh-cargo fork This is a fork of the debhelper script [dh-cargo], -based on git commit 5cc7f7b -(included with version 28 released 2021-11-07), +based on git commit e07347b +(included with version 30 released 2022-11-25), with these functional changes: - * support debhelper option --sourcedirectory - * fix use cargo_version (not Debian version) in crate path - * generate cargo-checksum during install - * stop blindly install all crate content: + * support workspace (i.e. multi-crate project), + * resolve crate name and version from Cargo.toml, + using X-Cargo-Crates hint or library package name only as key + * support debhelper option --sourcedirectory + * support debhelper option --no-package + * validate package names against Cargo.toml entries, + failing early (not after test) on crate vs. package mismatch + * generate cargo-checksum during install + * pass cargo --remap-path-prefix option sets in RUSTFLAGS + * allow overriding CARGO_HOME + * use regex (not strings) for matching files to omit from install + * omit installing crate metadata in binary library packages: * omit any .git* files or directories * omit license files * omit debian/patches (see bug#880689) - * use lockfile during build when available, - or instead use debian/Cargo.lock when also available - * use crates embedded below debian/vendorlibs when available - * do build in target dh_auto_build - (not in dh_auto_test) - * check tests in target dh_auto_test - -Also included is a slight fork of related cargo wrapper script, -based on git commit 7823074 -(included with version 0.57.0-6 released 2022-04-10), + * use debian/Cargo.lock or Cargo.lock (in that order), + if Cargo.lock exists + * use crates below debian/vendorlibs when available + * use dh_auto_build + (not confusingly only dh_auto_test) + +Also included is a slight fork of related [cargo] wrapper script, +based on git commit e4072cb +(included with version 0.63.1-1 released 2022-11-16), with these functional changes: - * fix support relative path in CARGO_HOME, as documented + * support --remap-path-prefix option sets in RUSTFLAGS + by omitting that (not fail) when DEB_CARGO_CRATE is not set + * support documented shorter CARGO_HOME path + * support cargo option --path * fix only inject path for "cargo install" when not passed as option * support DEB_BUILD_OPTIONS=terse - * support DEB_BUILD_OPTIONS=noopt, - consistently using release or bench profiles by default + * enable optimization flags by default also for tests, + and support DEB_BUILD_OPTIONS=noopt [dh-cargo]: @@ -51,8 +61,8 @@ export PATH PERL5LIB %: - dh $@ --buildsystem cargo --sourcedirectory=rustls + dh $@ --buildsystem cargo ``` - -- Jonas Smedegaard Fri, 01 Jul 2022 13:28:35 +0200 + -- Jonas Smedegaard Wed, 25 Jan 2023 16:45:34 +0100 diff -Nru rust-rusty-pool-0.7.0/debian/tests/control rust-rusty-pool-0.7.0/debian/tests/control --- rust-rusty-pool-0.7.0/debian/tests/control 2022-12-07 14:02:03.000000000 +0000 +++ rust-rusty-pool-0.7.0/debian/tests/control 2023-02-02 19:28:02.000000000 +0000 @@ -1,35 +1,35 @@ Test-Command: /usr/share/cargo/bin/cargo-auto-test rusty_pool 0.7.0 --all-targets --all-features --no-fail-fast -- --skip tests::test_try_increment_worker_total --skip tests::worker_count_test -Features: test-name=rust-rusty-pool:@ +Features: test-name=rust-rusty-pool-0.7:@ Depends: dh-cargo (>= 18), - @, -Restrictions: allow-stderr, skip-not-installable + librust-rusty-pool-0.7-dev, +Restrictions: allow-stderr Test-Command: /usr/share/cargo/bin/cargo-auto-test rusty_pool 0.7.0 --all-targets --no-default-features --no-fail-fast -- --skip tests::test_try_increment_worker_total --skip tests::worker_count_test -Features: test-name=librust-rusty-pool-dev: +Features: test-name=rust-rusty-pool-0.7: Depends: dh-cargo (>= 18), - librust-rusty-pool-dev, -Restrictions: allow-stderr, skip-not-installable + librust-rusty-pool-0.7-dev, +Restrictions: allow-stderr Test-Command: /usr/share/cargo/bin/cargo-auto-test rusty_pool 0.7.0 --all-targets --no-default-features --features async --no-fail-fast -- --skip tests::test_try_increment_worker_total --skip tests::worker_count_test -Features: test-name=librust-rusty-pool-dev:async +Features: test-name=rust-rusty-pool-0.7:async Depends: dh-cargo (>= 18), - librust-rusty-pool+async-dev, -Restrictions: allow-stderr, skip-not-installable + librust-rusty-pool-0.7+async-dev, +Restrictions: allow-stderr Test-Command: /usr/share/cargo/bin/cargo-auto-test rusty_pool 0.7.0 --all-targets --no-fail-fast -- --skip tests::test_try_increment_worker_total --skip tests::worker_count_test -Features: test-name=librust-rusty-pool-dev:default +Features: test-name=rust-rusty-pool-0.7:default Depends: dh-cargo (>= 18), - librust-rusty-pool+default-dev, -Restrictions: allow-stderr, skip-not-installable + librust-rusty-pool-0.7+default-dev, +Restrictions: allow-stderr