Update changelog, control, version script

diff --git a/debian/changelog b/debian/changelog
index 96f753218cb6dacd0afb8baeb979d2880e0758f7..3e42440f7a3b245414f6909e28ed693fdf2bd6c6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-rustc (1.27.1+dfsg1-1~exp5) UNRELEASED; urgency=medium
+rustc (1.27.2+dfsg1-1) UNRELEASED; urgency=medium
 
   [ Sylvestre Ledru ]
   * Update of the alioth ML address.
@@ -7,8 +7,9 @@ rustc (1.27.1+dfsg1-1~exp5) UNRELEASED; urgency=medium
   * Fail the build if our version contains ~exp and we are not releasing to
     experimental, this has happened by accident a few times already.
   * Allow 36 and 44 test failures on armel and s390x respectively.
+  * New upstream release.
 
- -- Ximin Luo <infinity0@debian.org>  Tue, 24 Jul 2018 20:55:35 -0700
+ -- Ximin Luo <infinity0@debian.org>  Tue, 24 Jul 2018 21:18:45 -0700
 
 rustc (1.27.1+dfsg1-1~exp4) experimental; urgency=medium
 

diff --git a/debian/control b/debian/control
index 0e55b15233673317abef9c042934b3fb7362de2d..5054daae7273e9acb6386a8d2f98217325761ef4 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 9),
                python:native,
                cargo:native (>= 0.19.0)      <!pkg.rustc.dlstage0>,
                rustc:native (>= 1.26.0+dfsg) <!pkg.rustc.dlstage0>,
-               rustc:native (<= 1.27.1++)    <!pkg.rustc.dlstage0>,
+               rustc:native (<= 1.27.2++)    <!pkg.rustc.dlstage0>,
                llvm-6.0-dev:native,
                llvm-6.0-tools:native,
                libllvm6.0,

diff --git a/debian/rules b/debian/rules
index 07fdc0c75dcfad0cc66ec3d51bbc294512883cb2..7a02a449f600b35a1aa9ddccbcdd951f5a857204 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -69,9 +69,8 @@ RUSTBUILD_TEST_FLAGS =
 
 update-version:
        oldver=$(shell $(SED_RUSTC_BUILDDEP) | sed -ne 's/.*(<= \(.*\)).*/\1/gp' | $(SED_VERSION_SHORT)); \
-       newver=$(RUST_LONG_VERSION); \
-       if [ $$oldver != $$newver ]; then debian/update-version.sh \
-         $$oldver $$newver $(RUST_LONG_VERSION) $(CARGO_NEW); fi
+       newver=$(RUST_VERSION); \
+       debian/update-version.sh $$oldver $$newver $(RUST_LONG_VERSION) $(CARGO_NEW)
 
 # Below we detect how we're supposed to bootstrap the stage0 compiler. See
 # README.Debian for more details of the cases described below.

diff --git a/debian/update-version.sh b/debian/update-version.sh
index 4c94dcefc9d4b1799e88583d4938a5f87da00d68..06a24863a7ee76165fe771814a37c8f69bca387b 100755 (executable)
--- a/debian/update-version.sh
+++ b/debian/update-version.sh
@@ -25,7 +25,9 @@ sed -i -e "s|libstd-rust-${ORIG_R}|libstd-rust-$NEW|g" \
        -e "s|cargo\( *\)(= [^)]*)|cargo\1(= ${CARGO_NEW})|g" \
        control
 
+if [ "$NEW" != "$ORIG" ]; then
 git mv libstd-rust-$ORIG.lintian-overrides libstd-rust-$NEW.lintian-overrides
+fi
 sed -i -e "s|libstd-rust-${ORIG_R}|libstd-rust-$NEW|g" libstd-rust-$NEW.lintian-overrides
 }