From 6fce0a99829dcfd562dbffce87e02bb1cd5fdd0f Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 21 Jan 2015 19:10:25 +0100 Subject: [PATCH] Remove the favicon from the doc --- debian/changelog | 2 +- debian/patches/disable-favicon.diff | 13 ------------- debian/patches/series | 1 - debian/rules | 7 +++++++ 4 files changed, 8 insertions(+), 15 deletions(-) delete mode 100644 debian/patches/disable-favicon.diff diff --git a/debian/changelog b/debian/changelog index d582f33fce..8f89ab22d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,7 +14,7 @@ rust (1.0.0~alpha-0~exp1) experimental; urgency=low * Add a TODO list * Enable the testsuite * Use rust.manpages - * Disable the favicon (lintian complains about it) + * Remove the favicon from the doc -- Jordan Justen Mon, 12 Jan 2015 00:35:31 -0800 diff --git a/debian/patches/disable-favicon.diff b/debian/patches/disable-favicon.diff deleted file mode 100644 index b3e45e35d3..0000000000 --- a/debian/patches/disable-favicon.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: debian-rust/doc/favicon.inc -=================================================================== ---- debian-rust.orig/doc/favicon.inc -+++ debian-rust/doc/favicon.inc -@@ -1 +1 @@ -- -+ -Index: debian-rust/src/doc/favicon.inc -=================================================================== ---- debian-rust.orig/src/doc/favicon.inc -+++ debian-rust/src/doc/favicon.inc -@@ -1 +0,0 @@ -- diff --git a/debian/patches/series b/debian/patches/series index af2f0af468..e69de29bb2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +0,0 @@ -disable-favicon.diff diff --git a/debian/rules b/debian/rules index 876d2ca6a0..3df10688c3 100755 --- a/debian/rules +++ b/debian/rules @@ -80,3 +80,10 @@ override_dh_auto_install: dh_link usr/bin/rustdoc-$(DEBIAN_RUST_VERSION) usr/bin/rustdoc dh_link $(RUST_PREFIX)/bin/rust-gdb usr/bin/rust-gdb-$(DEBIAN_RUST_VERSION) dh_link usr/bin/rust-gdb-$(DEBIAN_RUST_VERSION) usr/bin/rust-gdb + +override_dh_install: + # Brute force to remove privacy-breach-logo lintian warning. + # We could have updated the upstream sources but it would complexify + # the rebase + sed -i '/rel="shortcut icon" href="http:\/\/www.rust-lang.org\/favicon.ico"/d' `find $(DEB_DESTDIR) -iname '*.html'` + dh_install