Bug#1052027: bullseye-pu: package cargo-mozilla/0.66.0+ds1-1~deb11u1

2023-09-16 Thread Emilio Pozuelo Monfort

On 16/09/2023 18:01, Adam D. Barratt wrote:

Control: tags -1 + confirmed

On Sat, 2023-09-16 at 11:15 +0200, Emilio Pozuelo Monfort wrote:

Following up on #1051051, this updates cargo-mozilla for the upcoming
Firefox ESR 115. Just like for rustc-mozilla, the risk here is small
as this package is only used to build firefox-esr and thunderbird.

I have used the resulting package to successfully build and test
firefox-esr 115.0.2 on bullseye.



Please go ahead.


Uploaded.

Cheers,
Emilio



Bug#1052027: bullseye-pu: package cargo-mozilla/0.66.0+ds1-1~deb11u1

2023-09-16 Thread Adam D. Barratt
Control: tags -1 + confirmed

On Sat, 2023-09-16 at 11:15 +0200, Emilio Pozuelo Monfort wrote:
> Following up on #1051051, this updates cargo-mozilla for the upcoming
> Firefox ESR 115. Just like for rustc-mozilla, the risk here is small
> as this package is only used to build firefox-esr and thunderbird.
> 
> I have used the resulting package to successfully build and test
> firefox-esr 115.0.2 on bullseye.
> 

Please go ahead.

Regards,

Adam



Bug#1052027: bullseye-pu: package cargo-mozilla/0.66.0+ds1-1~deb11u1

2023-09-16 Thread Emilio Pozuelo Monfort
Package: release.debian.org
Severity: normal
Tags: bullseye
User: release.debian@packages.debian.org
Usertags: pu
X-Debbugs-Cc: pkg-rust-maintain...@alioth-lists.debian.net

Hi,

Following up on #1051051, this updates cargo-mozilla for the upcoming
Firefox ESR 115. Just like for rustc-mozilla, the risk here is small
as this package is only used to build firefox-esr and thunderbird.

I have used the resulting package to successfully build and test
firefox-esr 115.0.2 on bullseye.

Attached is the diff from 0.66 itself so that the changes in the
backport are easier to review. A diff from 0.47 is not attached.

Cheers,
Emilio
diff -ruNp cargo-0.66.0+ds1/debian/cargo.bash-completion 
cargo-mozilla-0.66.0+ds1/debian/cargo.bash-completion
--- cargo-0.66.0+ds1/debian/cargo.bash-completion   2023-01-11 
18:55:09.0 +0100
+++ cargo-mozilla-0.66.0+ds1/debian/cargo.bash-completion   1970-01-01 
01:00:00.0 +0100
@@ -1 +0,0 @@
-src/etc/cargo.bashcomp.sh cargo
diff -ruNp cargo-0.66.0+ds1/debian/cargo.dirs 
cargo-mozilla-0.66.0+ds1/debian/cargo.dirs
--- cargo-0.66.0+ds1/debian/cargo.dirs  2023-01-11 18:55:09.0 +0100
+++ cargo-mozilla-0.66.0+ds1/debian/cargo.dirs  1970-01-01 01:00:00.0 
+0100
@@ -1 +0,0 @@
-usr/bin
diff -ruNp cargo-0.66.0+ds1/debian/cargo-doc.docs 
cargo-mozilla-0.66.0+ds1/debian/cargo-doc.docs
--- cargo-0.66.0+ds1/debian/cargo-doc.docs  2023-01-11 18:55:09.0 
+0100
+++ cargo-mozilla-0.66.0+ds1/debian/cargo-doc.docs  1970-01-01 
01:00:00.0 +0100
@@ -1 +0,0 @@
-target/doc
diff -ruNp cargo-0.66.0+ds1/debian/cargo.manpages 
cargo-mozilla-0.66.0+ds1/debian/cargo.manpages
--- cargo-0.66.0+ds1/debian/cargo.manpages  2023-01-11 18:55:09.0 
+0100
+++ cargo-mozilla-0.66.0+ds1/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 -ruNp cargo-0.66.0+ds1/debian/cargo-mozilla.bash-completion 
cargo-mozilla-0.66.0+ds1/debian/cargo-mozilla.bash-completion
--- cargo-0.66.0+ds1/debian/cargo-mozilla.bash-completion   1970-01-01 
01:00:00.0 +0100
+++ cargo-mozilla-0.66.0+ds1/debian/cargo-mozilla.bash-completion   
2023-01-11 18:55:09.0 +0100
@@ -0,0 +1 @@
+src/etc/cargo.bashcomp.sh cargo
diff -ruNp cargo-0.66.0+ds1/debian/cargo-mozilla.dirs 
cargo-mozilla-0.66.0+ds1/debian/cargo-mozilla.dirs
--- cargo-0.66.0+ds1/debian/cargo-mozilla.dirs  1970-01-01 01:00:00.0 
+0100
+++ cargo-mozilla-0.66.0+ds1/debian/cargo-mozilla.dirs  2023-01-11 
18:55:09.0 +0100
@@ -0,0 +1 @@
+usr/bin
diff -ruNp cargo-0.66.0+ds1/debian/cargo-mozilla-doc.docs 
cargo-mozilla-0.66.0+ds1/debian/cargo-mozilla-doc.docs
--- cargo-0.66.0+ds1/debian/cargo-mozilla-doc.docs  1970-01-01 
01:00:00.0 +0100
+++ cargo-mozilla-0.66.0+ds1/debian/cargo-mozilla-doc.docs  2023-01-11 
18:55:09.0 +0100
@@ -0,0 +1 @@
+target/doc
diff -ruNp cargo-0.66.0+ds1/debian/cargo-mozilla.manpages 
cargo-mozilla-0.66.0+ds1/debian/cargo-mozilla.manpages
--- cargo-0.66.0+ds1/debian/cargo-mozilla.manpages  1970-01-01 
01:00:00.0 +0100
+++ cargo-mozilla-0.66.0+ds1/debian/cargo-mozilla.manpages  2023-01-11 
18:55:09.0 +0100
@@ -0,0 +1,2 @@
+src/etc/man/cargo-*.1
+src/etc/man/cargo.1
diff -ruNp cargo-0.66.0+ds1/debian/changelog 
cargo-mozilla-0.66.0+ds1/debian/changelog
--- cargo-0.66.0+ds1/debian/changelog   2023-01-11 18:55:09.0 +0100
+++ cargo-mozilla-0.66.0+ds1/debian/changelog   2023-07-30 10:37:52.0 
+0200
@@ -1,3 +1,15 @@
+cargo-mozilla (0.66.0+ds1-1~deb11u1) bullseye; urgency=medium
+
+  * Non-maintainer upload.
+  * Backport to bullseye as cargo-mozilla.
+  * Build-dep on rustc-mozilla.
+  * Don't build the doc package.
+  * Vendor libgit2 1.5.1, the system one is too old.
+  * Build-dep on libpcre3-dev, for libgit2.
+  * Don't use namespaced features.
+
+ -- Emilio Pozuelo Monfort   Sun, 30 Jul 2023 10:37:52 +0200
+
 cargo (0.66.0+ds1-1) unstable; urgency=medium
 
   [ Fabian Grünbichler ]
diff -ruNp cargo-0.66.0+ds1/debian/control 
cargo-mozilla-0.66.0+ds1/debian/control
--- cargo-0.66.0+ds1/debian/control 2023-01-11 18:55:09.0 +0100
+++ cargo-mozilla-0.66.0+ds1/debian/control 2023-07-30 10:37:52.0 
+0200
@@ -1,4 +1,4 @@
-Source: cargo
+Source: cargo-mozilla
 Section: devel
 Maintainer: Rust Maintainers 
 Uploaders: Luca Bruno ,
@@ -10,17 +10,18 @@ Priority: optional
 Build-Depends:
  debhelper (>= 12~),
  dpkg-dev (>= 1.17.14),
- cargo:native(>= 0.56.0),
- rustc:native(>= 1.63),
- libstd-rust-dev (>= 1.63),
+ cargo-mozilla:native(>= 0.56.0),
+ rustc-mozilla:native(>= 1.63),
+ libstd-rust-mozilla-dev (>= 1.63),
  pkg-config,
  bash-completion,
  python3:native,
  libcurl4-gnutls-dev | libcurl4-openssl-dev,
  libssh2-1-dev,
- libgit2-dev (>= 1.5.0),
- libgit2-dev (<< 1.6~~),
+# libgit2-dev (>= 1.5.0),
+# libgit2-dev (<< 1.6~~),
  libhttp-parser-dev,
+ libpcre3-dev,
  libssl-dev,