Bug#1014326: bullseye-pu: package rust-cbindgen/0.23.0-1~deb11u1
Package: release.debian.org
Severity: normal
Tags: bullseye
User: release.debian.org@packages.debian.org
Usertags: pu
X-Debbugs-Cc: pkg-rust-maintainers@alioth-lists.debian.net
Hi,
This is an update for rust-cbindgen, needed to build Firefox/Thunderbird.
We need 0.23 to build FF/TB 102. This update vendors the dependencies (as
we have done in the past with other versions, e.g. on buster/stretch).
I'm attaching a diff of the debian dir excluding the vendor dir.
Thanks,
Emilio
diff -ruNp rust-cbindgen-0.20.0/debian/changelog rust-cbindgen-0.23.0/debian/changelog
--- rust-cbindgen-0.20.0/debian/changelog 2021-12-02 12:49:31.000000000 +0100
+++ rust-cbindgen-0.23.0/debian/changelog 2022-07-04 10:59:17.608005927 +0200
@@ -1,3 +1,20 @@
+rust-cbindgen (0.23.0-1~deb11u1) bullseye; urgency=medium
+
+ * Non-maintainer upload.
+ * Backport to bullseye.
+ * Vendor dependencies, they are not available in bullseye.
+ * Only build the cbindgen binary.
+ * Lower dh-cargo build-dep.
+ * Build with rust-mozilla.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org> Mon, 04 Jul 2022 10:53:21 +0200
+
+rust-cbindgen (0.23.0-1) unstable; urgency=medium
+
+ * Package cbindgen 0.23.0 from crates.io using debcargo 2.5.0
+
+ -- Sylvestre Ledru <sylvestre@debian.org> Fri, 03 Jun 2022 11:20:37 +0200
+
rust-cbindgen (0.20.0-1~deb11u1) bullseye; urgency=medium
* Non-maintainer upload.
diff -ruNp rust-cbindgen-0.20.0/debian/control rust-cbindgen-0.23.0/debian/control
--- rust-cbindgen-0.20.0/debian/control 2021-08-22 14:26:42.000000000 +0200
+++ rust-cbindgen-0.23.0/debian/control 2022-06-17 13:33:38.349338635 +0200
@@ -2,27 +2,27 @@ Source: rust-cbindgen
Section: utils
Priority: optional
Build-Depends: debhelper (>= 12),
- dh-cargo (>= 24),
+ dh-cargo (>= 17),
cargo:native,
- rustc:native,
- libstd-rust-dev,
- librust-clap-2+default-dev,
- librust-heck-0.3+default-dev,
- librust-indexmap-1+default-dev,
- librust-log-0.4+default-dev,
- librust-proc-macro2-1+default-dev,
- librust-quote-1+default-dev,
- librust-serde-1+derive-dev (>= 1.0.103-~~),
- librust-serde-json-1+default-dev,
- librust-syn-1+clone-impls-dev (>= 1.0.3-~~),
- librust-syn-1+extra-traits-dev (>= 1.0.3-~~),
- librust-syn-1+full-dev (>= 1.0.3-~~),
- librust-syn-1+parsing-dev (>= 1.0.3-~~),
- librust-syn-1+printing-dev (>= 1.0.3-~~),
- librust-tempfile-3+default-dev,
- librust-toml-0.5+default-dev,
+ rustc-mozilla:native,
+ libstd-rust-mozilla-dev,
+# librust-clap-3+default-dev (>= 3.1-~~),
+# librust-heck-0.4+default-dev,
+# librust-indexmap-1+default-dev,
+# librust-log-0.4+default-dev,
+# librust-proc-macro2-1+default-dev,
+# librust-quote-1+default-dev,
+# librust-serde-1+derive-dev (>= 1.0.103-~~),
+# librust-serde-json-1+default-dev,
+# librust-syn-1+clone-impls-dev (>= 1.0.88-~~),
+# librust-syn-1+extra-traits-dev (>= 1.0.88-~~),
+# librust-syn-1+full-dev (>= 1.0.88-~~),
+# librust-syn-1+parsing-dev (>= 1.0.88-~~),
+# librust-syn-1+printing-dev (>= 1.0.88-~~),
+# librust-tempfile-3+default-dev,
+# librust-toml-0.5+default-dev,
help2man,
- librust-serial-test-dev,
+# librust-serial-test-dev,
cython3
Maintainer: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
Uploaders:
@@ -32,55 +32,55 @@ Vcs-Git: https://salsa.debian.org/rust-t
Vcs-Browser: https://salsa.debian.org/rust-team/debcargo-conf/tree/master/src/cbindgen
Rules-Requires-Root: no
-Package: librust-cbindgen-dev
-Architecture: any
-Multi-Arch: same
-Depends:
- ${misc:Depends},
- librust-heck-0.3+default-dev,
- librust-indexmap-1+default-dev,
- librust-log-0.4+default-dev,
- librust-proc-macro2-1+default-dev,
- librust-quote-1+default-dev,
- librust-serde-1+derive-dev (>= 1.0.103-~~),
- librust-serde-json-1+default-dev,
- librust-syn-1+clone-impls-dev (>= 1.0.3-~~),
- librust-syn-1+extra-traits-dev (>= 1.0.3-~~),
- librust-syn-1+full-dev (>= 1.0.3-~~),
- librust-syn-1+parsing-dev (>= 1.0.3-~~),
- librust-syn-1+printing-dev (>= 1.0.3-~~),
- librust-tempfile-3+default-dev,
- librust-toml-0.5+default-dev
-Recommends:
- librust-cbindgen+clap-dev (= ${binary:Version})
-Provides:
- librust-cbindgen-0-dev (= ${binary:Version}),
- librust-cbindgen-0.20-dev (= ${binary:Version}),
- librust-cbindgen-0.20.0-dev (= ${binary:Version})
-Description: Generating C bindings to Rust code - Rust source code
- This package contains the source for the Rust cbindgen crate, packaged by
- debcargo for use with cargo and dh-cargo.
-
-Package: librust-cbindgen+clap-dev
-Architecture: any
-Multi-Arch: same
-Depends:
- ${misc:Depends},
- librust-cbindgen-dev (= ${binary:Version}),
- librust-clap-2+default-dev
-Provides:
- librust-cbindgen+default-dev (= ${binary:Version}),
- librust-cbindgen-0+clap-dev (= ${binary:Version}),
- librust-cbindgen-0+default-dev (= ${binary:Version}),
- librust-cbindgen-0.20+clap-dev (= ${binary:Version}),
- librust-cbindgen-0.20+default-dev (= ${binary:Version}),
- librust-cbindgen-0.20.0+clap-dev (= ${binary:Version}),
- librust-cbindgen-0.20.0+default-dev (= ${binary:Version})
-Description: Generating C bindings to Rust code - feature "clap" and 1 more
- This metapackage enables feature "clap" for the Rust cbindgen crate, by pulling
- in any additional dependencies needed by that feature.
- .
- Additionally, this package also provides the "default" feature.
+#Package: librust-cbindgen-dev
+#Architecture: any
+#Multi-Arch: same
+#Depends:
+# ${misc:Depends},
+# librust-heck-0.4+default-dev,
+# librust-indexmap-1+default-dev,
+# librust-log-0.4+default-dev,
+# librust-proc-macro2-1+default-dev,
+# librust-quote-1+default-dev,
+# librust-serde-1+derive-dev (>= 1.0.103-~~),
+# librust-serde-json-1+default-dev,
+# librust-syn-1+clone-impls-dev (>= 1.0.88-~~),
+# librust-syn-1+extra-traits-dev (>= 1.0.88-~~),
+# librust-syn-1+full-dev (>= 1.0.88-~~),
+# librust-syn-1+parsing-dev (>= 1.0.88-~~),
+# librust-syn-1+printing-dev (>= 1.0.88-~~),
+# librust-tempfile-3+default-dev,
+# librust-toml-0.5+default-dev
+#Recommends:
+# librust-cbindgen+clap-dev (= ${binary:Version})
+#Provides:
+# librust-cbindgen-0-dev (= ${binary:Version}),
+# librust-cbindgen-0.23-dev (= ${binary:Version}),
+# librust-cbindgen-0.23.0-dev (= ${binary:Version})
+#Description: Generating C bindings to Rust code - Rust source code
+# This package contains the source for the Rust cbindgen crate, packaged by
+# debcargo for use with cargo and dh-cargo.
+#
+#Package: librust-cbindgen+clap-dev
+#Architecture: any
+#Multi-Arch: same
+#Depends:
+# ${misc:Depends},
+# librust-cbindgen-dev (= ${binary:Version}),
+# librust-clap-3+default-dev (>= 3.1-~~)
+#Provides:
+# librust-cbindgen+default-dev (= ${binary:Version}),
+# librust-cbindgen-0+clap-dev (= ${binary:Version}),
+# librust-cbindgen-0+default-dev (= ${binary:Version}),
+# librust-cbindgen-0.23+clap-dev (= ${binary:Version}),
+# librust-cbindgen-0.23+default-dev (= ${binary:Version}),
+# librust-cbindgen-0.23.0+clap-dev (= ${binary:Version}),
+# librust-cbindgen-0.23.0+default-dev (= ${binary:Version})
+#Description: Generating C bindings to Rust code - feature "clap" and 1 more
+# This metapackage enables feature "clap" for the Rust cbindgen crate, by pulling
+# in any additional dependencies needed by that feature.
+# .
+# Additionally, this package also provides the "default" feature.
Package: cbindgen
Architecture: any
diff -ruNp rust-cbindgen-0.20.0/debian/copyright.debcargo.hint rust-cbindgen-0.23.0/debian/copyright.debcargo.hint
--- rust-cbindgen-0.20.0/debian/copyright.debcargo.hint 2021-08-22 14:26:42.000000000 +0200
+++ rust-cbindgen-0.23.0/debian/copyright.debcargo.hint 2022-06-03 11:20:37.000000000 +0200
@@ -22,8 +22,8 @@ Comment:
Files: debian/*
Copyright:
- 2018-2021 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
- 2018-2021 Sylvestre Ledru <sylvestre@debian.org>
+ 2018-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2018-2022 Sylvestre Ledru <sylvestre@debian.org>
License: MPL-2.0
License: MPL-2.0
diff -ruNp rust-cbindgen-0.20.0/debian/files rust-cbindgen-0.23.0/debian/files
--- rust-cbindgen-0.20.0/debian/files 1970-01-01 01:00:00.000000000 +0100
+++ rust-cbindgen-0.23.0/debian/files 2022-07-04 10:59:48.088042681 +0200
@@ -0,0 +1 @@
+rust-cbindgen_0.23.0-1~deb11u1_source.buildinfo utils optional
diff -ruNp rust-cbindgen-0.20.0/debian/librust-cbindgen+clap-dev.lintian-overrides rust-cbindgen-0.23.0/debian/librust-cbindgen+clap-dev.lintian-overrides
--- rust-cbindgen-0.20.0/debian/librust-cbindgen+clap-dev.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
+++ rust-cbindgen-0.23.0/debian/librust-cbindgen+clap-dev.lintian-overrides 2022-06-03 11:20:37.000000000 +0200
@@ -0,0 +1 @@
+librust-cbindgen+clap-dev binary: empty-rust-library-declares-provides *
\ No newline at end of file
diff -ruNp rust-cbindgen-0.20.0/debian/patches/series rust-cbindgen-0.23.0/debian/patches/series
--- rust-cbindgen-0.20.0/debian/patches/series 2021-08-22 14:26:42.000000000 +0200
+++ rust-cbindgen-0.23.0/debian/patches/series 2022-06-17 13:21:49.000124609 +0200
@@ -1,2 +1,3 @@
use-cython3-for-tests.patch
use-tmpdir-for-tests.patch
+vendor-deps-config.patch
diff -ruNp rust-cbindgen-0.20.0/debian/patches/vendor-deps-config.patch rust-cbindgen-0.23.0/debian/patches/vendor-deps-config.patch
--- rust-cbindgen-0.20.0/debian/patches/vendor-deps-config.patch 1970-01-01 01:00:00.000000000 +0100
+++ rust-cbindgen-0.23.0/debian/patches/vendor-deps-config.patch 2022-06-17 13:21:43.740116184 +0200
@@ -0,0 +1,8 @@
+--- /dev/null
++++ b/.cargo/config
+@@ -0,0 +1,5 @@
++[source.crates-io]
++replace-with = "vendored-sources"
++
++[source.vendored-sources]
++directory = "vendor"
diff -ruNp rust-cbindgen-0.20.0/debian/rules rust-cbindgen-0.23.0/debian/rules
--- rust-cbindgen-0.20.0/debian/rules 2021-08-22 14:26:42.000000000 +0200
+++ rust-cbindgen-0.23.0/debian/rules 2022-06-17 13:13:13.247383759 +0200
@@ -2,6 +2,14 @@
%:
dh $@ --buildsystem cargo
+override_dh_auto_configure:
+ cp -a debian/vendor/ .
+ dh_auto_configure -O--buildsystem=cargo
+
+override_dh_clean:
+ dh_clean -O--buildsystem=cargo
+ rm -rf vendor/
+
override_dh_auto_test:
dh_auto_test -- test --all
diff -ruNp rust-cbindgen-0.20.0/debian/tests/control rust-cbindgen-0.23.0/debian/tests/control
--- rust-cbindgen-0.20.0/debian/tests/control 2021-08-22 14:26:42.000000000 +0200
+++ rust-cbindgen-0.23.0/debian/tests/control 2022-06-03 11:20:37.000000000 +0200
@@ -1,19 +1,19 @@
-Test-Command: /usr/share/cargo/bin/cargo-auto-test cbindgen 0.20.0 --all-targets --all-features
+Test-Command: /usr/share/cargo/bin/cargo-auto-test cbindgen 0.23.0 --all-targets --all-features
Features: test-name=rust-cbindgen:@
Depends: dh-cargo (>= 18), gcc, g++, cython3, librust-serial-test-0.5+default-dev, @
Restrictions: allow-stderr, skip-not-installable, flaky
-Test-Command: /usr/share/cargo/bin/cargo-auto-test cbindgen 0.20.0 --all-targets --no-default-features
+Test-Command: /usr/share/cargo/bin/cargo-auto-test cbindgen 0.23.0 --all-targets --no-default-features
Features: test-name=librust-cbindgen-dev:
Depends: dh-cargo (>= 18), gcc, g++, cython3, librust-serial-test-0.5+default-dev, @
Restrictions: allow-stderr, skip-not-installable, flaky
-Test-Command: /usr/share/cargo/bin/cargo-auto-test cbindgen 0.20.0 --all-targets
+Test-Command: /usr/share/cargo/bin/cargo-auto-test cbindgen 0.23.0 --all-targets
Features: test-name=librust-cbindgen+clap-dev:default
Depends: dh-cargo (>= 18), gcc, g++, cython3, librust-serial-test-0.5+default-dev, @
Restrictions: allow-stderr, skip-not-installable
-Test-Command: /usr/share/cargo/bin/cargo-auto-test cbindgen 0.20.0 --all-targets --no-default-features --features clap
+Test-Command: /usr/share/cargo/bin/cargo-auto-test cbindgen 0.23.0 --all-targets --no-default-features --features clap
Features: test-name=librust-cbindgen+clap-dev:clap
Depends: dh-cargo (>= 18), gcc, g++, cython3, librust-serial-test-0.5+default-dev, @
Restrictions: allow-stderr, skip-not-installable
Reply to: