Update d/changelog and bump versions

diff --git a/debian/changelog b/debian/changelog
index c942c19e82fad67f5723824f26d651602c439aa1..961338414c571fe779e8e1f69a66c2e4a435b83e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+rustc (1.19.0+dfsg1-1) UNRELEASED; urgency=medium
+
+DO BEFORE RELEASE:
+  * Update d/copyright
+DO BEFORE RELEASE ^^^^
+
+  * New upstream release.
+
+ -- Ximin Luo <infinity0@debian.org>  Mon, 24 Jul 2017 11:55:53 +0200
+
 rustc (1.18.0+dfsg1-3) unstable; urgency=medium
 
   * Upload to unstable.

diff --git a/debian/control b/debian/control
index 4b2f2dff6ef5b89446baaff617654d9f6263a724..cf24e0aab3ba56433065c261d98710ed8e3feae2 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -14,10 +14,8 @@ Build-Depends: debhelper (>= 9),
 # the non-native lines can be deleted after all versions in unstable are M-A: allowed
                cargo        (>= 0.17.0)      <!pkg.rustc.dlstage0> |
                cargo:native (>= 0.17.0)      <!pkg.rustc.dlstage0>,
-               rustc        (>= 1.17.0+dfsg) <!pkg.rustc.dlstage0> |
-               rustc:native (>= 1.17.0+dfsg) <!pkg.rustc.dlstage0>,
-               rustc        (<= 1.18.0++)    <!pkg.rustc.dlstage0> |
-               rustc:native (<= 1.18.0++)    <!pkg.rustc.dlstage0>,
+               rustc:native (>= 1.18.0+dfsg) <!pkg.rustc.dlstage0>,
+               rustc:native (<= 1.19.0++)    <!pkg.rustc.dlstage0>,
                llvm-3.9-dev:native   (>= 1:3.9.1-10~),
                llvm-3.9-tools:native (>= 1:3.9.1-10~),
                libllvm3.9            (>= 1:3.9.1-10~),
@@ -70,7 +68,7 @@ Description: Rust systems programming language
  generic programming and meta-programming, in both static and dynamic
  styles.
 
-Package: libstd-rust-1.18
+Package: libstd-rust-1.19
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -95,7 +93,7 @@ Package: libstd-rust-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends}, libstd-rust-1.18 (= ${binary:Version})
+Depends: ${misc:Depends}, libstd-rust-1.19 (= ${binary:Version})
 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

diff --git a/debian/libstd-rust-1.18.lintian-overrides b/debian/libstd-rust-1.18.lintian-overrides
deleted file mode 100644 (file)
index 08f17d2..0000000
--- a/debian/libstd-rust-1.18.lintian-overrides
+++ /dev/null
@@ -1,12 +0,0 @@
-# "libstd" just seemed too generic
-libstd-rust-1.18 binary: package-name-doesnt-match-sonames
-
-# Rust doesn't use dev shlib symlinks nor any of the other shlib support stuff
-libstd-rust-1.18 binary: dev-pkg-without-shlib-symlink
-libstd-rust-1.18 binary: shlib-without-versioned-soname
-libstd-rust-1.18 binary: unused-shlib-entry-in-control-file
-
-# Libraries that use libc symbols (libterm, libstd, etc) *are* linked
-# to libc.  Lintian gets upset that some Rust libraries don't need
-# libc, boo hoo.
-libstd-rust-1.18 binary: library-not-linked-against-libc

diff --git a/debian/libstd-rust-1.19.lintian-overrides b/debian/libstd-rust-1.19.lintian-overrides
new file mode 100644 (file)
index 0000000..de37ba5
--- /dev/null
+++ b/debian/libstd-rust-1.19.lintian-overrides
@@ -0,0 +1,12 @@
+# "libstd" just seemed too generic
+libstd-rust-1.19 binary: package-name-doesnt-match-sonames
+
+# Rust doesn't use dev shlib symlinks nor any of the other shlib support stuff
+libstd-rust-1.19 binary: dev-pkg-without-shlib-symlink
+libstd-rust-1.19 binary: shlib-without-versioned-soname
+libstd-rust-1.19 binary: unused-shlib-entry-in-control-file
+
+# Libraries that use libc symbols (libterm, libstd, etc) *are* linked
+# to libc.  Lintian gets upset that some Rust libraries don't need
+# libc, boo hoo.
+libstd-rust-1.19 binary: library-not-linked-against-libc

diff --git a/debian/update-version.sh b/debian/update-version.sh
index 2e44289e5a903dbcaac1efe91d1d409c502c3e58..cc299c7805a3d5689e83ec5c25ea7b9cd62b3fb1 100755 (executable)
--- a/debian/update-version.sh
+++ b/debian/update-version.sh
@@ -14,8 +14,8 @@ NEW_M1=$(prev_stable $NEW)
 ORIG_R="${ORIG/./\\.}" # match a literal dot, otherwise this might sometimes match e.g. debhelper (>= 9.20141010)
 
 sed -i -e "s|libstd-rust-${ORIG_R}|libstd-rust-$NEW|g" \
-       -e "s|rustc:native\( *\)(<= ${ORIG_R}|rustc\1(<= $NEW|g" \
-       -e "s|rustc:native\( *\)(>= ${ORIG_M1/./\\.}|rustc\1(>= ${NEW_M1}|g" control
+       -e "s|rustc:native\( *\)(<= ${ORIG_R}|rustc:native\1(<= $NEW|g" \
+       -e "s|rustc:native\( *\)(>= ${ORIG_M1/./\\.}|rustc:native\1(>= ${NEW_M1}|g" control
 
 git mv libstd-rust-$ORIG.lintian-overrides libstd-rust-$NEW.lintian-overrides
 sed -i -e "s|libstd-rust-${ORIG_R}|libstd-rust-$NEW|g" libstd-rust-$NEW.lintian-overrides