Bug#1001752: buster-pu: package cargo-mozilla/0.47.0-3~deb10u1

2021-12-16 Thread Emilio Pozuelo Monfort

On 15/12/2021 20:09, Adam D. Barratt wrote:

Control: tags -1 + confirmed

On Wed, 2021-12-15 at 11:38 +0100, Emilio Pozuelo Monfort wrote:

This update to cargo (with a renamed name to avoid disruption in the
rust/cargo ecosystem) is needed by the firefox / thunderbird updates.
It's a backport of the version in bullseye, which is enough for our
purposes. I've had to embed a newer version of libgit2, just like
we've
done in previous cargo updates for buster and stretch. This time I've
used the tarball from a debian upload so that it's dfsg and easy to
verify.

I've used this to build and test firefox ESR 91.3 on amd64.



Please go ahead, thanks.


binary-full upload done as this needs to go through NEW.

Thanks,
Emilio



Bug#1001752: buster-pu: package cargo-mozilla/0.47.0-3~deb10u1

2021-12-15 Thread Adam D. Barratt
Control: tags -1 + confirmed

On Wed, 2021-12-15 at 11:38 +0100, Emilio Pozuelo Monfort wrote:
> This update to cargo (with a renamed name to avoid disruption in the
> rust/cargo ecosystem) is needed by the firefox / thunderbird updates.
> It's a backport of the version in bullseye, which is enough for our
> purposes. I've had to embed a newer version of libgit2, just like
> we've
> done in previous cargo updates for buster and stretch. This time I've
> used the tarball from a debian upload so that it's dfsg and easy to
> verify.
> 
> I've used this to build and test firefox ESR 91.3 on amd64.
> 

Please go ahead, thanks.

Regards,

Adam



Bug#1001752: buster-pu: package cargo-mozilla/0.47.0-3~deb10u1

2021-12-15 Thread Emilio Pozuelo Monfort
Package: release.debian.org
Severity: normal
Tags: buster
User: release.debian@packages.debian.org
Usertags: pu
X-Debbugs-Cc: pkg-rust-maintain...@alioth-lists.debian.net, 
team+pkg-mozi...@tracker.debian.org

Hi,

This update to cargo (with a renamed name to avoid disruption in the
rust/cargo ecosystem) is needed by the firefox / thunderbird updates.
It's a backport of the version in bullseye, which is enough for our
purposes. I've had to embed a newer version of libgit2, just like we've
done in previous cargo updates for buster and stretch. This time I've
used the tarball from a debian upload so that it's dfsg and easy to
verify.

I've used this to build and test firefox ESR 91.3 on amd64.

