proxmox-mirrors/rustc
1
0
Fork 0
mirror of https://git.proxmox.com/git/rustc synced 2026-08-13 04:13:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix version constraints for Recommends: cargo

Browse Source
This commit is contained in:
Ximin Luo 2018-07-25 05:57:13 -07:00
parent 7d214726fc
commit 71a978abe1
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
rustc (1.28.0~beta.14+dfsg1-1~exp2) UNRELEASED; urgency=medium
* Update test-failure counting logic.
* Fix version constraints for Recommends: cargo.
-- Ximin Luo <infinity0@debian.org> Wed, 25 Jul 2018 05:56:39 -0700
rustc (1.28.0~beta.14+dfsg1-1~exp1) experimental; urgency=medium
* New upstream release.

4
debian/control vendored
View File

@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 9),
python:native,
cargo:native (>= 0.19.0) <!pkg.rustc.dlstage0>,
rustc:native (>= 1.27.0+dfsg) <!pkg.rustc.dlstage0>,
rustc:native (<= 1.28.0~beta++) <!pkg.rustc.dlstage0>,
rustc:native (<= 1.28.0~beta.14++) <!pkg.rustc.dlstage0>,
llvm-6.0-dev:native,
llvm-6.0-tools:native,
libllvm6.0,
@ -49,7 +49,7 @@ Multi-Arch: allowed
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}, libstd-rust-dev (= ${binary:Version}),
gcc, libc-dev, binutils (>= 2.26)
Recommends: cargo (= 0.29), rust-gdb | rust-lldb
Recommends: cargo (>= 0.29.0~~), cargo (<< 0.30.0~~), rust-gdb | rust-lldb
Suggests: rust-doc, rust-src
Replaces: libstd-rust-dev (<< 1.25.0+dfsg1-2~~)
Breaks: libstd-rust-dev (<< 1.25.0+dfsg1-2~~)

6
debian/update-version.sh vendored
View File

@ -8,12 +8,13 @@ python -c 'import sys; k=map(int,sys.argv[1].split(".")); k[1]-=1; print ".".joi
cargo_new() {
local V=$1
python -c 'import sys; k=map(int,sys.argv[1].split(".")); k[1]+=1; k[0]-=1; print ".".join(map(str,k))' "$V"
python -c 'import sys; k=map(int,sys.argv[1].split(".")); k[1]+='"${2:-1}"'; k[0]-=1; print ".".join(map(str,k))' "$V"
}
update() {
local ORIG=$1 NEW=$2 NEW_LONG=$3
local CARGO_NEW=${4:-$(cargo_new $NEW)}
local CARGO_NEXT=${4:-$(cargo_new $NEW 2)}
ORIG_M1=$(prev_stable $ORIG)
NEW_M1=$(prev_stable $NEW)
@ -22,7 +23,8 @@ ORIG_R="${ORIG/./\\.}" # match a literal dot, otherwise this might sometimes mat
sed -i -e "s|libstd-rust-${ORIG_R}|libstd-rust-$NEW|g" \
-e "s|rustc:native\( *\)(<= [^)]*)|rustc:native\1(<= $NEW_LONG++)|g" \
-e "s|rustc:native\( *\)(>= ${ORIG_M1/./\\.}|rustc:native\1(>= ${NEW_M1}|g" \
-e "s|cargo\( *\)(= [^)]*)|cargo\1(= ${CARGO_NEW})|g" \
-e "s|cargo\( *\)(>= [^)]*)|cargo\1(>= ${CARGO_NEW}.0~~)|g" \
-e "s|cargo\( *\)(<< [^)]*)|cargo\1(<< ${CARGO_NEXT}.0~~)|g" \
control
if [ "$NEW" != "$ORIG" ]; then