gimli - reset to the version in unstable.

diff --git a/src/gimli/debian/changelog b/src/gimli/debian/changelog
index 94dfda293e09d6844bc63414c18bfa2628694824..d2a914ab84a773158c2d3b3db2040520fe9b0360 100644 (file)
--- 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 <plugwash@debian.org>  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 3c619e3a7a339bf3f6e673f6ee600f14e371d74b..fe3b1a7b1af3e8df1e91c2dcbf3fc202e812b419 100644 (file)
--- 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 <pkg-rust-maintainers@alioth-lists.debian.net>
- 2018-2021 Ximin Luo <infinity0@debian.org>
- 2018-2021 Wolfgang Silbermayr <wolfgang@silbermayr.at>
+ 2018-2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2018-2020 Ximin Luo <infinity0@debian.org>
+ 2018-2020 Wolfgang Silbermayr <wolfgang@silbermayr.at>
 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 8b51cfe8fca27225cc7207bb7c62cbaaa9e63e61..9c07083ec7bb36cb69c6b2a125e4916c7b1f3218 100644 (file)
--- a/src/gimli/debian/debcargo.toml
+++ b/src/gimli/debian/debcargo.toml
@@ -3,5 +3,3 @@ uploaders = [
   "Ximin Luo <infinity0@debian.org>",
   "Wolfgang Silbermayr <wolfgang@silbermayr.at>",
 ]
-
-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 (file)
index 02da6ce..0000000
--- 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 (file)
index 0000000..091f140
--- /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 44847cc68dfabc4cbbea342d9b7e54aca3296013..75abb7f14b7ecca84c97cd91e0c5e3fc349c6d09 100644 (file)
--- a/src/gimli/debian/patches/series
+++ b/src/gimli/debian/patches/series
@@ -1 +1 @@
-drop-rustc-dep-of-std.diff
+relax-dep.diff