From 9da097a4487f707045c5a1c2a50193b1b4b73fe8 Mon Sep 17 00:00:00 2001 From: Vasudev Kamath Date: Sun, 15 Apr 2018 20:52:48 +0530 Subject: [PATCH] Drop 2003 2005 and cargo-doc.doc-base as docs can't be built --- debian/cargo-doc.doc-base | 8 -------- debian/patches/2003_local-jquery.patch | 11 ----------- debian/patches/2005_dont_run_mdbook.patch | 19 ------------------- debian/patches/series | 4 ---- debian/rules | 2 +- 5 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 debian/cargo-doc.doc-base delete mode 100644 debian/patches/2003_local-jquery.patch delete mode 100644 debian/patches/2005_dont_run_mdbook.patch diff --git a/debian/cargo-doc.doc-base b/debian/cargo-doc.doc-base deleted file mode 100644 index 486babc3f..000000000 --- a/debian/cargo-doc.doc-base +++ /dev/null @@ -1,8 +0,0 @@ -Document: cargo-rustdoc -Title: Cargo RustDoc -Abstract: The Cargo guide -Section: Programming/Rust - -Format: HTML -Index: /usr/share/doc/cargo-doc/doc/index.html -Files: /usr/share/doc/cargo-doc/doc/*.html diff --git a/debian/patches/2003_local-jquery.patch b/debian/patches/2003_local-jquery.patch deleted file mode 100644 index 2d4cf150c..000000000 --- a/debian/patches/2003_local-jquery.patch +++ /dev/null @@ -1,11 +0,0 @@ -Description: Remove remote jquery references -From: Luca Bruno -Forwarded: no ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/src/doc/html-headers.html -+++ b/src/doc/html-headers.html -@@ -1,2 +1,2 @@ -- -+ - diff --git a/debian/patches/2005_dont_run_mdbook.patch b/debian/patches/2005_dont_run_mdbook.patch deleted file mode 100644 index 6badb4832..000000000 --- a/debian/patches/2005_dont_run_mdbook.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: Don't run mdBook for book preview - Upstream script tries to show preview of generated document - the tool needed is missing and step is not needed during - package build. -Author: Vasudev Kamath -Last-Update: 2017-12-03 - ---- cargo-0.23.0.orig/src/ci/dox.sh -+++ cargo-0.23.0/src/ci/dox.sh -@@ -28,6 +28,6 @@ for doc in $DOCS; do - done - - # Temporary preview for mdBook docs --cd src/doc/book --$HOME/.cargo/bin/mdbook build --no-create --dest-dir ../../../target/doc/book --cd ../../../ -+#cd src/doc/book -+#$HOME/.cargo/bin/mdbook build --no-create --dest-dir ../../../target/doc/book -+#cd ../../../ diff --git a/debian/patches/series b/debian/patches/series index b30bf5caa..332d9f6c0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,9 +1,5 @@ 2007_sparc64_disable_incremental_build.patch 2004_clean-cargo-deps.patch -2003_local-jquery.patch 2001_use-system-libgit2.patch 2002_disable-net-tests.patch -1002_fix_typo_cargo_search.patch -2005_dont_run_mdbook.patch -2006_disable_wasm32_tests.patch 1001_PR5012.patch diff --git a/debian/rules b/debian/rules index 06e37c28a..3fa7ce663 100755 --- a/debian/rules +++ b/debian/rules @@ -78,7 +78,7 @@ override_dh_auto_build-indep: ifeq (,$(findstring nodoc,$(DEB_BUILD_PROFILES))) $(CARGO) doc $(CARGOFLAGS) # Extra instructions from README.md, unfortunately not done by "cargo doc" - sh src/ci/dox.sh + # sh src/ci/dox.sh # Post-processing for Debian cd target/doc/ && rm -f jquery.js && ln -s /usr/share/javascript/jquery/jquery.js endif -- 2.30.2