Fix lintian errors, update d/copyright, bump standards-version

diff --git a/debian/changelog b/debian/changelog
index 1102ce46fb9c6446212556607a0aea94d507e29a..0a1a8d3d9863a480de86c5d67b452ec1abf8d799 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ rustc (1.10.0+dfsg1-1) UNRELEASED; urgency=medium
   * Update our bootstrapping scripts. Now we can build either from upstream's
     stage0 snapshot (by setting DEB_BUILD_PROFILES=dlstage0) or from the
     previous Debian rustc stable version (default, when no build profile).
+  * Update to latest Standards-Version; no changes required.
 
  -- Ximin Luo <infinity0@debian.org>  Mon, 04 Jul 2016 15:05:50 +0200
 

diff --git a/debian/control b/debian/control
index 61adfe2c025a89a57a200902966bf9d33b1a773e..900af8927367c14f29e154ac639e0e7a4ca364ec 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Uploaders: Jordan Justen <jordan.l.justen@intel.com>,
  Ximin Luo <infinity0@debian.org>
 Build-Depends: debhelper (>= 9.20141010),
                dpkg-dev (>= 1.17.14),
-               rustc (>= 1.9.0+dfsg-1) <!dlstage0>,
+               rustc (>= 1.9.0+dfsg) <!dlstage0>,
                autotools-dev,
                curl,
                python,
@@ -36,7 +36,7 @@ Build-Depends-Indep: pandoc (>= 1.9),
                      texlive-generic-recommended,
                      texlive-fonts-recommended,
                      lmodern
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Homepage: http://www.rust-lang.org/
 Vcs-Git: https://anonscm.debian.org/git/pkg-rust/rust.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-rust/rust.git

diff --git a/debian/copyright b/debian/copyright
index 02aa722253d3604220f8b45c6bd6b1e9bebc675c..0ab94f3bff644c9d82309c6b307cf86b1e35ab7e 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,6 +3,8 @@ Upstream-Name: rust
 Source: http://www.rust-lang.org
 Files-Excluded:
  src/llvm
+ src/librustdoc/html/static/jquery-*.min.js
+ src/rt/hoedown/src/html_blocks.c
 
 Files: *
 Copyright: 2006-2009 Graydon Hoare
@@ -10,7 +12,7 @@ Copyright: 2006-2009 Graydon Hoare
            2012-2015 The Rust Project Developers (see AUTHORS.txt)
 License: Expat or Apache-2.0
 
-Files: src/librustc_trans/trans/cabi_x86_64.rs
+Files: src/librustc_trans/cabi_x86_64.rs
 Copyright: 2008-2010 Tachyon Technologies
 License: BSD-2-clause
 
@@ -48,7 +50,7 @@ Copyright: 2002-2014 Jason Evans <jasone@canonware.com>
            2009-2014 Facebook, Inc.
 License: BSD-2-clause
 
-Files: src/jemalloc/bin/pprof
+Files: src/jemalloc/bin/jeprof.in
 Copyright: 1998-2007, Google Inc.
 License: BSD-3-Clause
 
@@ -114,6 +116,15 @@ Files: src/librustdoc/html/static/main.js
 Copyright: 2014 The Rust Project Developers
 License: Expat or Apache-2.0
 
+Files: src/libstd/memchr.rs
+Copyright: 2015 Andrew Gallant, bluss and Nicolas Koch
+License: Expat or Apache-2.0
+
+Files: src/libstd/sync/mpsc/mpsc_queue.rs
+       src/libstd/sync/mpsc/spsc_queue.rs
+Copyright: 2010-2011 Dmitry Vyukov
+License: BSD-2-Clause
+
 Files: debian/icons/rust-logo-32x32-blk.png
 Copyright: Mozilla Foundation
 License: CC-BY

diff --git a/debian/source/include-binaries b/debian/source/include-binaries
index fb50a44a23366dad46df894476fb8350f5f2f9ca..5e0812fc6d92b8e515d61342bb65699362126554 100644 (file)
--- a/debian/source/include-binaries
+++ b/debian/source/include-binaries
@@ -1,3 +1 @@
-debian/dl/rust-stage0-2015-04-27-857ef6e-linux-x86_64-94089740e48167c5975c92c139ae9c286764012f.tar.bz2
-debian/dl/rust-stage0-2015-04-27-857ef6e-linux-i386-0bc8cffdce611fb71fd7d3d8e7cdbfaf748a4f16.tar.bz2
 debian/icons/rust-logo-32x32-blk.png

diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 587abca801d5a650222803f54088d88612d432e6..7547a3f73213460160e9b80b8b93836d83548807 100644 (file)
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,5 +1,5 @@
-# Rust source tree contains minified javascript code:
-# source-is-missing src/librustdoc/html/static/jquery-2.1.4.min.js
-rust source: source-is-missing
-
-rust source: description-starts-with-package-name
+rustc source: pre-depends-directly-on-multiarch-support libstd-rust-dev
+rustc source: pre-depends-directly-on-multiarch-support libstd-rust-1.10
+# can rm these two for the next version, once d/copyright Files-Excluded gets applied
+rustc source: source-contains-prebuilt-javascript-object src/librustdoc/html/static/jquery-2.1.4.min.js
+rustc source: source-contains-autogenerated-gperf-data src/rt/hoedown/src/html_blocks.c

diff --git a/debian/update-version.sh b/debian/update-version.sh
index 05b56606d356c1584ae33a004a9d9e833bf282fe..a6ce43e2c33d4b8bcd0d4b9f06497e32dad55a55 100644 (file)
--- a/debian/update-version.sh
+++ b/debian/update-version.sh
@@ -7,6 +7,7 @@ sed -i -e "s|libstd-rust-$ORIG|libstd-rust-$NEW|g" \
 
 git mv libstd-rust-$ORIG.lintian-overrides libstd-rust-$NEW.lintian-overrides
 sed -i -e "s|libstd-rust-$ORIG|libstd-rust-$NEW|g" libstd-rust-$NEW.lintian-overrides
+sed -i -e "s|libstd-rust-$ORIG|libstd-rust-$NEW|g" source/lintian-overrides
 }
 
 update 1.8 1.9 1.10