diff --git a/src/object/debian/changelog b/src/object/debian/changelog index 2deb726..908c3c7 100644 --- a/src/object/debian/changelog +++ b/src/object/debian/changelog @@ -1,16 +1,3 @@ -rust-object (0.20.0-1) experimental; urgency=medium - - * Team upload. - * Package object 0.20.0 from crates.io using debcargo 2.4.4 - * Drop wasm/wasmparser feature. - * Drop rustc-dep-of-std feature. - * Use collapse_features = true, the extra dependencies are relatively - minimal. - * Mark as broken tests that do not enable the "read" feature. - (debcargo now runs most tests with no-default-features) - - -- Peter Michael Green Tue, 02 Nov 2021 04:42:39 +0000 - rust-object (0.12.0-4) unstable; urgency=medium * Team upload. diff --git a/src/object/debian/debcargo.toml b/src/object/debian/debcargo.toml index 419c692..10402e9 100644 --- a/src/object/debian/debcargo.toml +++ b/src/object/debian/debcargo.toml @@ -4,20 +4,5 @@ "Wolfgang Silbermayr ", ] -collapse_features = true - -# Tests seem to fail if the "read" feature (included in the default features) is not enabled -[packages.lib] -test_is_broken = true - -[packages."lib+default"] -test_is_broken = false - -[packages."lib+read"] -test_is_broken = false - -[packages."lib+all"] -test_is_broken = false - # The auto-generated summary is too long. summary = "Object file formats parsing interface" diff --git a/src/object/debian/patches/bump-flate2.patch b/src/object/debian/patches/bump-flate2.patch index ef75cd5..4b97b1d 100644 --- a/src/object/debian/patches/bump-flate2.patch +++ b/src/object/debian/patches/bump-flate2.patch @@ -4,8 +4,12 @@ =================================================================== --- object.orig/Cargo.toml +++ object/Cargo.toml -@@ -21,3 +21,3 @@ keywords = ["object", "loader", "elf", " +@@ -21,7 +21,7 @@ keywords = ["object", "loader", "elf", " + license = "Apache-2.0/MIT" + repository = "https://github.com/gimli-rs/object" [dependencies.flate2] -version = "1" +version = "1.0.13" optional = true + + [dependencies.goblin] diff --git a/src/object/debian/patches/relax-deps.diff b/src/object/debian/patches/relax-deps.diff new file mode 100644 index 0000000..4f315d2 --- /dev/null +++ b/src/object/debian/patches/relax-deps.diff @@ -0,0 +1,27 @@ +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -25,20 +25,20 @@ + optional = true + + [dependencies.goblin] +-version = "0.0.22" ++version = ">= 0.0.22, < 0.3.0" + features = ["endian_fd", "elf32", "elf64", "mach32", "mach64", "pe32", "pe64", "archive"] + default-features = false + + [dependencies.parity-wasm] +-version = "0.38.0" ++version = ">= 0.38.0, < 0.42.0" + optional = true + + [dependencies.scroll] +-version = "0.9" ++version = "0.10" + default-features = false + + [dependencies.uuid] +-version = "0.7" ++version = "0.8" + default-features = false + [dev-dependencies.memmap] + version = "0.7" diff --git a/src/object/debian/patches/series b/src/object/debian/patches/series index 3ed10f7..7d3c54d 100644 --- a/src/object/debian/patches/series +++ b/src/object/debian/patches/series @@ -1,3 +1,2 @@ +relax-deps.diff bump-flate2.patch -remove-wasm-feature.patch -remove-rustc-dep-of-std.patch