Package: release.debian.org
Severity: normal
Tags: stretch
User: release.debian....@packages.debian.org
Usertags: pu
Hi,
the second update to allow us to keep up with Firefox ESR60;
rustc 1.24. See attached debdiff against 1.24.1 from unstable.
This uses a bootstrap build which I've tested successfully
on amd64.
Cheers,
Moritz
diff -aur rustc-1.24.1+dfsg1.orig/debian/changelog
rustc-1.24.1+dfsg1/debian/changelog
--- rustc-1.24.1+dfsg1.orig/debian/changelog 2018-03-07 20:07:27.000000000
+0100
+++ rustc-1.24.1+dfsg1/debian/changelog 2018-07-01 13:42:46.197752265 +0200
@@ -1,3 +1,12 @@
+rustc (1.24.1+dfsg1-1~deb9u1) stretch; urgency=medium
+
+ * Build for stretch to be used by Firefox ESR60
+ * Enable stage0 build
+ * Disable -doc package, requires packages not found in stretch and
+ docs are available online anyway
+
+ -- Moritz Mühlenhoff <j...@debian.org> Sun, 01 Jul 2018 13:42:52 +0200
+
rustc (1.24.1+dfsg1-1) unstable; urgency=medium
* Upload to unstable.
Nur in rustc-1.24.1+dfsg1/debian: changelog~.
diff -aur rustc-1.24.1+dfsg1.orig/debian/control
rustc-1.24.1+dfsg1/debian/control
--- rustc-1.24.1+dfsg1.orig/debian/control 2018-03-05 15:57:40.000000000
+0100
+++ rustc-1.24.1+dfsg1/debian/control 2018-07-01 13:43:09.981484174 +0200
@@ -11,9 +11,6 @@
Build-Depends: debhelper (>= 9),
dpkg-dev (>= 1.17.14),
python:native,
- cargo:native (>= 0.19.0) <!pkg.rustc.dlstage0>,
- rustc:native (>= 1.23.0+dfsg) <!pkg.rustc.dlstage0>,
- rustc:native (<= 1.24.1++) <!pkg.rustc.dlstage0>,
llvm-4.0-dev:native (>= 1:4.0.1-8),
llvm-4.0-tools:native (>= 1:4.0.1-8),
libllvm4.0 (>= 1:4.0.1-8),
@@ -50,7 +47,7 @@
Depends: ${shlibs:Depends}, ${misc:Depends}, libstd-rust-dev (=
${binary:Version}),
gcc, libc-dev, binutils (>= 2.26)
Recommends: rust-gdb | rust-lldb
-Suggests: rust-doc, rust-src
+Suggests: rust-src
Description: Rust systems programming language
Rust is a curly-brace, block-structured expression language. It
visually resembles the C language family, but differs significantly
@@ -148,29 +145,6 @@
This package contains pretty printers and a wrapper script for
invoking lldb on rust binaries.
-Package: rust-doc
-Section: doc
-Architecture: all
-Build-Profiles: <!nodoc>
-Depends: ${misc:Depends},
- libjs-jquery, libjs-highlight.js, libjs-mathjax,
- fonts-open-sans, fonts-font-awesome
-Description: Rust systems programming language - Documentation
- Rust is a curly-brace, block-structured expression language. It
- visually resembles the C language family, but differs significantly
- in syntactic and semantic details. Its design is oriented toward
- concerns of "programming in the large", that is, of creating and
- maintaining boundaries - both abstract and operational - that
- preserve large-system integrity, availability and concurrency.
- .
- It supports a mixture of imperative procedural, concurrent actor,
- object-oriented and pure functional styles. Rust also supports
- generic programming and meta-programming, in both static and dynamic
- styles.
- .
- This package contains the Rust tutorial, language reference and
- standard library documentation.
-
Package: rust-src
Architecture: all
Depends: ${misc:Depends}
Nur in rustc-1.24.1+dfsg1/debian: control~.
diff -aur rustc-1.24.1+dfsg1.orig/debian/make_orig-stage0_tarball.sh
rustc-1.24.1+dfsg1/debian/make_orig-stage0_tarball.sh
--- rustc-1.24.1+dfsg1.orig/debian/make_orig-stage0_tarball.sh 2018-03-03
10:26:05.000000000 +0100
+++ rustc-1.24.1+dfsg1/debian/make_orig-stage0_tarball.sh 2018-07-01
13:41:33.170575430 +0200
@@ -11,6 +11,7 @@
rm -f stage0/*/*.sha256
mkdir -p stage0 build && ln -sf ../stage0 build/cache
+touch stage0/hack
for deb_host_arch in $upstream_bootstrap_arch; do
make -s --no-print-directory -f debian/architecture-test.mk
"rust-for-deb_${deb_host_arch}" | {
read deb_host_arch rust_triplet
diff -aur rustc-1.24.1+dfsg1.orig/debian/rules rustc-1.24.1+dfsg1/debian/rules
--- rustc-1.24.1+dfsg1.orig/debian/rules 2018-03-07 20:06:58.000000000
+0100
+++ rustc-1.24.1+dfsg1/debian/rules 2018-06-30 23:39:14.000000000 +0200
@@ -161,7 +161,8 @@
-DLLVM_VERSION="$(LLVM_VERSION)" \
-DRUST_DESTDIR="$(RUST_DESTDIR)" \
"$<" > "$@"
- ! $(DOWNLOAD_BOOTSTRAP) || sed -i -e '/^rustc = /d' -e '/^cargo = /d'
"$@"
+ if $(DOWNLOAD_BOOTSTRAP) || [ $(HAVE_BINARY_TARBALL) != 0 ]; \
+ then sed -i -e '/^rustc = /d' -e '/^cargo = /d' "$@"; fi
# Work around armhf issue:
https://github.com/rust-lang/rust/issues/45854
[ $(DEB_BUILD_ARCH) != armhf -a \
$(DEB_BUILD_ARCH) != armel ] || sed -i -e '/^debuginfo-only-std = /d'
"$@"
diff -aur rustc-1.24.1+dfsg1.orig/debian/source/options
rustc-1.24.1+dfsg1/debian/source/options
--- rustc-1.24.1+dfsg1.orig/debian/source/options 2017-08-24
16:57:59.000000000 +0200
+++ rustc-1.24.1+dfsg1/debian/source/options 2018-07-01 00:33:34.000000000
+0200
@@ -2,3 +2,4 @@
# orig-stage0 upload, after running `debian/rules source_orig-stage0`.
# we can get rid of this after #577113 is fixed
include-removal
+extend-diff-ignore = 'stage0'
\ Kein Zeilenumbruch am Dateiende.
