diff --git a/debian/changelog b/debian/changelog index cd5fb8865de5a323c01b8a108e43f54956f57aec..2844560ba000543c3033d887208ccc8970c9c86f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ scout-clojure (0.1.1-5) unstable; urgency=medium [ Elana Hashman ] * Update Vcs links to salsa. (mango) + * Remove markdown->html doc generation. -- Tom Marble Mon, 26 Feb 2018 17:41:29 -0600 diff --git a/debian/control b/debian/control index d2768b7613b615bf2c69764766874ad60b68d672..10d5dc0c2fd0758cfe3101b77a1419e2879f4e44 100644 --- a/debian/control +++ b/debian/control @@ -9,8 +9,7 @@ Build-Depends: debhelper (>= 10), maven-repo-helper (>= 1.7), default-jdk, - javahelper (>= 0.43), - libtext-markdown-perl | markdown + javahelper (>= 0.43) Standards-Version: 4.1.3 Vcs-Git: https://salsa.debian.org/clojure-team/scout.git Vcs-Browser: https://salsa.debian.org/clojure-team/scout diff --git a/debian/footer.html b/debian/footer.html deleted file mode 100644 index 308b1d01b6ca1e7ab1b1fa896e6a8497bbcd1a37..0000000000000000000000000000000000000000 --- a/debian/footer.html +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/debian/header.html b/debian/header.html deleted file mode 100644 index c95191cd9784cbd44d3e277b5ed59c5dfdb33077..0000000000000000000000000000000000000000 --- a/debian/header.html +++ /dev/null @@ -1,6 +0,0 @@ - - - -@TITLE@ - - diff --git a/debian/libscout-clojure.doc-base b/debian/libscout-clojure.doc-base index 3804ee2778ccf4f0f463d92439fbd229be5f2ce5..44131a6a822efd459e508a9b29e23e207533a583 100644 --- a/debian/libscout-clojure.doc-base +++ b/debian/libscout-clojure.doc-base @@ -4,10 +4,6 @@ Author: David Santiago Abstract: An introduction to scout Section: Programming -Format: HTML -Index: /usr/share/doc/libscout-clojure/html/README.html -Files: /usr/share/doc/libscout-clojure/html/README.html - Format: Text Index: /usr/share/doc/libscout-clojure/README.md Files: /usr/share/doc/libscout-clojure/README.md diff --git a/debian/libscout-clojure.docs b/debian/libscout-clojure.docs index 0d4e26e62e43118ae4d8a8792e16e999d93162de..dd449725e188f816bcebfc05678064efcbc29a81 100644 --- a/debian/libscout-clojure.docs +++ b/debian/libscout-clojure.docs @@ -1,2 +1 @@ *.md -doc/* diff --git a/debian/rules b/debian/rules index 45a7cc288c920c325ce967e676a7d11ff08f21af..985288f19b22cca2ae126580b264cf7240fc255c 100755 --- a/debian/rules +++ b/debian/rules @@ -4,7 +4,6 @@ include /usr/share/javahelper/java-vars.mk export JAVA_HOME=/usr/lib/jvm/default-java export CLASSPATH=/usr/share/java/clojure.jar -MDWN_DOCS = $(patsubst %.md,%.html,$(wildcard $(CURDIR)/*.md)) PRODUCED_JAR=scout.jar NAMESPACE=scout/scout MAVEN_META=META-INF/maven/$(NAMESPACE) @@ -13,9 +12,8 @@ LEIN_META=META-INF/leiningen/$(NAMESPACE) %: dh $@ --with javahelper,jh_maven_repo_helper -override_jh_build: $(MDWN_DOCS) +override_jh_build: jar cf $(PRODUCED_JAR) -C src . - mkdir -p $(CURDIR)/doc/html && mv $(CURDIR)/*.html $(CURDIR)/doc/html mkdir -p $(CURDIR)/meta/$(MAVEN_META) mkdir -p $(CURDIR)/meta/$(LEIN_META) cp $(CURDIR)/project.clj $(CURDIR)/meta/$(LEIN_META) @@ -25,11 +23,4 @@ override_jh_build: $(MDWN_DOCS) override_jh_clean: jh_clean rm -f $(CURDIR)/$(PRODUCED_JAR) - rm -rf $(CURDIR)/doc rm -rf $(CURDIR)/meta - -%.html:%.md - cat debian/header.html > $@ - sed -i'' -e 's/@TITLE@/$(shell head -n 1 $< | sed 's/^#*\s*//')/g' $@ - markdown $< >> $@ - cat debian/footer.html >> $@