Clean out lintian-warning stuff from rust-src

diff --git a/debian/TODO.Debian b/debian/TODO.Debian
index b152c96508f9c5f1870134833d06ed4cf1fa8c07..f5ed8d62a845a8a61c7366d8a124928af9c7dcac 100644 (file)
--- a/debian/TODO.Debian
+++ b/debian/TODO.Debian
@@ -1,4 +1,7 @@
+- libjs-highlight.js needs updating (9.10 vs 8 in Debian)
+- update d/copyright
 - upload to experimental, check arch tests
+
 - get cross-building working
 - rm or re-fix dlstage0, update docs
 

diff --git a/debian/copyright b/debian/copyright
index 7f874a0c5e4ad8796f00f8968b0c137f3b4275c5..b7200632a3b3fe4ca6ff0a7c1a66fe919474b616 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,10 +2,12 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: rust
 Source: http://www.rust-lang.org
 Files-Excluded:
+ *.min.js
  cargo
+ src/jemalloc/msvc/*_vc*.sln
  src/llvm
- src/librustdoc/html/static/jquery-*.min.js
  src/rt/hoedown/src/html_blocks.c
+ src/vendor/mdbook/src/theme/_FontAwesome
 
 Files: *
 Copyright: 2006-2009 Graydon Hoare

diff --git a/debian/rules b/debian/rules
index 8b041499eb93ad4e4922ddb4f7487eb762614257..1df24b3f5d3c03be96c29b1d99e251c69079849c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -34,14 +34,15 @@ LIBSTD_PKG := libstd-rust-$(RUST_VERSION)
 
 # These are the normal build flags
 DEB_CONFIGURE_FLAGS = \
-               --build=$(DEB_BUILD_RUST_TYPE) \
-               --host=$(DEB_HOST_RUST_TYPE) \
-               --target=$(DEB_TARGET_RUST_TYPE) \
-               --disable-manage-submodules \
-               --release-channel=$(RELEASE_CHANNEL) \
-               --prefix=/usr \
-               --enable-vendor --disable-locked-deps \
-               --enable-llvm-link-shared
+                          --build=$(DEB_BUILD_RUST_TYPE) \
+                          --host=$(DEB_HOST_RUST_TYPE) \
+                          --target=$(DEB_TARGET_RUST_TYPE) \
+                          --disable-manage-submodules \
+                          --release-channel=$(RELEASE_CHANNEL) \
+                          --prefix=/usr \
+                          --enable-vendor --disable-locked-deps \
+                          --enable-llvm-link-shared \
+                          --disable-dist-src
 
 # Use system LLVM (comment out to use vendored LLVM)
 OLD_LLVM_VERSION = 3.8
@@ -125,12 +126,11 @@ override_dh_auto_configure:
        ! grep --color=always -i 'll...$(OLD_LLVM_VERSION)' --exclude=changelog -R debian
        $(PRECONFIGURE_CHECK)
        cp debian/config.toml src/bootstrap/config.toml
-       mkdir cargo # otherwise "install" fails, it's more strict than really needed
        PATH="$$PWD/debian/bin:$$PATH" \
            ./configure $(DEB_CONFIGURE_FLAGS)
 
 override_dh_auto_clean:
-       $(RM) -rf ./build ./tmp ./.cargo config.stamp config.mk Makefile ./cargo
+       $(RM) -rf ./build ./tmp ./.cargo config.stamp config.mk Makefile
        $(RM) -rf $(SRC_CLEAN)
 
 # upstream bundles this in the source, but in Debian we rebuild everything yo
@@ -212,6 +212,20 @@ override_dh_install-indep:
          debian/rust-gdb/usr/share/rust-gdb/*.py \
          debian/rust-lldb/usr/share/rust-lldb/*.py
        $(RM) -rf $(SRC_CLEAN:%=debian/rust-src/usr/src/rust/%)
+       # TODO: can be dropped next time we do a repack
+       $(RM) -rf debian/rust-src/usr/src/rust/src/vendor/mdbook/src/theme/_FontAwesome
+       # Get rid of lintian warnings
+       find debian/rust-src/usr/src/rust \
+               \( -name .gitignore \
+               -o -name 'LICENSE*' \
+               -o -name 'LICENCE' \
+               -o -name 'license' \
+               -o -name 'COPYING*' \
+               \) -delete
+       cd debian/rust-src/usr/src/rust && chmod -x \
+               src/etc/gdb_rust_pretty_printing.py \
+               src/etc/adb_run_wrapper.sh \
+               src/compiler-rt/test/builtins/Unit/ppc/test
 
 override_dh_installchangelogs:
        dh_installchangelogs RELEASES.md

diff --git a/debian/rust-src.install b/debian/rust-src.install
index 1e19b6da341538047b6227f0bffba85c1f2b6631..0be9805c863d7e8154d8f237eee94eec4f430d92 100644 (file)
--- a/debian/rust-src.install
+++ b/debian/rust-src.install
@@ -9,4 +9,3 @@ configure       usr/src/rust
 x.py            usr/src/rust
 man             usr/src/rust
 src             usr/src/rust
-cargo           usr/src/rust