Drop 2003 2005 and cargo-doc.doc-base as docs can't be built

diff --git a/debian/cargo-doc.doc-base b/debian/cargo-doc.doc-base
deleted file mode 100644 (file)
index 486babc..0000000
--- 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 (file)
index 2d4cf15..0000000
--- a/debian/patches/2003_local-jquery.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Description: Remove remote jquery references
-From: Luca Bruno <lucab@debian.org>
-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 @@
--<script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
-+<script src="jquery.js"></script>
- <link rel="icon" type="image/x-icon" href="favicon.ico">

diff --git a/debian/patches/2005_dont_run_mdbook.patch b/debian/patches/2005_dont_run_mdbook.patch
deleted file mode 100644 (file)
index 6badb48..0000000
--- 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 <vasudev@copyninja.info>
-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 b30bf5caaf30177d5b4fd7267036fc110c9fa828..332d9f6c04c2da7939c7be2009caca8e5934e42f 100644 (file)
--- 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 06e37c28aa9cba740da6655e212f136b13076c62..3fa7ce66344fd9564e85511389440b207a049a09 100755 (executable)
--- 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