Cheers,
Emilio
diff -Nru cargo-0.47.0/debian/cargo.bash-completion 
cargo-mozilla-0.47.0/debian/cargo.bash-completion
--- cargo-0.47.0/debian/cargo.bash-completion   2019-01-24 05:34:05.0 
+0100
+++ cargo-mozilla-0.47.0/debian/cargo.bash-completion   1970-01-01 
01:00:00.0 +0100
@@ -1 +0,0 @@
-src/etc/cargo.bashcomp.sh cargo
diff -Nru cargo-0.47.0/debian/cargo.dirs cargo-mozilla-0.47.0/debian/cargo.dirs
--- cargo-0.47.0/debian/cargo.dirs  2018-11-04 12:47:23.0 +0100
+++ cargo-mozilla-0.47.0/debian/cargo.dirs  1970-01-01 01:00:00.0 
+0100
@@ -1 +0,0 @@
-usr/bin
diff -Nru cargo-0.47.0/debian/cargo-doc.docs 
cargo-mozilla-0.47.0/debian/cargo-doc.docs
--- cargo-0.47.0/debian/cargo-doc.docs  2018-11-04 12:47:23.0 +0100
+++ cargo-mozilla-0.47.0/debian/cargo-doc.docs  1970-01-01 01:00:00.0 
+0100
@@ -1 +0,0 @@
-target/doc
diff -Nru cargo-0.47.0/debian/cargo.manpages 
cargo-mozilla-0.47.0/debian/cargo.manpages
--- cargo-0.47.0/debian/cargo.manpages  2018-11-04 12:47:23.0 +0100
+++ cargo-mozilla-0.47.0/debian/cargo.manpages  1970-01-01 01:00:00.0 
+0100
@@ -1,2 +0,0 @@
-src/etc/man/cargo-*.1
-src/etc/man/cargo.1
diff -Nru cargo-0.47.0/debian/cargo-mozilla.bash-completion 
cargo-mozilla-0.47.0/debian/cargo-mozilla.bash-completion
--- cargo-0.47.0/debian/cargo-mozilla.bash-completion   1970-01-01 
01:00:00.0 +0100
+++ cargo-mozilla-0.47.0/debian/cargo-mozilla.bash-completion   2019-01-24 
05:34:05.0 +0100
@@ -0,0 +1 @@
+src/etc/cargo.bashcomp.sh cargo
diff -Nru cargo-0.47.0/debian/cargo-mozilla.dirs 
cargo-mozilla-0.47.0/debian/cargo-mozilla.dirs
--- cargo-0.47.0/debian/cargo-mozilla.dirs  1970-01-01 01:00:00.0 
+0100
+++ cargo-mozilla-0.47.0/debian/cargo-mozilla.dirs  2018-11-04 
12:47:23.0 +0100
@@ -0,0 +1 @@
+usr/bin
diff -Nru cargo-0.47.0/debian/cargo-mozilla-doc.docs 
cargo-mozilla-0.47.0/debian/cargo-mozilla-doc.docs
--- cargo-0.47.0/debian/cargo-mozilla-doc.docs  1970-01-01 01:00:00.0 
+0100
+++ cargo-mozilla-0.47.0/debian/cargo-mozilla-doc.docs  2018-11-04 
12:47:23.0 +0100
@@ -0,0 +1 @@
+target/doc
diff -Nru cargo-0.47.0/debian/cargo-mozilla.manpages 
cargo-mozilla-0.47.0/debian/cargo-mozilla.manpages
--- cargo-0.47.0/debian/cargo-mozilla.manpages  1970-01-01 01:00:00.0 
+0100
+++ cargo-mozilla-0.47.0/debian/cargo-mozilla.manpages  2018-11-04 
12:47:23.0 +0100
@@ -0,0 +1,2 @@
+src/etc/man/cargo-*.1
+src/etc/man/cargo.1
diff -Nru cargo-0.47.0/debian/changelog cargo-mozilla-0.47.0/debian/changelog
--- cargo-0.47.0/debian/changelog   2020-12-08 02:43:58.0 +0100
+++ cargo-mozilla-0.47.0/debian/changelog   2021-12-14 13:46:50.0 
+0100
@@ -1,3 +1,16 @@
+cargo-mozilla (0.47.0-3~deb10u1) buster; urgency=medium
+
+  * Non-maintainer upload.
+  * Backport to buster.
+  * Vendor libgit2 1.0.1, the system one is too old.
+  * Build-dep on rustc-mozilla.
+  * Build-dep on libpcre3-dev, for libgit2.
+  * Fix tests that now have execution time in the output.
+  * Rename to cargo-mozilla to avoid disruption in the rustc/cargo ecosystem,
+and don't build the doc package.
+
+ -- Emilio Pozuelo Monfort   Tue, 14 Dec 2021 13:46:50 +0100
+
 cargo (0.47.0-3) unstable; urgency=medium
 
   * Disable close_output test for now, it is flaky. This is a test problem not
diff -Nru cargo-0.47.0/debian/control cargo-mozilla-0.47.0/debian/control
--- cargo-0.47.0/debian/control 2020-12-06 13:32:13.0 +0100
+++ cargo-mozilla-0.47.0/debian/control 2021-12-14 13:46:50.0 +0100
@@ -1,4 +1,4 @@
-Source: cargo
+Source: cargo-mozilla
 Section: devel
 Maintainer: Rust Maintainers 
 Uploaders: Luca Bruno ,
@@ -10,16 +10,17 @@
 Build-Depends: debhelper (>= 12~),
dpkg-dev (>= 1.17.14),
cargo:native(>= 0.17.0),
-   rustc:native(>= 1.16),
-   libstd-rust-dev (>= 1.16),
+   rustc-mozilla:native(>= 1.16),
+   libstd-rust-mozilla-dev (>= 1.16),
pkg-config,
cmake,
bash-completion,
python3:native,
libcurl4-gnutls-dev | libcurl4-openssl-dev,
libssh2-1-dev,
-   libgit2-dev (>= 1),
+#