summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorDmitry Shachnev <mitya57@debian.org>2018-12-16 12:25:12 +0300
committerDmitry Shachnev <mitya57@debian.org>2018-12-18 16:43:34 +0300
commit06639c69bc85f6825d4efd5f1a20633976dc80ee (patch)
treeb5240cf0d45396eb877f6c17ace228fa173e1d74 /debian
parent73016139154c3cd3223456bcafbbead7a3ee3e81 (diff)
Use dh_mkdocs instead of dh_linktree.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog1
-rw-r--r--debian/cider-doc.linktrees2
-rw-r--r--debian/control4
-rwxr-xr-xdebian/rules2
4 files changed, 4 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index ca1e2d68..649a1a65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
cider (0.18.0+dfsg-2) UNRELEASED; urgency=medium
* Stop overriding mkdocs theme, search works fine now.
+ * Use dh_mkdocs instead of dh_linktree.
-- Dmitry Shachnev <mitya57@debian.org> Sun, 16 Dec 2018 14:06:32 +0300
diff --git a/debian/cider-doc.linktrees b/debian/cider-doc.linktrees
deleted file mode 100644
index aff5b342..00000000
--- a/debian/cider-doc.linktrees
+++ /dev/null
@@ -1,2 +0,0 @@
-replace usr/share/mkdocs/themes/mkdocs_bootstrap usr/share/doc/elpa-cider/html
-replace usr/lib/python3/dist-packages/mkdocs/contrib/legacy_search/templates usr/share/doc/elpa-cider/html
diff --git a/debian/control b/debian/control
index 9e94c0a3..c2bb7e95 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,6 @@ Uploaders:
Build-Depends:
debhelper (>= 10),
dh-elpa,
- dh-linktree,
elpa-buttercup,
elpa-clojure-mode,
elpa-pkg-info,
@@ -15,7 +14,7 @@ Build-Depends:
elpa-sesman,
elpa-spinner,
leiningen,
- mkdocs,
+ mkdocs (>= 1.0.4),
Standards-Version: 4.1.2
Vcs-Browser: https://salsa.debian.org/emacsen-team/cider
Vcs-Git: https://salsa.debian.org/emacsen-team/cider
@@ -28,6 +27,7 @@ Architecture: all
Depends:
elpa-cider (= ${source:Version}),
${misc:Depends},
+ ${mkdocs:Depends},
Description: Clojure IDE for Emacs - documentation
CIDER is the Clojure(Script) Interactive Development Environment that Rocks
.
diff --git a/debian/rules b/debian/rules
index 58ef3e4f..ea97f829 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
%:
- dh $@ --with elpa --with linktree
+ dh $@ --with elpa --with mkdocs
# mkdocs under python3 needs a UTF locale or Click gives up
override_dh_auto_build: