Bug#1064031: rustc-web 1.70.0+dfsg1-7~deb12u1 flagged for acceptance

2024-03-03 Thread Adam D. Barratt
On Sat, 2024-03-02 at 03:54 -0500, Andres Salomon wrote:
> rustc-web (1.70.0+dfsg1-7~deb12u2) bookworm; urgency=medium
> 
>    * Non-maintainer upload.
>    * Increase allowed test failures on armhf and ppc64el to fix
> FTBFS.
>    * Provide Conflicts/Replaces for rust*-mozilla*, which could still
> be
>  installed from oldstable (closes: #1064562).
>    * Add Provides/Conflicts/Replaces for libstd-rust-1.70 (closes: 
> #1064563).

Please go ahead.

Regards,

Adam



Bug#1064031: rustc-web 1.70.0+dfsg1-7~deb12u1 flagged for acceptance

2024-03-02 Thread Andres Salomon

On 3/2/24 02:00, Andres Salomon wrote:

Actually, scratch that; I had missed #1064563.

I'll redo the deb11u2 package with conflicts/replaces for that, as well, 
and then resend it shortly.


On 3/2/24 01:49, Andres Salomon wrote:


Okay, here's an updated package with fixes:

rustc-web (1.70.0+dfsg1-7~deb12u2) bookworm; urgency=medium

   * Non-maintainer upload.
   * Increase allowed test failures on armhf and ppc64el to fix FTBFS.
   * Provide Conflicts/Replaces for rust*-mozilla*, which could still be
 installed from oldstable (closes: #1064562).




rustc-web (1.70.0+dfsg1-7~deb12u2) bookworm; urgency=medium

  * Non-maintainer upload.
  * Increase allowed test failures on armhf and ppc64el to fix FTBFS.
  * Provide Conflicts/Replaces for rust*-mozilla*, which could still be
installed from oldstable (closes: #1064562).
  * Add Provides/Conflicts/Replaces for libstd-rust-1.70 (closes: 
#1064563).




This should fix builds for armhf & ppc64el, and also specifies manual 
conflicts/replaces with a bunch of packages from rustc-mozilla. In 
addition, it adds a p/c/r in libstd-rust-web-1.70 for libstd-rust-1.70.


For the rust*mozilla* conflicts, I tested it by doing an 'apt install 
rustc-mozilla rust-mozilla-src rust-mozilla-gdb libstd-rust-mozilla-dev' 
from oldstable onto a bookworm environmente, and then installed the 
locally built 'libstd-rust-web-1.70 libstd-rust-web-dev rust-web-gdb 
rust-web-src rustc-web' packages over that. The older rustc-mozilla 
packages are properly removed by apt, with the exception of 
libstd-rust-mozilla-1.63 (which should be fine).


For the libstd-rust-1.70 conflict, I tested it by manually installing 
the 'rustc-web libstd-rust-web-1.70 libstd-rust-web-dev' packages in a 
trixie environment, and then 'apt install rustc libstd-rust-web-dev' 
over that. As expected, it removed the three *-web* packages and 
successfully installed the standard rustc packages.


diff -u rustc-web-1.70.0+dfsg1/debian/changelog rustc-web-1.70.0+dfsg1/debian/changelog
--- rustc-web-1.70.0+dfsg1/debian/changelog	2024-02-14 02:02:37.0 +
+++ rustc-web-1.70.0+dfsg1/debian/changelog	2024-03-02 07:23:17.763665420 +
@@ -1,3 +1,13 @@
+rustc-web (1.70.0+dfsg1-7~deb12u2) bookworm; urgency=medium
+
+  * Non-maintainer upload.
+  * Increase allowed test failures on armhf and ppc64el to fix FTBFS.
+  * Provide Conflicts/Replaces for rust*-mozilla*, which could still be
+installed from oldstable (closes: #1064562).
+  * Add Provides/Conflicts/Replaces for libstd-rust-1.70 (closes: #1064563).
+
+ -- Andres Salomon   Sat, 02 Mar 2024 07:23:15 +
+
 rustc-web (1.70.0+dfsg1-7~deb12u1) bookworm; urgency=medium
 
   * Non-maintainer upload.
diff -u rustc-web-1.70.0+dfsg1/debian/control rustc-web-1.70.0+dfsg1/debian/control
--- rustc-web-1.70.0+dfsg1/debian/control	2024-02-14 02:02:37.0 +
+++ rustc-web-1.70.0+dfsg1/debian/control	2024-03-02 07:05:53.739717477 +
@@ -58,9 +58,9 @@
 Suggests:
 # lld and clang are needed for wasm compilation
  lld-16, clang-16,
-Conflicts: rustc
+Conflicts: rustc, rustc-mozilla
 Provides: rustc (= ${binary:Version})
-Replaces: libstd-rust-dev (<< 1.25.0+dfsg1-2~~), rustc
+Replaces: libstd-rust-dev (<< 1.25.0+dfsg1-2~~), rustc, rustc-mozilla
 Breaks: libstd-rust-dev (<< 1.25.0+dfsg1-2~~)
 Description: Rust systems programming language
  Rust is a curly-brace, block-structured expression language.  It
@@ -81,6 +81,9 @@
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libstd-rust-1.70
+Replaces: libstd-rust-1.70
+Provides: libstd-rust-1.70
 Description: Rust standard libraries
  Rust is a curly-brace, block-structured expression language.  It
  visually resembles the C language family, but differs significantly
@@ -103,9 +106,9 @@
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends},
  libstd-rust-web-1.70 (= ${binary:Version}),
-Conflicts: libstd-rust-dev
+Conflicts: libstd-rust-dev, libstd-rust-mozilla-dev
 Provides: libstd-rust-dev (= ${binary:Version})
-Replaces: libstd-rust-dev
+Replaces: libstd-rust-dev, libstd-rust-mozilla-dev
 Description: Rust standard libraries - development files
  Rust is a curly-brace, block-structured expression language.  It
  visually resembles the C language family, but differs significantly
@@ -131,7 +134,8 @@
 Recommends:
  gcc-mingw-w64-x86-64-posix [amd64],
  gcc-mingw-w64-i686-posix [i386],
-Conflicts: libstd-rust-dev-windows
+Conflicts: libstd-rust-dev-windows, libstd-rust-mozilla-dev-windows
+Replaces: libstd-rust-mozilla-dev-windows
 Build-Profiles: 
 Description: Rust standard libraries - development files
  Rust is a curly-brace, block-structured expression language.  It
@@ -154,8 +158,8 @@
 Architecture: all
 Depends: gdb, ${misc:Depends}
 Suggests: gdb-doc
-Conflicts: rust-gdb
-Replaces: rustc (<< 1.1.0+dfsg1-1)
+Conflicts: rust-gdb, rust-mozilla-gdb
+Replaces: rustc (<< 1.1.0+dfsg1-1), rust-mozilla-gdb
 Description: Rust 

Bug#1064031: rustc-web 1.70.0+dfsg1-7~deb12u1 flagged for acceptance

2024-03-01 Thread Andres Salomon

Actually, scratch that; I had missed #1064563.

I'll redo the deb11u2 package with conflicts/replaces for that, as well, 
and then resend it shortly.


On 3/2/24 01:49, Andres Salomon wrote:


Okay, here's an updated package with fixes:

rustc-web (1.70.0+dfsg1-7~deb12u2) bookworm; urgency=medium

   * Non-maintainer upload.
   * Increase allowed test failures on armhf and ppc64el to fix FTBFS.
   * Provide Conflicts/Replaces for rust*-mozilla*, which could still be
     installed from oldstable (closes: #1064562).



OpenPGP_0x645D0247C36E7637.asc
Description: OpenPGP public key


OpenPGP_signature.asc
Description: OpenPGP digital signature


Bug#1064031: rustc-web 1.70.0+dfsg1-7~deb12u1 flagged for acceptance

2024-03-01 Thread Andres Salomon

On 2/28/24 01:23, Adam D. Barratt wrote:

On Tue, 2024-02-27 at 15:00 -0500, Andres Salomon wrote:

So it looks like I'll need a new upload to fix two bookworm
architecture
build failures (armhf and ppc64el), and also to fix #1064562. Should
I
file a new release.d.o bug, or continue using this one?


Given that both issues are related to the initial upload tracked in
this bug, re-using this one is ifne.



Okay, here's an updated package with fixes:

rustc-web (1.70.0+dfsg1-7~deb12u2) bookworm; urgency=medium

  * Non-maintainer upload.
  * Increase allowed test failures on armhf and ppc64el to fix FTBFS.
  * Provide Conflicts/Replaces for rust*-mozilla*, which could still be
installed from oldstable (closes: #1064562).


This should fix builds for armhf & ppc64el, and also specifies manual 
conflicts/replaces with a bunch of packages from rustc-mozilla.


I tested it by doing an 'apt install rustc-mozilla rust-mozilla-src 
rust-mozilla-gdb libstd-rust-mozilla-dev' from oldstable, and then 
installing the locally built 'libstd-rust-web-1.70 libstd-rust-web-dev 
rust-web-gdb rust-web-src rustc-web' packages over that. The older 
rustc-mozilla packages are properly removed by apt, with the exception 
of libstd-rust-mozilla-1.63 (which should be fine).



diff -urN rustc-web-1.70.0+dfsg1/debian/changelog rustc-web-1.70.0+dfsg1/debian/changelog
--- rustc-web-1.70.0+dfsg1/debian/changelog	2024-02-14 02:02:37.0 +
+++ rustc-web-1.70.0+dfsg1/debian/changelog	2024-03-02 05:37:16.955122720 +
@@ -1,3 +1,12 @@
+rustc-web (1.70.0+dfsg1-7~deb12u2) bookworm; urgency=medium
+
+  * Non-maintainer upload.
+  * Increase allowed test failures on armhf and ppc64el to fix FTBFS.
+  * Provide Conflicts/Replaces for rust*-mozilla*, which could still be
+installed from oldstable (closes: #1064562).
+
+ -- Andres Salomon   Fri, 01 Mar 2024 05:44:10 +
+
 rustc-web (1.70.0+dfsg1-7~deb12u1) bookworm; urgency=medium
 
   * Non-maintainer upload.
diff -urN rustc-web-1.70.0+dfsg1/debian/control rustc-web-1.70.0+dfsg1/debian/control
--- rustc-web-1.70.0+dfsg1/debian/control	2024-02-14 02:02:37.0 +
+++ rustc-web-1.70.0+dfsg1/debian/control	2024-03-02 05:37:16.955122720 +
@@ -58,9 +58,9 @@
 Suggests:
 # lld and clang are needed for wasm compilation
  lld-16, clang-16,
-Conflicts: rustc
+Conflicts: rustc, rustc-mozilla
 Provides: rustc (= ${binary:Version})
-Replaces: libstd-rust-dev (<< 1.25.0+dfsg1-2~~), rustc
+Replaces: libstd-rust-dev (<< 1.25.0+dfsg1-2~~), rustc, rustc-mozilla
 Breaks: libstd-rust-dev (<< 1.25.0+dfsg1-2~~)
 Description: Rust systems programming language
  Rust is a curly-brace, block-structured expression language.  It
@@ -103,9 +103,9 @@
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends},
  libstd-rust-web-1.70 (= ${binary:Version}),
-Conflicts: libstd-rust-dev
+Conflicts: libstd-rust-dev, libstd-rust-mozilla-dev
 Provides: libstd-rust-dev (= ${binary:Version})
-Replaces: libstd-rust-dev
+Replaces: libstd-rust-dev, libstd-rust-mozilla-dev
 Description: Rust standard libraries - development files
  Rust is a curly-brace, block-structured expression language.  It
  visually resembles the C language family, but differs significantly
@@ -131,7 +131,8 @@
 Recommends:
  gcc-mingw-w64-x86-64-posix [amd64],
  gcc-mingw-w64-i686-posix [i386],
-Conflicts: libstd-rust-dev-windows
+Conflicts: libstd-rust-dev-windows, libstd-rust-mozilla-dev-windows
+Replaces: libstd-rust-mozilla-dev-windows
 Build-Profiles: 
 Description: Rust standard libraries - development files
  Rust is a curly-brace, block-structured expression language.  It
@@ -154,8 +155,8 @@
 Architecture: all
 Depends: gdb, ${misc:Depends}
 Suggests: gdb-doc
-Conflicts: rust-gdb
-Replaces: rustc (<< 1.1.0+dfsg1-1)
+Conflicts: rust-gdb, rust-mozilla-gdb
+Replaces: rustc (<< 1.1.0+dfsg1-1), rust-mozilla-gdb
 Description: Rust debugger (gdb)
  Rust is a curly-brace, block-structured expression language.  It
  visually resembles the C language family, but differs significantly
@@ -176,8 +177,8 @@
 Architecture: all
 # When updating, also update rust-lldb.links
 Depends: lldb-16, ${misc:Depends}, python3-lldb-16
-Replaces: rustc (<< 1.1.0+dfsg1-1)
-Conflicts: rust-lldb
+Replaces: rustc (<< 1.1.0+dfsg1-1), rust-mozilla-lldb
+Conflicts: rust-lldb, rust-mozilla-lldb
 Description: Rust debugger (lldb)
  Rust is a curly-brace, block-structured expression language.  It
  visually resembles the C language family, but differs significantly
@@ -222,7 +223,8 @@
 Package: rust-web-src
 Architecture: all
 Depends: ${misc:Depends}
-Conflicts: rust-src
+Conflicts: rust-src, rust-mozilla-src
+Replaces: rust-mozilla-src
 Description: Rust systems programming language - source code
  Rust is a curly-brace, block-structured expression language.  It
  visually resembles the C language family, but differs significantly
diff -urN rustc-web-1.70.0+dfsg1/debian/rules rustc-web-1.70.0+dfsg1/debian/rules
--- rustc-web-1.70.0+dfsg1/debian/rules	

Bug#1064031: rustc-web 1.70.0+dfsg1-7~deb12u1 flagged for acceptance

2024-02-27 Thread Adam D. Barratt
On Tue, 2024-02-27 at 15:00 -0500, Andres Salomon wrote:
> So it looks like I'll need a new upload to fix two bookworm
> architecture 
> build failures (armhf and ppc64el), and also to fix #1064562. Should
> I 
> file a new release.d.o bug, or continue using this one?

Given that both issues are related to the initial upload tracked in
this bug, re-using this one is ifne.

Regards,

Adam



Bug#1064031: rustc-web 1.70.0+dfsg1-7~deb12u1 flagged for acceptance

2024-02-27 Thread Andres Salomon
So it looks like I'll need a new upload to fix two bookworm architecture 
build failures (armhf and ppc64el), and also to fix #1064562. Should I 
file a new release.d.o bug, or continue using this one?



(I'm ignoring armel and mipsel build failures, since firefox-esr hasn't 
built on either architecture in several years in bookworm, and also 
armel doesn't really have a matching upstream stage0 compiler.)




On Fri, 23 Feb 2024 14:57:46 + Adam D Barratt 
 wrote:

package release.debian.org
tags 1064031 = bookworm pending
thanks

Hi,

The upload referenced by this bug report has been flagged for acceptance into 
the proposed-updates queue for Debian bookworm.

Thanks for your contribution!

Upload details
==

Package: rustc-web
Version: 1.70.0+dfsg1-7~deb12u1

Explanation: new source package to support builds of web browsers




OpenPGP_0x645D0247C36E7637.asc
Description: OpenPGP public key


OpenPGP_signature.asc
Description: OpenPGP digital signature


Bug#1064031: rustc-web 1.70.0+dfsg1-7~deb12u1 flagged for acceptance

2024-02-23 Thread Adam D Barratt
package release.debian.org
tags 1064031 = bookworm pending
thanks

Hi,

The upload referenced by this bug report has been flagged for acceptance into 
the proposed-updates queue for Debian bookworm.

Thanks for your contribution!

Upload details
==

Package: rustc-web
Version: 1.70.0+dfsg1-7~deb12u1

Explanation: new source package to support builds of web browsers