Rebuild hoedown html_blocks.c using gperf. Don't exclude jquery for now.

We need to think through how to do jquery in more depth. We can't just have
rustdoc copy the system jquery instead, since the rust-doc build uses that, and
we will still end up with duplicate copies in Debian. But having rustdoc
instead create a symlink is a more invasive change from upstream.

diff --git a/debian/control b/debian/control
index 2f157b01d974dfd0bd7d693c3c471ba00558413b..79999b5194d1dcdea1612ca88ccadc74be40de28 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Build-Depends: debhelper (>= 9.20141010),
                autotools-dev,
                binutils-multiarch,
                curl,
+               gperf,
                python,
                nodejs,
                zlib1g-dev,

diff --git a/debian/copyright b/debian/copyright
index 0ab94f3bff644c9d82309c6b307cf86b1e35ab7e..77577afd3ed5a38d429849a12fa60baed3c7d470 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,6 @@ 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: *

diff --git a/debian/rules b/debian/rules
index 6336be846d0a84bb50a6d244f400346190a02ab8..796bc5fbf38c1441d3a45f36b7b1d5d61bdd6109 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -119,6 +119,7 @@ override_dh_auto_clean:
        $(RM) src/bootstrap/bootstrap.pyc
 
 override_dh_auto_build-arch:
+       $(MAKE) -C src/rt/hoedown src/html_blocks.c # upstream bundles this in the source, but in Debian we rebuild everything yo
        dh_auto_build -- all VERBOSE=1
 
 override_dh_auto_build-indep: