From 6b17e7b50290679c6449a11963b025434867ca24 Mon Sep 17 00:00:00 2001 From: Peter Michael Green Date: Sun, 19 Dec 2021 01:44:20 +0000 Subject: [PATCH] gimli - reset to the version in unstable. --- src/gimli/debian/changelog | 8 ----- src/gimli/debian/copyright.debcargo.hint | 6 ++-- src/gimli/debian/debcargo.toml | 2 -- .../debian/patches/drop-rustc-dep-of-std.diff | 32 ------------------- src/gimli/debian/patches/relax-dep.diff | 11 +++++++ src/gimli/debian/patches/series | 2 +- 6 files changed, 15 insertions(+), 46 deletions(-) delete mode 100644 src/gimli/debian/patches/drop-rustc-dep-of-std.diff create mode 100644 src/gimli/debian/patches/relax-dep.diff diff --git a/src/gimli/debian/changelog b/src/gimli/debian/changelog index 94dfda293..d2a914ab8 100644 --- a/src/gimli/debian/changelog +++ b/src/gimli/debian/changelog @@ -1,11 +1,3 @@ -rust-gimli (0.22.0-1) experimental; urgency=medium - - * Team upload. - * Package gimli 0.22.0 from crates.io using debcargo 2.4.4 - * Drop relax-dep.patch no longer needed. - - -- Peter Michael Green Tue, 02 Nov 2021 04:44:40 +0000 - rust-gimli (0.19.0-2) unstable; urgency=medium * Package gimli 0.19.0 from crates.io using debcargo 2.4.0 diff --git a/src/gimli/debian/copyright.debcargo.hint b/src/gimli/debian/copyright.debcargo.hint index 3c619e3a7..fe3b1a7b1 100644 --- a/src/gimli/debian/copyright.debcargo.hint +++ b/src/gimli/debian/copyright.debcargo.hint @@ -32,9 +32,9 @@ Comment: Files: debian/* Copyright: - 2018-2021 Debian Rust Maintainers - 2018-2021 Ximin Luo - 2018-2021 Wolfgang Silbermayr + 2018-2020 Debian Rust Maintainers + 2018-2020 Ximin Luo + 2018-2020 Wolfgang Silbermayr License: Apache-2.0 or MIT License: Apache-2.0 diff --git a/src/gimli/debian/debcargo.toml b/src/gimli/debian/debcargo.toml index 8b51cfe8f..9c07083ec 100644 --- a/src/gimli/debian/debcargo.toml +++ b/src/gimli/debian/debcargo.toml @@ -3,5 +3,3 @@ uploaders = [ "Ximin Luo ", "Wolfgang Silbermayr ", ] - -collapse_features = true diff --git a/src/gimli/debian/patches/drop-rustc-dep-of-std.diff b/src/gimli/debian/patches/drop-rustc-dep-of-std.diff deleted file mode 100644 index 02da6ce57..000000000 --- a/src/gimli/debian/patches/drop-rustc-dep-of-std.diff +++ /dev/null @@ -1,32 +0,0 @@ -Index: gimli/Cargo.toml -=================================================================== ---- gimli.orig/Cargo.toml -+++ gimli/Cargo.toml -@@ -42,19 +42,6 @@ required-features = ["read", "std"] - [[example]] - name = "dwarf-validate" - required-features = ["read", "std"] --[dependencies.alloc] --version = "1.0.0" --optional = true --package = "rustc-std-workspace-alloc" -- --[dependencies.compiler_builtins] --version = "0.1.2" --optional = true -- --[dependencies.core] --version = "1.0.0" --optional = true --package = "rustc-std-workspace-core" - - [dependencies.fallible-iterator] - version = "0.2.0" -@@ -100,7 +87,6 @@ version = "2" - default = ["read", "write", "std", "fallible-iterator", "endian-reader"] - endian-reader = ["stable_deref_trait"] - read = [] --rustc-dep-of-std = ["core", "alloc", "compiler_builtins"] - std = ["fallible-iterator/std", "stable_deref_trait/std"] - write = ["indexmap"] - [badges.coveralls] diff --git a/src/gimli/debian/patches/relax-dep.diff b/src/gimli/debian/patches/relax-dep.diff new file mode 100644 index 000000000..091f140a2 --- /dev/null +++ b/src/gimli/debian/patches/relax-dep.diff @@ -0,0 +1,11 @@ +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -24,7 +24,7 @@ + license = "Apache-2.0/MIT" + repository = "https://github.com/gimli-rs/gimli" + [dependencies.arrayvec] +-version = "0.4.6" ++version = "0.5" + default-features = false + + [dependencies.byteorder] diff --git a/src/gimli/debian/patches/series b/src/gimli/debian/patches/series index 44847cc68..75abb7f14 100644 --- a/src/gimli/debian/patches/series +++ b/src/gimli/debian/patches/series @@ -1 +1 @@ -drop-rustc-dep-of-std.diff +relax-dep.diff -- 2.39.5