[clojure] 03/05: debian/rules: don't convert changes.md to changes.html

Elana Hashman ehashman-guest at moszumanska.debian.org
Mon Oct 2 02:49:46 UTC 2017


This is an automated email from the git hooks/post-receive script.

ehashman-guest pushed a commit to branch master
in repository clojure.

commit 19aadb144a483f736868848c7ab16ce748881ec1
Author: Rob Browning <rlb at defaultvalue.org>
Date:   Sun Oct 1 11:17:12 2017 -0500

    debian/rules: don't convert changes.md to changes.html
    
    Markdown should be fine for now, and prevous generation code was
    slightly broken (TITLE sed was blocking on stdin because $< was
    undefined there).
---
 debian/control | 1 -
 debian/rules   | 8 +-------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/debian/control b/debian/control
index 0b2510b..c8e5e82 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,6 @@ Build-Depends:
  debhelper (>= 10),
  default-jdk,
  javahelper,
- libtext-markdown-perl | markdown,
  maven-repo-helper,
  rename
 Standards-Version: 3.9.8
diff --git a/debian/rules b/debian/rules
index aff53a3..bf2677b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,12 +10,6 @@ JAVA_HOME = /usr/lib/jvm/default-java
 override_dh_auto_build:
 	dh_auto_build -- jar
 
-	# Convert changes.md to html
-	cat debian/header.html > changes.html
-	sed -i'' -e 's/@TITLE@/$(shell head -n 1 $< | sed 's/^#*\s*//')/g' changes.html
-	markdown changes.md >> changes.html
-	cat debian/footer.html >> changes.html
-
 override_dh_install:
 	$(JAVA_HOME)/bin/java -cp clojure.jar clojure.main debian/gencompletions.clj > debian/clojure/etc/rlwrap/clojure$(VER)
 
@@ -31,7 +25,7 @@ override_dh_installman:
 	file-rename 's/\.(.)$$/$(VER).$$1/' debian/clojure/usr/share/man/*/*
 
 override_dh_installchangelogs:
-	dh_installchangelogs -- changes.html
+	dh_installchangelogs changes.md
 
 get-orig-source:
 	uscan --download-current-version --force-download --repack --rename --compression xz

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/clojure.git



More information about the pkg-java-commits mailing list